Forgotten to call the super.assemble() in other serialization tests.
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/0accd2cf Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/0accd2cf Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/0accd2cf Branch: refs/heads/develop Commit: 0accd2cf631dcba4065d6c71f6bb19f452af7693 Parents: 09facf1 Author: Niclas Hedhman <[email protected]> Authored: Sat Apr 16 13:38:14 2016 +0800 Committer: Niclas Hedhman <[email protected]> Committed: Sat Apr 16 13:38:15 2016 +0800 ---------------------------------------------------------------------- .../org/apache/zest/api/structure/Module.java | 42 ++++- .../zest/bootstrap/SingletonAssembler.java | 16 ++ .../zest/runtime/structure/ModuleInstance.java | 28 ++++ .../OrgJsonPlainValueSerializationTest.java | 3 + .../stax/StaxPlainValueSerializationTest.java | 3 + tools/shell/build.gradle | 5 +- tools/shell/dev-status.xml | 38 +++++ .../templates/default/files/app/build.gradle_ | 20 +++ .../src/main/java/__package__/app/package.html | 23 +++ .../app/src/main/resources/___placeholder___ | 0 .../app/src/test/java/__package__/package.html | 21 +++ .../default/files/bootstrap/build.gradle_ | 16 ++ .../__package__/bootstrap/config/package.html_ | 1 + .../bootstrap/connectivity/package.html_ | 1 + .../__package__/bootstrap/domain/package.html_ | 1 + .../bootstrap/infrastructure/package.html_ | 1 + .../src/main/resources/___placeholder___ | 0 .../src/test/java/__package__/package.html_ | 1 + .../etc/templates/default/files/build.gradle_ | 26 +++ .../files/gradle/wrapper/gradle-wrapper.jar_ | Bin 0 -> 51348 bytes .../gradle/wrapper/gradle-wrapper.properties_ | 6 + .../etc/templates/default/files/gradlew.bat_ | 90 ++++++++++ .../src/etc/templates/default/files/gradlew_ | 164 +++++++++++++++++++ .../templates/default/files/model/build.gradle_ | 7 + .../java/__package__/model/orders/package.html_ | 1 + .../__package__/model/security/package.html_ | 1 + .../model/src/main/resources/___placeholder___ | 0 .../src/test/java/__package__/package.html_ | 1 + .../src/etc/templates/null/files/build.gradle_ | 24 +++ .../files/gradle/wrapper/gradle-wrapper.jar_ | 0 .../gradle/wrapper/gradle-wrapper.properties_ | 6 + .../src/etc/templates/null/files/gradlew.bat_ | 90 ++++++++++ .../shell/src/etc/templates/null/files/gradlew_ | 164 +++++++++++++++++++ .../src/main/java/__package__/package.html_ | 1 + .../src/test/java/__package__/package.html_ | 1 + .../templates/restapp/files/app/build.gradle_ | 20 +++ .../src/main/java/__package__/app/package.html | 23 +++ .../app/src/main/resources/___placeholder___ | 0 .../src/main/webapp/WEB-INF/___placeholder___ | 0 .../app/src/test/java/__package__/package.html | 21 +++ .../restapp/files/bootstrap/build.gradle_ | 16 ++ .../__package__/bootstrap/config/package.html_ | 1 + .../bootstrap/connectivity/package.html_ | 1 + .../__package__/bootstrap/domain/package.html_ | 1 + .../bootstrap/infrastructure/package.html_ | 1 + .../src/main/resources/___placeholder___ | 0 .../src/test/java/__package__/package.html_ | 1 + .../etc/templates/restapp/files/build.gradle_ | 26 +++ .../files/gradle/wrapper/gradle-wrapper.jar_ | Bin 0 -> 51348 bytes .../gradle/wrapper/gradle-wrapper.properties_ | 6 + .../etc/templates/restapp/files/gradlew.bat_ | 90 ++++++++++ .../src/etc/templates/restapp/files/gradlew_ | 164 +++++++++++++++++++ .../templates/restapp/files/model/build.gradle_ | 7 + .../java/__package__/model/orders/package.html_ | 1 + .../__package__/model/security/package.html_ | 1 + .../model/src/main/resources/___placeholder___ | 0 .../src/test/java/__package__/package.html_ | 1 + .../templates/restapp/files/rest/build.gradle_ | 8 + .../__package__/rest/security/package.html_ | 1 + .../rest/src/main/resources/___placeholder___ | 0 .../src/test/java/__package__/package.html_ | 1 + .../restproject/files/app/build.gradle_ | 20 --- .../src/main/java/__package__/app/package.html | 23 --- .../src/main/webapp/WEB-INF/___placeholder___ | 1 - .../app/src/test/java/__package__/package.html | 21 --- .../restproject/files/bootstrap/build.gradle_ | 16 -- .../__package__/bootstrap/config/package.html_ | 1 - .../bootstrap/connectivity/package.html_ | 1 - .../__package__/bootstrap/domain/package.html_ | 1 - .../bootstrap/infrastructure/package.html_ | 1 - .../src/test/java/__package__/package.html_ | 1 - .../templates/restproject/files/build.gradle_ | 26 --- .../files/gradle/wrapper/gradle-wrapper.jar_ | Bin 51348 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties_ | 6 - .../templates/restproject/files/gradlew.bat_ | 90 ---------- .../etc/templates/restproject/files/gradlew_ | 164 ------------------- .../restproject/files/model/build.gradle_ | 7 - .../java/__package__/model/orders/package.html_ | 1 - .../__package__/model/security/package.html_ | 1 - .../src/test/java/__package__/package.html_ | 1 - .../restproject/files/rest/build.gradle_ | 8 - .../__package__/rest/security/package.html_ | 1 - .../src/test/java/__package__/package.html_ | 1 - .../etc/templates/singleton/files/build.gradle_ | 24 +++ .../files/gradle/wrapper/gradle-wrapper.jar_ | Bin 0 -> 51348 bytes .../gradle/wrapper/gradle-wrapper.properties_ | 6 + .../etc/templates/singleton/files/gradlew.bat_ | 90 ++++++++++ .../src/etc/templates/singleton/files/gradlew_ | 164 +++++++++++++++++++ .../src/main/java/__package__/package.html_ | 1 + .../src/test/java/__package__/package.html_ | 1 + .../org/apache/zest/tools/shell/FileUtils.java | 34 +++- .../java/org/apache/zest/tools/shell/Main.java | 26 ++- .../zest/tools/shell/create/CreateProject.java | 8 +- .../create/project/DefaultProjectCreator.java | 79 +++++++++ .../create/project/NullProjectCreator.java | 37 +++++ .../create/project/RestAppProjectCreator.java | 88 ++++++++++ .../create/project/RestProjectCreator.java | 91 ---------- .../create/project/SingletonProjectCreator.java | 39 +++++ .../common/ApplicationAssemblerWriter.java | 105 ++++++++++++ .../project/common/ConfigLayerWriter.java | 81 +++++++++ .../project/common/ConfigModuleWriter.java | 77 +++++++++ .../project/common/ConnectivityLayerWriter.java | 74 +++++++++ .../create/project/common/CrudModuleWriter.java | 74 +++++++++ .../create/project/common/CustomerWriter.java | 68 ++++++++ .../project/common/DomainLayerWriter.java | 82 ++++++++++ .../common/FileConfigurationModuleWriter.java | 76 +++++++++ .../HardCodedSecurityRepositoryMixinWriter.java | 87 ++++++++++ .../project/common/IndexingModuleWriter.java | 86 ++++++++++ .../common/InfrastructureLayerWriter.java | 91 ++++++++++ .../create/project/common/OrderItemWriter.java | 66 ++++++++ .../project/common/OrderModuleWriter.java | 85 ++++++++++ .../create/project/common/OrderWriter.java | 71 ++++++++ .../project/common/SecurityModuleWriter.java | 88 ++++++++++ .../common/SecurityRepositoryWriter.java | 71 ++++++++ .../common/SerializationModuleWriter.java | 90 ++++++++++ .../create/project/common/SettingsWriter.java | 75 +++++++++ .../project/common/StorageModuleWriter.java | 87 ++++++++++ .../project/defaultp/ApplicationWriter.java | 106 ++++++++++++ .../restapp/ApplicationAssemblerWriter.java | 105 ------------ .../project/restapp/ConfigLayerWriter.java | 81 --------- .../project/restapp/ConfigModuleWriter.java | 77 --------- .../restapp/ConnectivityLayerWriter.java | 74 --------- .../project/restapp/CrudModuleWriter.java | 74 --------- .../create/project/restapp/CustomerWriter.java | 68 -------- .../project/restapp/DomainLayerWriter.java | 82 ---------- .../restapp/FileConfigurationModuleWriter.java | 76 --------- .../HardCodedSecurityRepositoryMixinWriter.java | 87 ---------- .../project/restapp/IndexingModuleWriter.java | 86 ---------- .../restapp/InfrastructureLayerWriter.java | 91 ---------- .../create/project/restapp/OrderItemWriter.java | 66 -------- .../project/restapp/OrderModuleWriter.java | 85 ---------- .../create/project/restapp/OrderWriter.java | 71 -------- .../project/restapp/SecurityModuleWriter.java | 88 ---------- .../restapp/SecurityRepositoryWriter.java | 71 -------- .../restapp/SerializationModuleWriter.java | 90 ---------- .../create/project/restapp/SettingsWriter.java | 75 --------- .../project/restapp/StorageModuleWriter.java | 87 ---------- .../SingletonApplicationAssemblerWriter.java | 105 ++++++++++++ .../project/singleton/StartupServiceWriter.java | 70 ++++++++ .../zest/tools/shell/help/HelpCommand.java | 2 +- .../templates/default/project.properties | 4 + .../resources/templates/null/project.properties | 25 +++ .../templates/restapp/project.properties | 4 +- .../templates/singleton/project.properties | 24 +++ .../apache/zest/tools/shell/FileUtilsTest.java | 106 ++++++++++++ .../tools/shell/HelpNeededExceptionTest.java | 32 ++++ .../org/apache/zest/tools/shell/TestHelper.java | 41 +++++ .../tools/shell/create/CreateProjectTest.java | 69 ++++++++ .../project/DefaultProjectCreatorTest.java | 108 ++++++++++++ .../create/project/NullProjectCreatorTest.java | 66 ++++++++ .../project/RestappProjectCreatorTest.java | 119 ++++++++++++++ 151 files changed, 4175 insertions(+), 2047 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/core/api/src/main/java/org/apache/zest/api/structure/Module.java ---------------------------------------------------------------------- diff --git a/core/api/src/main/java/org/apache/zest/api/structure/Module.java b/core/api/src/main/java/org/apache/zest/api/structure/Module.java index b3e262a..073ffa1 100644 --- a/core/api/src/main/java/org/apache/zest/api/structure/Module.java +++ b/core/api/src/main/java/org/apache/zest/api/structure/Module.java @@ -19,21 +19,14 @@ */ package org.apache.zest.api.structure; -import java.util.stream.Stream; import org.apache.zest.api.activation.ActivationEventListenerRegistration; import org.apache.zest.api.composite.TransientBuilderFactory; -import org.apache.zest.api.composite.TransientDescriptor; -import org.apache.zest.api.entity.EntityDescriptor; import org.apache.zest.api.injection.scope.Structure; -import org.apache.zest.api.object.ObjectDescriptor; import org.apache.zest.api.object.ObjectFactory; import org.apache.zest.api.query.QueryBuilderFactory; -import org.apache.zest.api.service.ImportedServiceDescriptor; -import org.apache.zest.api.service.ServiceDescriptor; import org.apache.zest.api.service.ServiceFinder; import org.apache.zest.api.unitofwork.UnitOfWorkFactory; import org.apache.zest.api.value.ValueBuilderFactory; -import org.apache.zest.api.value.ValueDescriptor; /** * API for interacting with a Module. Instances @@ -58,13 +51,44 @@ public interface Module ModuleDescriptor descriptor(); /** - * * @return the Layer that the Module is declared in. */ LayerDescriptor layer(); + /** Returns the TypeLookup for the Module. + * TypeLookup handles all the types visible from within this Module. + * + * @return TypeLookup for this Module + */ + TypeLookup typeLookup(); + /** Returns the UnitOfWorkFactory for this Module. + * + * @return the UnitOfWorkFactory of this Module. + */ UnitOfWorkFactory unitOfWorkFactory(); - TypeLookup typeLookup(); + /** Returns the ServiceFinder for this Module. + * + * @return the ServiceFinder for this Module. + */ + ServiceFinder serviceFinder(); + + /** Returns the ValueBuilderFactory for this Module. + * + * @return the ValueBuilderFactory for this Module. + */ + ValueBuilderFactory valueBuilderFactory(); + + /** Returns the TransientBuilderFactory for this Module. + * + * @return the TransientBuilderFactory for this Module. + */ + TransientBuilderFactory transientBuilderFactory(); + + /** Returns the ObjectFactory for this Module. + * + * @return the ObjectFactory for this Module. + */ + ObjectFactory objectFactory(); } http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/core/bootstrap/src/main/java/org/apache/zest/bootstrap/SingletonAssembler.java ---------------------------------------------------------------------- diff --git a/core/bootstrap/src/main/java/org/apache/zest/bootstrap/SingletonAssembler.java b/core/bootstrap/src/main/java/org/apache/zest/bootstrap/SingletonAssembler.java index b97457c..c0fd47c 100644 --- a/core/bootstrap/src/main/java/org/apache/zest/bootstrap/SingletonAssembler.java +++ b/core/bootstrap/src/main/java/org/apache/zest/bootstrap/SingletonAssembler.java @@ -22,8 +22,13 @@ package org.apache.zest.bootstrap; import org.apache.zest.api.ZestAPI; import org.apache.zest.api.activation.ActivationException; +import org.apache.zest.api.composite.TransientBuilderFactory; +import org.apache.zest.api.object.ObjectFactory; +import org.apache.zest.api.service.ServiceFinder; import org.apache.zest.api.structure.Application; import org.apache.zest.api.structure.Module; +import org.apache.zest.api.unitofwork.UnitOfWorkFactory; +import org.apache.zest.api.value.ValueBuilderFactory; /** * Base class for Assembler that creates an Application @@ -36,6 +41,12 @@ import org.apache.zest.api.structure.Module; public abstract class SingletonAssembler implements Assembler { + private final UnitOfWorkFactory unitOfWorkFactory; + private final ServiceFinder serviceFinder; + private final ValueBuilderFactory valueBuilderFactory; + private final TransientBuilderFactory transientBuilderFactory; + private final ObjectFactory objectFactory; + private Energy4Java zest; private Application applicationInstance; private final Module moduleInstance; @@ -81,6 +92,11 @@ public abstract class SingletonAssembler // START SNIPPET: actual moduleInstance = applicationInstance.findModule( "Layer 1", "Module 1" ); + unitOfWorkFactory = moduleInstance.unitOfWorkFactory(); + serviceFinder = moduleInstance.serviceFinder(); + valueBuilderFactory = moduleInstance.valueBuilderFactory(); + transientBuilderFactory = moduleInstance.transientBuilderFactory(); + objectFactory = moduleInstance.objectFactory(); } public final ZestAPI runtime() http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/core/runtime/src/main/java/org/apache/zest/runtime/structure/ModuleInstance.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/structure/ModuleInstance.java b/core/runtime/src/main/java/org/apache/zest/runtime/structure/ModuleInstance.java index 9cc74fd..b9858c8 100644 --- a/core/runtime/src/main/java/org/apache/zest/runtime/structure/ModuleInstance.java +++ b/core/runtime/src/main/java/org/apache/zest/runtime/structure/ModuleInstance.java @@ -40,17 +40,20 @@ import org.apache.zest.api.composite.Composite; import org.apache.zest.api.composite.ModelDescriptor; import org.apache.zest.api.composite.NoSuchTransientException; import org.apache.zest.api.composite.TransientBuilder; +import org.apache.zest.api.composite.TransientBuilderFactory; import org.apache.zest.api.composite.TransientDescriptor; import org.apache.zest.api.entity.EntityReference; import org.apache.zest.api.entity.IdentityGenerator; import org.apache.zest.api.metrics.MetricsProvider; import org.apache.zest.api.object.NoSuchObjectException; import org.apache.zest.api.object.ObjectDescriptor; +import org.apache.zest.api.object.ObjectFactory; import org.apache.zest.api.property.Property; import org.apache.zest.api.property.PropertyDescriptor; import org.apache.zest.api.query.QueryBuilder; import org.apache.zest.api.query.QueryBuilderFactory; import org.apache.zest.api.service.NoSuchServiceException; +import org.apache.zest.api.service.ServiceFinder; import org.apache.zest.api.service.ServiceReference; import org.apache.zest.api.structure.LayerDescriptor; import org.apache.zest.api.structure.Module; @@ -61,6 +64,7 @@ import org.apache.zest.api.unitofwork.UnitOfWorkFactory; import org.apache.zest.api.util.NullArgumentException; import org.apache.zest.api.value.NoSuchValueException; import org.apache.zest.api.value.ValueBuilder; +import org.apache.zest.api.value.ValueBuilderFactory; import org.apache.zest.api.value.ValueComposite; import org.apache.zest.api.value.ValueDescriptor; import org.apache.zest.api.value.ValueSerialization; @@ -501,6 +505,30 @@ public class ModuleInstance return uowf; } + @Override + public ServiceFinder serviceFinder() + { + return this; + } + + @Override + public ValueBuilderFactory valueBuilderFactory() + { + return this; + } + + @Override + public TransientBuilderFactory transientBuilderFactory() + { + return this; + } + + @Override + public ObjectFactory objectFactory() + { + return this; + } + public IdentityGenerator identityGenerator() { synchronized( this ) http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/extensions/valueserialization-orgjson/src/test/java/org/apache/zest/valueserialization/orgjson/OrgJsonPlainValueSerializationTest.java ---------------------------------------------------------------------- diff --git a/extensions/valueserialization-orgjson/src/test/java/org/apache/zest/valueserialization/orgjson/OrgJsonPlainValueSerializationTest.java b/extensions/valueserialization-orgjson/src/test/java/org/apache/zest/valueserialization/orgjson/OrgJsonPlainValueSerializationTest.java index 85cff40..6357e7a 100644 --- a/extensions/valueserialization-orgjson/src/test/java/org/apache/zest/valueserialization/orgjson/OrgJsonPlainValueSerializationTest.java +++ b/extensions/valueserialization-orgjson/src/test/java/org/apache/zest/valueserialization/orgjson/OrgJsonPlainValueSerializationTest.java @@ -33,6 +33,9 @@ public class OrgJsonPlainValueSerializationTest throws AssemblyException { new OrgJsonValueSerializationAssembler().assemble( module ); + // END SNIPPET: assembly + super.assemble( module ); + // START SNIPPET: assembly } // END SNIPPET: assembly } http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/extensions/valueserialization-stax/src/test/java/org/apache/zest/valueserialization/stax/StaxPlainValueSerializationTest.java ---------------------------------------------------------------------- diff --git a/extensions/valueserialization-stax/src/test/java/org/apache/zest/valueserialization/stax/StaxPlainValueSerializationTest.java b/extensions/valueserialization-stax/src/test/java/org/apache/zest/valueserialization/stax/StaxPlainValueSerializationTest.java index 9f3179d..adb1042 100644 --- a/extensions/valueserialization-stax/src/test/java/org/apache/zest/valueserialization/stax/StaxPlainValueSerializationTest.java +++ b/extensions/valueserialization-stax/src/test/java/org/apache/zest/valueserialization/stax/StaxPlainValueSerializationTest.java @@ -42,6 +42,9 @@ public class StaxPlainValueSerializationTest throws AssemblyException { new StaxValueSerializationAssembler().assemble( module ); + // END SNIPPET: assembly + super.assemble( module ); + // START SNIPPET: assembly } // END SNIPPET: assembly } http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/build.gradle ---------------------------------------------------------------------- diff --git a/tools/shell/build.gradle b/tools/shell/build.gradle index b4ea20e..212929a 100644 --- a/tools/shell/build.gradle +++ b/tools/shell/build.gradle @@ -26,7 +26,8 @@ mainClassName = "org.apache.zest.tools.shell.Main" jar { manifest { name = "Apache Zest⢠Command Line" } } dependencies { - compile( project( ":org.apache.zest.core:org.apache.zest.core.bootstrap" ) ) + compile project( ":org.apache.zest.core:org.apache.zest.core.bootstrap" ) - testRuntime( libraries.logback ) + testCompile libraries.junit + testRuntime libraries.logback } http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/dev-status.xml ---------------------------------------------------------------------- diff --git a/tools/shell/dev-status.xml b/tools/shell/dev-status.xml new file mode 100644 index 0000000..ea9c2e8 --- /dev/null +++ b/tools/shell/dev-status.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!-- + ~ 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. + ~ + ~ + --> +<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1 + http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd";> + <status> + <!--none,early,beta,stable,mature--> + <codebase>beta</codebase> + + <!-- none, brief, good, complete --> + <documentation>none</documentation> + + <!-- none, some, good, complete --> + <unittests>none</unittests> + </status> + <licenses> + <license>ALv2</license> + </licenses> +</module> http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/default/files/app/build.gradle_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/default/files/app/build.gradle_ b/tools/shell/src/etc/templates/default/files/app/build.gradle_ new file mode 100644 index 0000000..5a19653 --- /dev/null +++ b/tools/shell/src/etc/templates/default/files/app/build.gradle_ @@ -0,0 +1,20 @@ + +apply plugin: 'war' +apply plugin: 'jetty' + +dependencies { + compile project( ":bootstrap" ) + compile project( ":model" ) + compile project( ":rest" ) + + compile "org.apache.zest.core:org.apache.zest.core.spi:$zestVersion" + compile "org.apache.zest.core:org.apache.zest.core.bootstrap:$zestVersion" + compile "org.apache.zest.library:org.apache.zest.library.servlet:$zestVersion" + + compile "javax.servlet:servlet-api:2.5" + compile "org.restlet.jee:org.restlet:2.3.4" + + runtime "org.apache.zest.core:org.apache.zest.core.runtime:$zestVersion" + runtime "org.restlet.jee:org.restlet.ext.servlet:2.3.4" + +} http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/default/files/app/src/main/java/__package__/app/package.html ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/default/files/app/src/main/java/__package__/app/package.html b/tools/shell/src/etc/templates/default/files/app/src/main/java/__package__/app/package.html new file mode 100644 index 0000000..1f859fb --- /dev/null +++ b/tools/shell/src/etc/templates/default/files/app/src/main/java/__package__/app/package.html @@ -0,0 +1,23 @@ +<!-- + ~ 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. + ~ + ~ + --> + +<html> +<body>This package contains the bootstrap code.</body> +</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/default/files/app/src/main/resources/___placeholder___ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/default/files/app/src/main/resources/___placeholder___ b/tools/shell/src/etc/templates/default/files/app/src/main/resources/___placeholder___ new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/default/files/app/src/test/java/__package__/package.html ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/default/files/app/src/test/java/__package__/package.html b/tools/shell/src/etc/templates/default/files/app/src/test/java/__package__/package.html new file mode 100644 index 0000000..8bb0a631 --- /dev/null +++ b/tools/shell/src/etc/templates/default/files/app/src/test/java/__package__/package.html @@ -0,0 +1,21 @@ +<!-- + ~ 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. + ~ + ~ + --> + +<html><body>Test directory</body></html> http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/default/files/bootstrap/build.gradle_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/default/files/bootstrap/build.gradle_ b/tools/shell/src/etc/templates/default/files/bootstrap/build.gradle_ new file mode 100644 index 0000000..f26f7f8 --- /dev/null +++ b/tools/shell/src/etc/templates/default/files/bootstrap/build.gradle_ @@ -0,0 +1,16 @@ + +dependencies { + compile project( ":model" ) + compile project( ":rest" ) + + compile "org.apache.zest.core:org.apache.zest.core.spi:$zestVersion" + compile "org.apache.zest.core:org.apache.zest.core.bootstrap:$zestVersion" + + + compile "org.apache.zest.library:org.apache.zest.library.fileconfig:$zestVersion" + compile "org.apache.zest.library:org.apache.zest.library.restlet:$zestVersion" + compile "org.apache.zest.extension:org.apache.zest.extension.entitystore-file:$zestVersion" + compile "org.apache.zest.extension:org.apache.zest.extension.indexing-rdf:$zestVersion" + compile "org.apache.zest.extension:org.apache.zest.extension.valueserialization-jackson:$zestVersion" + +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/default/files/bootstrap/src/main/java/__package__/bootstrap/config/package.html_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/default/files/bootstrap/src/main/java/__package__/bootstrap/config/package.html_ b/tools/shell/src/etc/templates/default/files/bootstrap/src/main/java/__package__/bootstrap/config/package.html_ new file mode 100644 index 0000000..e4bffa5 --- /dev/null +++ b/tools/shell/src/etc/templates/default/files/bootstrap/src/main/java/__package__/bootstrap/config/package.html_ @@ -0,0 +1 @@ +<html><body>This package contains the assembly information for the Config layer.</body></html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/default/files/bootstrap/src/main/java/__package__/bootstrap/connectivity/package.html_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/default/files/bootstrap/src/main/java/__package__/bootstrap/connectivity/package.html_ b/tools/shell/src/etc/templates/default/files/bootstrap/src/main/java/__package__/bootstrap/connectivity/package.html_ new file mode 100644 index 0000000..21dbaa9 --- /dev/null +++ b/tools/shell/src/etc/templates/default/files/bootstrap/src/main/java/__package__/bootstrap/connectivity/package.html_ @@ -0,0 +1 @@ +<html><body>This package contains the assembly information for the Connectivity layer.</body></html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/default/files/bootstrap/src/main/java/__package__/bootstrap/domain/package.html_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/default/files/bootstrap/src/main/java/__package__/bootstrap/domain/package.html_ b/tools/shell/src/etc/templates/default/files/bootstrap/src/main/java/__package__/bootstrap/domain/package.html_ new file mode 100644 index 0000000..2bdc426 --- /dev/null +++ b/tools/shell/src/etc/templates/default/files/bootstrap/src/main/java/__package__/bootstrap/domain/package.html_ @@ -0,0 +1 @@ +<html><body>This package contains the assembly information for the Domain layer.</body></html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/default/files/bootstrap/src/main/java/__package__/bootstrap/infrastructure/package.html_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/default/files/bootstrap/src/main/java/__package__/bootstrap/infrastructure/package.html_ b/tools/shell/src/etc/templates/default/files/bootstrap/src/main/java/__package__/bootstrap/infrastructure/package.html_ new file mode 100644 index 0000000..cf2f9b5 --- /dev/null +++ b/tools/shell/src/etc/templates/default/files/bootstrap/src/main/java/__package__/bootstrap/infrastructure/package.html_ @@ -0,0 +1 @@ +<html><body>This package contains the assembly information for the Infrastructure layer.</body></html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/default/files/bootstrap/src/main/resources/___placeholder___ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/default/files/bootstrap/src/main/resources/___placeholder___ b/tools/shell/src/etc/templates/default/files/bootstrap/src/main/resources/___placeholder___ new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/default/files/bootstrap/src/test/java/__package__/package.html_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/default/files/bootstrap/src/test/java/__package__/package.html_ b/tools/shell/src/etc/templates/default/files/bootstrap/src/test/java/__package__/package.html_ new file mode 100644 index 0000000..300838d --- /dev/null +++ b/tools/shell/src/etc/templates/default/files/bootstrap/src/test/java/__package__/package.html_ @@ -0,0 +1 @@ +<html><body>Tests package</body></html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/default/files/build.gradle_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/default/files/build.gradle_ b/tools/shell/src/etc/templates/default/files/build.gradle_ new file mode 100644 index 0000000..9bfbb1e --- /dev/null +++ b/tools/shell/src/etc/templates/default/files/build.gradle_ @@ -0,0 +1,26 @@ + +version = 1.0 + +rootProject.ext { + // zestVersion = @@version@@ + zestVersion = 0 // 0 only during dev & testing +} + +allprojects() { + apply plugin: 'java' + apply plugin: 'idea' + apply plugin: 'maven' + + repositories { + mavenLocal() + mavenCentral() + maven { name 'restlet-repo'; url 'http://maven.restlet.org/' } + } + + + dependencies { + compile "org.apache.zest.core:org.apache.zest.core.api:$zestVersion" + testCompile "org.apache.zest.core:org.apache.zest.core.testsupport:$zestVersion" + } +} + http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/default/files/gradle/wrapper/gradle-wrapper.jar_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/default/files/gradle/wrapper/gradle-wrapper.jar_ b/tools/shell/src/etc/templates/default/files/gradle/wrapper/gradle-wrapper.jar_ new file mode 100644 index 0000000..0087cd3 Binary files /dev/null and b/tools/shell/src/etc/templates/default/files/gradle/wrapper/gradle-wrapper.jar_ differ http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/default/files/gradle/wrapper/gradle-wrapper.properties_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/default/files/gradle/wrapper/gradle-wrapper.properties_ b/tools/shell/src/etc/templates/default/files/gradle/wrapper/gradle-wrapper.properties_ new file mode 100644 index 0000000..fafa8dd --- /dev/null +++ b/tools/shell/src/etc/templates/default/files/gradle/wrapper/gradle-wrapper.properties_ @@ -0,0 +1,6 @@ +#Mon Jul 06 10:43:59 EEST 2015 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-bin.zip http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/default/files/gradlew.bat_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/default/files/gradlew.bat_ b/tools/shell/src/etc/templates/default/files/gradlew.bat_ new file mode 100644 index 0000000..8a0b282 --- /dev/null +++ b/tools/shell/src/etc/templates/default/files/gradlew.bat_ @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/default/files/gradlew_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/default/files/gradlew_ b/tools/shell/src/etc/templates/default/files/gradlew_ new file mode 100755 index 0000000..91a7e26 --- /dev/null +++ b/tools/shell/src/etc/templates/default/files/gradlew_ @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/default/files/model/build.gradle_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/default/files/model/build.gradle_ b/tools/shell/src/etc/templates/default/files/model/build.gradle_ new file mode 100644 index 0000000..83f55b2 --- /dev/null +++ b/tools/shell/src/etc/templates/default/files/model/build.gradle_ @@ -0,0 +1,7 @@ + + +dependencies { + + compile "org.restlet.jee:org.restlet:2.3.4" + +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/default/files/model/src/main/java/__package__/model/orders/package.html_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/default/files/model/src/main/java/__package__/model/orders/package.html_ b/tools/shell/src/etc/templates/default/files/model/src/main/java/__package__/model/orders/package.html_ new file mode 100644 index 0000000..441cb85 --- /dev/null +++ b/tools/shell/src/etc/templates/default/files/model/src/main/java/__package__/model/orders/package.html_ @@ -0,0 +1 @@ +<html><body>Very simple Domain Model to showcase the features of the Restlet library</body></html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/default/files/model/src/main/java/__package__/model/security/package.html_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/default/files/model/src/main/java/__package__/model/security/package.html_ b/tools/shell/src/etc/templates/default/files/model/src/main/java/__package__/model/security/package.html_ new file mode 100644 index 0000000..bcf0ee4 --- /dev/null +++ b/tools/shell/src/etc/templates/default/files/model/src/main/java/__package__/model/security/package.html_ @@ -0,0 +1 @@ +<html><body>Very simple Security Model to showcase the features of the Restlet library</body></html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/default/files/model/src/main/resources/___placeholder___ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/default/files/model/src/main/resources/___placeholder___ b/tools/shell/src/etc/templates/default/files/model/src/main/resources/___placeholder___ new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/default/files/model/src/test/java/__package__/package.html_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/default/files/model/src/test/java/__package__/package.html_ b/tools/shell/src/etc/templates/default/files/model/src/test/java/__package__/package.html_ new file mode 100644 index 0000000..300838d --- /dev/null +++ b/tools/shell/src/etc/templates/default/files/model/src/test/java/__package__/package.html_ @@ -0,0 +1 @@ +<html><body>Tests package</body></html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/null/files/build.gradle_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/null/files/build.gradle_ b/tools/shell/src/etc/templates/null/files/build.gradle_ new file mode 100644 index 0000000..9da0e88 --- /dev/null +++ b/tools/shell/src/etc/templates/null/files/build.gradle_ @@ -0,0 +1,24 @@ + +version = 1.0 + +rootProject.ext { + zestVersion = @@version@@ +} + +allprojects() { + apply plugin: 'java' + apply plugin: 'idea' + apply plugin: 'maven' + + repositories { + mavenLocal() + mavenCentral() + } + + + dependencies { + compile "org.apache.zest.core:org.apache.zest.core.api:$zestVersion" + testCompile "org.apache.zest.core:org.apache.zest.core.testsupport:$zestVersion" + } +} + http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/null/files/gradle/wrapper/gradle-wrapper.jar_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/null/files/gradle/wrapper/gradle-wrapper.jar_ b/tools/shell/src/etc/templates/null/files/gradle/wrapper/gradle-wrapper.jar_ new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/null/files/gradle/wrapper/gradle-wrapper.properties_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/null/files/gradle/wrapper/gradle-wrapper.properties_ b/tools/shell/src/etc/templates/null/files/gradle/wrapper/gradle-wrapper.properties_ new file mode 100644 index 0000000..fafa8dd --- /dev/null +++ b/tools/shell/src/etc/templates/null/files/gradle/wrapper/gradle-wrapper.properties_ @@ -0,0 +1,6 @@ +#Mon Jul 06 10:43:59 EEST 2015 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-bin.zip http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/null/files/gradlew.bat_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/null/files/gradlew.bat_ b/tools/shell/src/etc/templates/null/files/gradlew.bat_ new file mode 100644 index 0000000..8a0b282 --- /dev/null +++ b/tools/shell/src/etc/templates/null/files/gradlew.bat_ @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/null/files/gradlew_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/null/files/gradlew_ b/tools/shell/src/etc/templates/null/files/gradlew_ new file mode 100644 index 0000000..91a7e26 --- /dev/null +++ b/tools/shell/src/etc/templates/null/files/gradlew_ @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/null/files/src/main/java/__package__/package.html_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/null/files/src/main/java/__package__/package.html_ b/tools/shell/src/etc/templates/null/files/src/main/java/__package__/package.html_ new file mode 100644 index 0000000..e071c79 --- /dev/null +++ b/tools/shell/src/etc/templates/null/files/src/main/java/__package__/package.html_ @@ -0,0 +1 @@ +<html><body>Package for the Java source files</body></html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/null/files/src/test/java/__package__/package.html_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/null/files/src/test/java/__package__/package.html_ b/tools/shell/src/etc/templates/null/files/src/test/java/__package__/package.html_ new file mode 100644 index 0000000..eaefd36 --- /dev/null +++ b/tools/shell/src/etc/templates/null/files/src/test/java/__package__/package.html_ @@ -0,0 +1 @@ +<html><body>Package for testing classes.</body></html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/restapp/files/app/build.gradle_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/restapp/files/app/build.gradle_ b/tools/shell/src/etc/templates/restapp/files/app/build.gradle_ new file mode 100644 index 0000000..5a19653 --- /dev/null +++ b/tools/shell/src/etc/templates/restapp/files/app/build.gradle_ @@ -0,0 +1,20 @@ + +apply plugin: 'war' +apply plugin: 'jetty' + +dependencies { + compile project( ":bootstrap" ) + compile project( ":model" ) + compile project( ":rest" ) + + compile "org.apache.zest.core:org.apache.zest.core.spi:$zestVersion" + compile "org.apache.zest.core:org.apache.zest.core.bootstrap:$zestVersion" + compile "org.apache.zest.library:org.apache.zest.library.servlet:$zestVersion" + + compile "javax.servlet:servlet-api:2.5" + compile "org.restlet.jee:org.restlet:2.3.4" + + runtime "org.apache.zest.core:org.apache.zest.core.runtime:$zestVersion" + runtime "org.restlet.jee:org.restlet.ext.servlet:2.3.4" + +} http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/restapp/files/app/src/main/java/__package__/app/package.html ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/restapp/files/app/src/main/java/__package__/app/package.html b/tools/shell/src/etc/templates/restapp/files/app/src/main/java/__package__/app/package.html new file mode 100644 index 0000000..1f859fb --- /dev/null +++ b/tools/shell/src/etc/templates/restapp/files/app/src/main/java/__package__/app/package.html @@ -0,0 +1,23 @@ +<!-- + ~ 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. + ~ + ~ + --> + +<html> +<body>This package contains the bootstrap code.</body> +</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/restapp/files/app/src/main/resources/___placeholder___ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/restapp/files/app/src/main/resources/___placeholder___ b/tools/shell/src/etc/templates/restapp/files/app/src/main/resources/___placeholder___ new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/restapp/files/app/src/main/webapp/WEB-INF/___placeholder___ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/restapp/files/app/src/main/webapp/WEB-INF/___placeholder___ b/tools/shell/src/etc/templates/restapp/files/app/src/main/webapp/WEB-INF/___placeholder___ new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/restapp/files/app/src/test/java/__package__/package.html ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/restapp/files/app/src/test/java/__package__/package.html b/tools/shell/src/etc/templates/restapp/files/app/src/test/java/__package__/package.html new file mode 100644 index 0000000..8bb0a631 --- /dev/null +++ b/tools/shell/src/etc/templates/restapp/files/app/src/test/java/__package__/package.html @@ -0,0 +1,21 @@ +<!-- + ~ 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. + ~ + ~ + --> + +<html><body>Test directory</body></html> http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/restapp/files/bootstrap/build.gradle_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/restapp/files/bootstrap/build.gradle_ b/tools/shell/src/etc/templates/restapp/files/bootstrap/build.gradle_ new file mode 100644 index 0000000..f26f7f8 --- /dev/null +++ b/tools/shell/src/etc/templates/restapp/files/bootstrap/build.gradle_ @@ -0,0 +1,16 @@ + +dependencies { + compile project( ":model" ) + compile project( ":rest" ) + + compile "org.apache.zest.core:org.apache.zest.core.spi:$zestVersion" + compile "org.apache.zest.core:org.apache.zest.core.bootstrap:$zestVersion" + + + compile "org.apache.zest.library:org.apache.zest.library.fileconfig:$zestVersion" + compile "org.apache.zest.library:org.apache.zest.library.restlet:$zestVersion" + compile "org.apache.zest.extension:org.apache.zest.extension.entitystore-file:$zestVersion" + compile "org.apache.zest.extension:org.apache.zest.extension.indexing-rdf:$zestVersion" + compile "org.apache.zest.extension:org.apache.zest.extension.valueserialization-jackson:$zestVersion" + +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/restapp/files/bootstrap/src/main/java/__package__/bootstrap/config/package.html_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/restapp/files/bootstrap/src/main/java/__package__/bootstrap/config/package.html_ b/tools/shell/src/etc/templates/restapp/files/bootstrap/src/main/java/__package__/bootstrap/config/package.html_ new file mode 100644 index 0000000..e4bffa5 --- /dev/null +++ b/tools/shell/src/etc/templates/restapp/files/bootstrap/src/main/java/__package__/bootstrap/config/package.html_ @@ -0,0 +1 @@ +<html><body>This package contains the assembly information for the Config layer.</body></html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/restapp/files/bootstrap/src/main/java/__package__/bootstrap/connectivity/package.html_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/restapp/files/bootstrap/src/main/java/__package__/bootstrap/connectivity/package.html_ b/tools/shell/src/etc/templates/restapp/files/bootstrap/src/main/java/__package__/bootstrap/connectivity/package.html_ new file mode 100644 index 0000000..21dbaa9 --- /dev/null +++ b/tools/shell/src/etc/templates/restapp/files/bootstrap/src/main/java/__package__/bootstrap/connectivity/package.html_ @@ -0,0 +1 @@ +<html><body>This package contains the assembly information for the Connectivity layer.</body></html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/restapp/files/bootstrap/src/main/java/__package__/bootstrap/domain/package.html_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/restapp/files/bootstrap/src/main/java/__package__/bootstrap/domain/package.html_ b/tools/shell/src/etc/templates/restapp/files/bootstrap/src/main/java/__package__/bootstrap/domain/package.html_ new file mode 100644 index 0000000..2bdc426 --- /dev/null +++ b/tools/shell/src/etc/templates/restapp/files/bootstrap/src/main/java/__package__/bootstrap/domain/package.html_ @@ -0,0 +1 @@ +<html><body>This package contains the assembly information for the Domain layer.</body></html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/restapp/files/bootstrap/src/main/java/__package__/bootstrap/infrastructure/package.html_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/restapp/files/bootstrap/src/main/java/__package__/bootstrap/infrastructure/package.html_ b/tools/shell/src/etc/templates/restapp/files/bootstrap/src/main/java/__package__/bootstrap/infrastructure/package.html_ new file mode 100644 index 0000000..cf2f9b5 --- /dev/null +++ b/tools/shell/src/etc/templates/restapp/files/bootstrap/src/main/java/__package__/bootstrap/infrastructure/package.html_ @@ -0,0 +1 @@ +<html><body>This package contains the assembly information for the Infrastructure layer.</body></html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/restapp/files/bootstrap/src/main/resources/___placeholder___ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/restapp/files/bootstrap/src/main/resources/___placeholder___ b/tools/shell/src/etc/templates/restapp/files/bootstrap/src/main/resources/___placeholder___ new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/restapp/files/bootstrap/src/test/java/__package__/package.html_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/restapp/files/bootstrap/src/test/java/__package__/package.html_ b/tools/shell/src/etc/templates/restapp/files/bootstrap/src/test/java/__package__/package.html_ new file mode 100644 index 0000000..300838d --- /dev/null +++ b/tools/shell/src/etc/templates/restapp/files/bootstrap/src/test/java/__package__/package.html_ @@ -0,0 +1 @@ +<html><body>Tests package</body></html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/restapp/files/build.gradle_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/restapp/files/build.gradle_ b/tools/shell/src/etc/templates/restapp/files/build.gradle_ new file mode 100644 index 0000000..9bfbb1e --- /dev/null +++ b/tools/shell/src/etc/templates/restapp/files/build.gradle_ @@ -0,0 +1,26 @@ + +version = 1.0 + +rootProject.ext { + // zestVersion = @@version@@ + zestVersion = 0 // 0 only during dev & testing +} + +allprojects() { + apply plugin: 'java' + apply plugin: 'idea' + apply plugin: 'maven' + + repositories { + mavenLocal() + mavenCentral() + maven { name 'restlet-repo'; url 'http://maven.restlet.org/' } + } + + + dependencies { + compile "org.apache.zest.core:org.apache.zest.core.api:$zestVersion" + testCompile "org.apache.zest.core:org.apache.zest.core.testsupport:$zestVersion" + } +} + http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/restapp/files/gradle/wrapper/gradle-wrapper.jar_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/restapp/files/gradle/wrapper/gradle-wrapper.jar_ b/tools/shell/src/etc/templates/restapp/files/gradle/wrapper/gradle-wrapper.jar_ new file mode 100644 index 0000000..0087cd3 Binary files /dev/null and b/tools/shell/src/etc/templates/restapp/files/gradle/wrapper/gradle-wrapper.jar_ differ http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/restapp/files/gradle/wrapper/gradle-wrapper.properties_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/restapp/files/gradle/wrapper/gradle-wrapper.properties_ b/tools/shell/src/etc/templates/restapp/files/gradle/wrapper/gradle-wrapper.properties_ new file mode 100644 index 0000000..fafa8dd --- /dev/null +++ b/tools/shell/src/etc/templates/restapp/files/gradle/wrapper/gradle-wrapper.properties_ @@ -0,0 +1,6 @@ +#Mon Jul 06 10:43:59 EEST 2015 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-bin.zip http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/restapp/files/gradlew.bat_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/restapp/files/gradlew.bat_ b/tools/shell/src/etc/templates/restapp/files/gradlew.bat_ new file mode 100644 index 0000000..8a0b282 --- /dev/null +++ b/tools/shell/src/etc/templates/restapp/files/gradlew.bat_ @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/restapp/files/gradlew_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/restapp/files/gradlew_ b/tools/shell/src/etc/templates/restapp/files/gradlew_ new file mode 100755 index 0000000..91a7e26 --- /dev/null +++ b/tools/shell/src/etc/templates/restapp/files/gradlew_ @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/restapp/files/model/build.gradle_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/restapp/files/model/build.gradle_ b/tools/shell/src/etc/templates/restapp/files/model/build.gradle_ new file mode 100644 index 0000000..83f55b2 --- /dev/null +++ b/tools/shell/src/etc/templates/restapp/files/model/build.gradle_ @@ -0,0 +1,7 @@ + + +dependencies { + + compile "org.restlet.jee:org.restlet:2.3.4" + +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/restapp/files/model/src/main/java/__package__/model/orders/package.html_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/restapp/files/model/src/main/java/__package__/model/orders/package.html_ b/tools/shell/src/etc/templates/restapp/files/model/src/main/java/__package__/model/orders/package.html_ new file mode 100644 index 0000000..441cb85 --- /dev/null +++ b/tools/shell/src/etc/templates/restapp/files/model/src/main/java/__package__/model/orders/package.html_ @@ -0,0 +1 @@ +<html><body>Very simple Domain Model to showcase the features of the Restlet library</body></html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/restapp/files/model/src/main/java/__package__/model/security/package.html_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/restapp/files/model/src/main/java/__package__/model/security/package.html_ b/tools/shell/src/etc/templates/restapp/files/model/src/main/java/__package__/model/security/package.html_ new file mode 100644 index 0000000..bcf0ee4 --- /dev/null +++ b/tools/shell/src/etc/templates/restapp/files/model/src/main/java/__package__/model/security/package.html_ @@ -0,0 +1 @@ +<html><body>Very simple Security Model to showcase the features of the Restlet library</body></html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/restapp/files/model/src/main/resources/___placeholder___ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/restapp/files/model/src/main/resources/___placeholder___ b/tools/shell/src/etc/templates/restapp/files/model/src/main/resources/___placeholder___ new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/restapp/files/model/src/test/java/__package__/package.html_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/restapp/files/model/src/test/java/__package__/package.html_ b/tools/shell/src/etc/templates/restapp/files/model/src/test/java/__package__/package.html_ new file mode 100644 index 0000000..300838d --- /dev/null +++ b/tools/shell/src/etc/templates/restapp/files/model/src/test/java/__package__/package.html_ @@ -0,0 +1 @@ +<html><body>Tests package</body></html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/restapp/files/rest/build.gradle_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/restapp/files/rest/build.gradle_ b/tools/shell/src/etc/templates/restapp/files/rest/build.gradle_ new file mode 100644 index 0000000..a89355a --- /dev/null +++ b/tools/shell/src/etc/templates/restapp/files/rest/build.gradle_ @@ -0,0 +1,8 @@ + +dependencies { + compile project( ":model" ) + + compile "org.apache.zest.core:org.apache.zest.core.api:$zestVersion" + compile "org.apache.zest.library:org.apache.zest.library.restlet:$zestVersion" + +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/restapp/files/rest/src/main/java/__package__/rest/security/package.html_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/restapp/files/rest/src/main/java/__package__/rest/security/package.html_ b/tools/shell/src/etc/templates/restapp/files/rest/src/main/java/__package__/rest/security/package.html_ new file mode 100644 index 0000000..249f68c --- /dev/null +++ b/tools/shell/src/etc/templates/restapp/files/rest/src/main/java/__package__/rest/security/package.html_ @@ -0,0 +1 @@ +<html><body>Package for the security handling in the Connectivity Layer</body></html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/restapp/files/rest/src/main/resources/___placeholder___ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/restapp/files/rest/src/main/resources/___placeholder___ b/tools/shell/src/etc/templates/restapp/files/rest/src/main/resources/___placeholder___ new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/restapp/files/rest/src/test/java/__package__/package.html_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/restapp/files/rest/src/test/java/__package__/package.html_ b/tools/shell/src/etc/templates/restapp/files/rest/src/test/java/__package__/package.html_ new file mode 100644 index 0000000..300838d --- /dev/null +++ b/tools/shell/src/etc/templates/restapp/files/rest/src/test/java/__package__/package.html_ @@ -0,0 +1 @@ +<html><body>Tests package</body></html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/restproject/files/app/build.gradle_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/restproject/files/app/build.gradle_ b/tools/shell/src/etc/templates/restproject/files/app/build.gradle_ deleted file mode 100644 index 5a19653..0000000 --- a/tools/shell/src/etc/templates/restproject/files/app/build.gradle_ +++ /dev/null @@ -1,20 +0,0 @@ - -apply plugin: 'war' -apply plugin: 'jetty' - -dependencies { - compile project( ":bootstrap" ) - compile project( ":model" ) - compile project( ":rest" ) - - compile "org.apache.zest.core:org.apache.zest.core.spi:$zestVersion" - compile "org.apache.zest.core:org.apache.zest.core.bootstrap:$zestVersion" - compile "org.apache.zest.library:org.apache.zest.library.servlet:$zestVersion" - - compile "javax.servlet:servlet-api:2.5" - compile "org.restlet.jee:org.restlet:2.3.4" - - runtime "org.apache.zest.core:org.apache.zest.core.runtime:$zestVersion" - runtime "org.restlet.jee:org.restlet.ext.servlet:2.3.4" - -} http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/restproject/files/app/src/main/java/__package__/app/package.html ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/restproject/files/app/src/main/java/__package__/app/package.html b/tools/shell/src/etc/templates/restproject/files/app/src/main/java/__package__/app/package.html deleted file mode 100644 index 1f859fb..0000000 --- a/tools/shell/src/etc/templates/restproject/files/app/src/main/java/__package__/app/package.html +++ /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. - ~ - ~ - --> - -<html> -<body>This package contains the bootstrap code.</body> -</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/0accd2cf/tools/shell/src/etc/templates/restproject/files/app/src/main/webapp/WEB-INF/___placeholder___ ---------------------------------------------------------------------- diff --git a/tools/shell/src/etc/templates/restproject/files/app/src/main/webapp/WEB-INF/___placeholder___ b/tools/shell/src/etc/templates/restproject/files/app/src/main/webapp/WEB-INF/___placeholder___ deleted file mode 100644 index 0e6b010..0000000 --- a/tools/shell/src/etc/templates/restproject/files/app/src/main/webapp/WEB-INF/___placeholder___ +++ /dev/null @@ -1 +0,0 @@ -Webapp directory. \ No newline at end of file
