Repository: zest-java Updated Branches: refs/heads/develop 772aa0388 -> afb9409de
Yep, the upper/lower case became a problem. Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/afb9409d Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/afb9409d Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/afb9409d Branch: refs/heads/develop Commit: afb9409de728532eace4b51f61acf8871acf2dd0 Parents: 772aa03 Author: Niclas Hedhman <[email protected]> Authored: Mon Apr 18 17:13:55 2016 +0800 Committer: Niclas Hedhman <[email protected]> Committed: Mon Apr 18 17:13:55 2016 +0800 ---------------------------------------------------------------------- tools/shell/build.gradle | 2 - .../create/project/RestAppProjectCreator.java | 88 -------------------- .../create/project/RestProjectCreator.java | 88 ++++++++++++++++++++ .../project/defaultp/ApplicationWriter.java | 2 - .../templates/restapp/project.properties | 2 +- .../create/project/RestProjectCreatorTest.java | 2 +- 6 files changed, 90 insertions(+), 94 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/afb9409d/tools/shell/build.gradle ---------------------------------------------------------------------- diff --git a/tools/shell/build.gradle b/tools/shell/build.gradle index 212929a..bdc6716 100644 --- a/tools/shell/build.gradle +++ b/tools/shell/build.gradle @@ -26,8 +26,6 @@ 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" ) - testCompile libraries.junit testRuntime libraries.logback } http://git-wip-us.apache.org/repos/asf/zest-java/blob/afb9409d/tools/shell/src/main/java/org/apache/zest/tools/shell/create/project/RestAppProjectCreator.java ---------------------------------------------------------------------- diff --git a/tools/shell/src/main/java/org/apache/zest/tools/shell/create/project/RestAppProjectCreator.java b/tools/shell/src/main/java/org/apache/zest/tools/shell/create/project/RestAppProjectCreator.java deleted file mode 100644 index 299305b..0000000 --- a/tools/shell/src/main/java/org/apache/zest/tools/shell/create/project/RestAppProjectCreator.java +++ /dev/null @@ -1,88 +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. - * - * - */ - -package org.apache.zest.tools.shell.create.project; - -import java.io.File; -import java.io.IOException; -import java.util.Map; -import org.apache.zest.tools.shell.create.project.common.ApplicationAssemblerWriter; -import org.apache.zest.tools.shell.create.project.restapp.ApplicationWriter; -import org.apache.zest.tools.shell.create.project.common.ConfigLayerWriter; -import org.apache.zest.tools.shell.create.project.common.ConfigModuleWriter; -import org.apache.zest.tools.shell.create.project.common.ConnectivityLayerWriter; -import org.apache.zest.tools.shell.create.project.common.CrudModuleWriter; -import org.apache.zest.tools.shell.create.project.common.CustomerWriter; -import org.apache.zest.tools.shell.create.project.common.DomainLayerWriter; -import org.apache.zest.tools.shell.create.project.common.FileConfigurationModuleWriter; -import org.apache.zest.tools.shell.create.project.common.HardCodedSecurityRepositoryMixinWriter; -import org.apache.zest.tools.shell.create.project.common.IndexingModuleWriter; -import org.apache.zest.tools.shell.create.project.common.InfrastructureLayerWriter; -import org.apache.zest.tools.shell.create.project.common.OrderItemWriter; -import org.apache.zest.tools.shell.create.project.common.OrderWriter; -import org.apache.zest.tools.shell.create.project.restapp.RestModuleWriter; -import org.apache.zest.tools.shell.create.project.common.OrderModuleWriter; -import org.apache.zest.tools.shell.create.project.common.SecurityModuleWriter; -import org.apache.zest.tools.shell.create.project.common.SecurityRepositoryWriter; -import org.apache.zest.tools.shell.create.project.common.SerializationModuleWriter; -import org.apache.zest.tools.shell.create.project.common.SettingsWriter; -import org.apache.zest.tools.shell.create.project.restapp.SimpleEnrolerWriter; -import org.apache.zest.tools.shell.create.project.restapp.SimpleVerifierWriter; -import org.apache.zest.tools.shell.create.project.common.StorageModuleWriter; -import org.apache.zest.tools.shell.create.project.restapp.WebXmlWriter; - -public class RestAppProjectCreator extends AbstractProjectCreator - implements ProjectCreator -{ - - @Override - public void create( String projectName, File projectDir, Map<String, String> properties ) - throws IOException - { - super.create( projectName, projectDir, properties ); // creates the directory structures. - new ApplicationAssemblerWriter().writeClass( properties ); - new ConfigLayerWriter().writeClass( properties ); - new ConfigModuleWriter().writeClass( properties ); - new InfrastructureLayerWriter().writeClass( properties ); - new FileConfigurationModuleWriter().writeClass( properties ); - new StorageModuleWriter().writeClass( properties ); - new IndexingModuleWriter().writeClass( properties ); - new SerializationModuleWriter().writeClass( properties ); - new DomainLayerWriter().writeClass( properties ); - new OrderModuleWriter().writeClass( properties ); - new CrudModuleWriter().writeClass( properties ); - new ConnectivityLayerWriter().writeClass( properties ); - new RestModuleWriter().writeClass( properties ); - - new ApplicationWriter().writeClass( properties ); - new SimpleEnrolerWriter().writeClass( properties ); - new SimpleVerifierWriter().writeClass( properties ); - - new SecurityModuleWriter().writeClass( properties ); - new SecurityRepositoryWriter().writeClass( properties ); - new HardCodedSecurityRepositoryMixinWriter().writeClass( properties ); - new OrderWriter().writeClass( properties ); - new OrderItemWriter().writeClass( properties ); - new CustomerWriter().writeClass( properties ); - - new SettingsWriter().writeClass( properties ); - new WebXmlWriter().writeClass( properties ); - } -} http://git-wip-us.apache.org/repos/asf/zest-java/blob/afb9409d/tools/shell/src/main/java/org/apache/zest/tools/shell/create/project/RestProjectCreator.java ---------------------------------------------------------------------- diff --git a/tools/shell/src/main/java/org/apache/zest/tools/shell/create/project/RestProjectCreator.java b/tools/shell/src/main/java/org/apache/zest/tools/shell/create/project/RestProjectCreator.java new file mode 100644 index 0000000..ec54ee2 --- /dev/null +++ b/tools/shell/src/main/java/org/apache/zest/tools/shell/create/project/RestProjectCreator.java @@ -0,0 +1,88 @@ +/* + * 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. + * + * + */ + +package org.apache.zest.tools.shell.create.project; + +import java.io.File; +import java.io.IOException; +import java.util.Map; +import org.apache.zest.tools.shell.create.project.common.ApplicationAssemblerWriter; +import org.apache.zest.tools.shell.create.project.restapp.ApplicationWriter; +import org.apache.zest.tools.shell.create.project.common.ConfigLayerWriter; +import org.apache.zest.tools.shell.create.project.common.ConfigModuleWriter; +import org.apache.zest.tools.shell.create.project.common.ConnectivityLayerWriter; +import org.apache.zest.tools.shell.create.project.common.CrudModuleWriter; +import org.apache.zest.tools.shell.create.project.common.CustomerWriter; +import org.apache.zest.tools.shell.create.project.common.DomainLayerWriter; +import org.apache.zest.tools.shell.create.project.common.FileConfigurationModuleWriter; +import org.apache.zest.tools.shell.create.project.common.HardCodedSecurityRepositoryMixinWriter; +import org.apache.zest.tools.shell.create.project.common.IndexingModuleWriter; +import org.apache.zest.tools.shell.create.project.common.InfrastructureLayerWriter; +import org.apache.zest.tools.shell.create.project.common.OrderItemWriter; +import org.apache.zest.tools.shell.create.project.common.OrderWriter; +import org.apache.zest.tools.shell.create.project.restapp.RestModuleWriter; +import org.apache.zest.tools.shell.create.project.common.OrderModuleWriter; +import org.apache.zest.tools.shell.create.project.common.SecurityModuleWriter; +import org.apache.zest.tools.shell.create.project.common.SecurityRepositoryWriter; +import org.apache.zest.tools.shell.create.project.common.SerializationModuleWriter; +import org.apache.zest.tools.shell.create.project.common.SettingsWriter; +import org.apache.zest.tools.shell.create.project.restapp.SimpleEnrolerWriter; +import org.apache.zest.tools.shell.create.project.restapp.SimpleVerifierWriter; +import org.apache.zest.tools.shell.create.project.common.StorageModuleWriter; +import org.apache.zest.tools.shell.create.project.restapp.WebXmlWriter; + +public class RestProjectCreator extends AbstractProjectCreator + implements ProjectCreator +{ + + @Override + public void create( String projectName, File projectDir, Map<String, String> properties ) + throws IOException + { + super.create( projectName, projectDir, properties ); // creates the directory structures. + new ApplicationAssemblerWriter().writeClass( properties ); + new ConfigLayerWriter().writeClass( properties ); + new ConfigModuleWriter().writeClass( properties ); + new InfrastructureLayerWriter().writeClass( properties ); + new FileConfigurationModuleWriter().writeClass( properties ); + new StorageModuleWriter().writeClass( properties ); + new IndexingModuleWriter().writeClass( properties ); + new SerializationModuleWriter().writeClass( properties ); + new DomainLayerWriter().writeClass( properties ); + new OrderModuleWriter().writeClass( properties ); + new CrudModuleWriter().writeClass( properties ); + new ConnectivityLayerWriter().writeClass( properties ); + new RestModuleWriter().writeClass( properties ); + + new ApplicationWriter().writeClass( properties ); + new SimpleEnrolerWriter().writeClass( properties ); + new SimpleVerifierWriter().writeClass( properties ); + + new SecurityModuleWriter().writeClass( properties ); + new SecurityRepositoryWriter().writeClass( properties ); + new HardCodedSecurityRepositoryMixinWriter().writeClass( properties ); + new OrderWriter().writeClass( properties ); + new OrderItemWriter().writeClass( properties ); + new CustomerWriter().writeClass( properties ); + + new SettingsWriter().writeClass( properties ); + new WebXmlWriter().writeClass( properties ); + } +} http://git-wip-us.apache.org/repos/asf/zest-java/blob/afb9409d/tools/shell/src/main/java/org/apache/zest/tools/shell/create/project/defaultp/ApplicationWriter.java ---------------------------------------------------------------------- diff --git a/tools/shell/src/main/java/org/apache/zest/tools/shell/create/project/defaultp/ApplicationWriter.java b/tools/shell/src/main/java/org/apache/zest/tools/shell/create/project/defaultp/ApplicationWriter.java index c2cfc4f..8d71c50 100644 --- a/tools/shell/src/main/java/org/apache/zest/tools/shell/create/project/defaultp/ApplicationWriter.java +++ b/tools/shell/src/main/java/org/apache/zest/tools/shell/create/project/defaultp/ApplicationWriter.java @@ -25,8 +25,6 @@ import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; import java.util.Map; -import org.apache.zest.bootstrap.ApplicationAssembler; -import org.apache.zest.bootstrap.Energy4Java; import static java.lang.String.format; http://git-wip-us.apache.org/repos/asf/zest-java/blob/afb9409d/tools/shell/src/main/resources/templates/restapp/project.properties ---------------------------------------------------------------------- diff --git a/tools/shell/src/main/resources/templates/restapp/project.properties b/tools/shell/src/main/resources/templates/restapp/project.properties index dc97019..5e78fd6 100644 --- a/tools/shell/src/main/resources/templates/restapp/project.properties +++ b/tools/shell/src/main/resources/templates/restapp/project.properties @@ -18,6 +18,6 @@ # # -creator.class=org.apache.zest.tools.shell.create.project.RestAppProjectCreator +creator.class=org.apache.zest.tools.shell.create.project.RestProjectCreator template.dir=etc/templates/restapp/files \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/afb9409d/tools/shell/src/test/java/org/apache/zest/tools/shell/create/project/RestProjectCreatorTest.java ---------------------------------------------------------------------- diff --git a/tools/shell/src/test/java/org/apache/zest/tools/shell/create/project/RestProjectCreatorTest.java b/tools/shell/src/test/java/org/apache/zest/tools/shell/create/project/RestProjectCreatorTest.java index 41d832b..e99695d 100644 --- a/tools/shell/src/test/java/org/apache/zest/tools/shell/create/project/RestProjectCreatorTest.java +++ b/tools/shell/src/test/java/org/apache/zest/tools/shell/create/project/RestProjectCreatorTest.java @@ -33,7 +33,7 @@ import static org.junit.Assert.assertThat; public class RestProjectCreatorTest { - private RestAppProjectCreator underTest = new RestAppProjectCreator(); + private RestProjectCreator underTest = new RestProjectCreator(); @Test public void givenCorrectInputWhenCreatedProjectExpectCompleteProjectCreated()
