From bb7e0c8a74dd92d6dd3f78e0646f655c5ba8a0aa Mon Sep 17 00:00:00 2001 From: jameskleeh Date: Tue, 11 Apr 2017 09:49:54 -0400 Subject: [PATCH] Rename to angular-scaffolding --- README.md | 8 +++---- build.gradle | 18 +++++++-------- .../scaffolding/NgGenerateAllCommand.groovy | 22 +++++++++---------- .../scaffolding/NgInstallTemplates.groovy | 4 ++-- .../scaffolding/Application.groovy | 2 +- settings.gradle | 2 +- src/docs/asciidoc/customization/index.adoc | 6 ++--- src/docs/asciidoc/index.adoc | 2 +- src/docs/asciidoc/installation/index.adoc | 2 +- src/docs/asciidoc/introduction.adoc | 2 +- src/docs/asciidoc/usage/index.adoc | 8 +++---- .../AngularScaffoldingGrailsPlugin.groovy} | 22 +++++++++---------- .../AngularContextMarkupRenderer.groovy | 2 +- .../AngularPropertyMarkupRenderer.groovy | 2 +- .../AngularDomainRendererRegisterer.groovy | 12 +++++----- .../AngularAssociationInputRenderer.groovy | 4 ++-- ...larBidirectionalToManyInputRenderer.groovy | 2 +- .../input/AngularDateInputRenderer.groovy | 2 +- .../input/AngularFileInputRenderer.groovy | 2 +- .../output/AngularDateOutputRenderer.groovy | 2 +- .../AngularDefaultOutputRenderer.groovy | 2 +- .../output/AngularDomainOutputRenderer.groovy | 3 +-- .../output/AngularIdOutputRenderer.groovy | 2 +- .../output/AngularToManyOutputRenderer.groovy | 2 +- .../output/AngularToOneOutputRenderer.groovy | 2 +- .../registry/output/PropertyHelper.groovy | 2 +- .../template/AngularModuleEditor.groovy | 2 +- .../template/AngularModuleEditorImpl.groovy | 2 +- .../javascripts/domain.ts | 0 .../javascripts/list.component.ts | 0 .../javascripts/module.ts | 0 .../javascripts/persist.component.ts | 0 .../javascripts/routing.module.ts | 0 .../javascripts/service-file.ts | 0 .../javascripts/service.ts | 0 .../javascripts/show.component.ts | 0 .../views/list.component.html | 0 .../views/persist.component.html | 0 .../views/show.component.html | 0 .../template/AngularModuleEditorSpec.groovy | 2 +- 40 files changed, 72 insertions(+), 73 deletions(-) rename grails-app/commands/{angular2 => angular}/scaffolding/NgGenerateAllCommand.groovy (92%) rename grails-app/commands/{angular2 => angular}/scaffolding/NgInstallTemplates.groovy (89%) rename grails-app/init/{angular2 => angular}/scaffolding/Application.groovy (90%) rename src/main/groovy/org/grails/plugin/scaffolding/{angular2/Angular2ScaffoldingGrailsPlugin.groovy => angular/AngularScaffoldingGrailsPlugin.groovy} (58%) rename src/main/groovy/org/grails/plugin/scaffolding/{angular2 => angular}/markup/AngularContextMarkupRenderer.groovy (95%) rename src/main/groovy/org/grails/plugin/scaffolding/{angular2 => angular}/markup/AngularPropertyMarkupRenderer.groovy (91%) rename src/main/groovy/org/grails/plugin/scaffolding/{angular2 => angular}/registry/AngularDomainRendererRegisterer.groovy (73%) rename src/main/groovy/org/grails/plugin/scaffolding/{angular2 => angular}/registry/input/AngularAssociationInputRenderer.groovy (90%) rename src/main/groovy/org/grails/plugin/scaffolding/{angular2 => angular}/registry/input/AngularBidirectionalToManyInputRenderer.groovy (94%) rename src/main/groovy/org/grails/plugin/scaffolding/{angular2 => angular}/registry/input/AngularDateInputRenderer.groovy (91%) rename src/main/groovy/org/grails/plugin/scaffolding/{angular2 => angular}/registry/input/AngularFileInputRenderer.groovy (93%) rename src/main/groovy/org/grails/plugin/scaffolding/{angular2 => angular}/registry/output/AngularDateOutputRenderer.groovy (88%) rename src/main/groovy/org/grails/plugin/scaffolding/{angular2 => angular}/registry/output/AngularDefaultOutputRenderer.groovy (87%) rename src/main/groovy/org/grails/plugin/scaffolding/{angular2 => angular}/registry/output/AngularDomainOutputRenderer.groovy (86%) rename src/main/groovy/org/grails/plugin/scaffolding/{angular2 => angular}/registry/output/AngularIdOutputRenderer.groovy (92%) rename src/main/groovy/org/grails/plugin/scaffolding/{angular2 => angular}/registry/output/AngularToManyOutputRenderer.groovy (94%) rename src/main/groovy/org/grails/plugin/scaffolding/{angular2 => angular}/registry/output/AngularToOneOutputRenderer.groovy (90%) rename src/main/groovy/org/grails/plugin/scaffolding/{angular2 => angular}/registry/output/PropertyHelper.groovy (89%) rename src/main/groovy/org/grails/plugin/scaffolding/{angular2 => angular}/template/AngularModuleEditor.groovy (82%) rename src/main/groovy/org/grails/plugin/scaffolding/{angular2 => angular}/template/AngularModuleEditorImpl.groovy (99%) rename src/main/templates/{angular2 => angular}/javascripts/domain.ts (100%) rename src/main/templates/{angular2 => angular}/javascripts/list.component.ts (100%) rename src/main/templates/{angular2 => angular}/javascripts/module.ts (100%) rename src/main/templates/{angular2 => angular}/javascripts/persist.component.ts (100%) rename src/main/templates/{angular2 => angular}/javascripts/routing.module.ts (100%) rename src/main/templates/{angular2 => angular}/javascripts/service-file.ts (100%) rename src/main/templates/{angular2 => angular}/javascripts/service.ts (100%) rename src/main/templates/{angular2 => angular}/javascripts/show.component.ts (100%) rename src/main/templates/{angular2 => angular}/views/list.component.html (100%) rename src/main/templates/{angular2 => angular}/views/persist.component.html (100%) rename src/main/templates/{angular2 => angular}/views/show.component.html (100%) rename src/test/groovy/org/grails/plugin/scaffolding/{angular2 => angular}/template/AngularModuleEditorSpec.groovy (99%) diff --git a/README.md b/README.md index 4030143..f7a0e8e 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -# Grails 3 Angular 2 Scaffolding Plugin +# Grails 3 Angular Scaffolding Plugin -[![Build Status](https://travis-ci.org/grails-plugins/grails-angular2-scaffolding.svg?branch=master)](https://travis-ci.org/grails-plugins/grails-angular2-scaffolding) +[![Build Status](https://travis-ci.org/grails-plugins/grails-angular-scaffolding.svg?branch=master)](https://travis-ci.org/grails-plugins/grails-angular-scaffolding) A plugin for generating client side assets based on domain classes ## Documentation -Latest: http://grails-plugins.github.io/grails-angular2-scaffolding/latest -Snapshot: http://grails-plugins.github.io/grails-angular2-scaffolding/snapshot +Latest: http://grails-plugins.github.io/grails-angular-scaffolding/latest +Snapshot: http://grails-plugins.github.io/grails-angular-scaffolding/snapshot diff --git a/build.gradle b/build.gradle index 141c1c3..12391de 100644 --- a/build.gradle +++ b/build.gradle @@ -12,13 +12,13 @@ plugins { id 'org.asciidoctor.convert' version '1.5.3' } -version "1.0.0.RC1" +version "2.0.0.RC1" group "org.grails.plugins" -apply plugin:"eclipse" -apply plugin:"idea" -apply plugin:"org.grails.grails-plugin" -apply plugin:"org.grails.grails-plugin-publish" +apply plugin: "eclipse" +apply plugin: "idea" +apply plugin: "org.grails.grails-plugin" +apply plugin: "org.grails.grails-plugin-publish" repositories { mavenLocal() @@ -57,12 +57,12 @@ bootRepackage.enabled = false grailsPublish { userOrg = "grails" - githubSlug = 'grails-plugins/grails-angular2-scaffolding' + githubSlug = 'grails-plugins/grails-angular-scaffolding' license { name = 'Apache-2.0' } - title = "Angular 2 Scaffolding Plugin" - desc = "Provides scaffolding for Angular 2 applications" + title = "Angular Scaffolding Plugin" + desc = "Provides scaffolding for Angular applications" developers = [jameskleeh: "James Kleeh"] } @@ -88,7 +88,7 @@ task apidocs(type: Groovydoc) { destinationDir = new File(buildDir, 'docs/api') // Might need a classpath - docTitle = "Grails Angular 2 Scaffolding ${version}" + docTitle = "Grails Angular Scaffolding ${version}" classpath = configurations.documentation groovyClasspath = configurations.documentation diff --git a/grails-app/commands/angular2/scaffolding/NgGenerateAllCommand.groovy b/grails-app/commands/angular/scaffolding/NgGenerateAllCommand.groovy similarity index 92% rename from grails-app/commands/angular2/scaffolding/NgGenerateAllCommand.groovy rename to grails-app/commands/angular/scaffolding/NgGenerateAllCommand.groovy index 73bd126..9a7b032 100644 --- a/grails-app/commands/angular2/scaffolding/NgGenerateAllCommand.groovy +++ b/grails-app/commands/angular/scaffolding/NgGenerateAllCommand.groovy @@ -1,4 +1,4 @@ -package angular2.scaffolding +package angular.scaffolding import grails.codegen.model.Model import grails.dev.commands.GrailsApplicationCommand @@ -10,7 +10,7 @@ import org.grails.datastore.mapping.model.PersistentEntity import org.grails.datastore.mapping.model.PersistentProperty import org.grails.datastore.mapping.model.types.Association import org.grails.datastore.mapping.model.types.ToMany -import org.grails.plugin.scaffolding.angular2.template.AngularModuleEditor +import org.grails.plugin.scaffolding.angular.template.AngularModuleEditor import org.grails.scaffolding.markup.DomainMarkupRenderer import org.grails.scaffolding.model.DomainModelService import org.grails.scaffolding.model.property.DomainProperty @@ -138,34 +138,34 @@ class NgGenerateAllCommand implements GrailsApplicationCommand { } - render template: template(hasFileProperty ? "angular2/javascripts/service-file.ts" : "angular2/javascripts/service.ts"), + render template: template(hasFileProperty ? "angular/javascripts/service-file.ts" : "angular/javascripts/service.ts"), destination: file("${baseDir}/${module.propertyName}/${module.propertyName}.service.ts"), model: module.asMap() << [uri: uri], overwrite: overwrite - render template: template("angular2/javascripts/domain.ts"), + render template: template("angular/javascripts/domain.ts"), destination: file("${baseDir}/${module.propertyName}/${module.propertyName}.ts"), model: module.asMap() << [domainProperties: domainProperties, domainConstructorInitializingStatements: domainConstructorInitializingStatements, domainImports: domainImports], overwrite: overwrite File moduleFile = file("${baseDir}/${module.propertyName}/${module.propertyName}.module.ts") - render template: template("angular2/javascripts/module.ts"), + render template: template("angular/javascripts/module.ts"), destination: moduleFile, model: module.asMap() << [associatedModule: false, importService: true], overwrite: overwrite - render template: template("angular2/javascripts/routing.module.ts"), + render template: template("angular/javascripts/routing.module.ts"), destination: file("${baseDir}/${module.propertyName}/${module.propertyName}-routing.module.ts"), model: module, overwrite: overwrite ['persist', 'list', 'show'].each { - render template: template("angular2/javascripts/${it}.component.ts"), + render template: template("angular/javascripts/${it}.component.ts"), destination: file("${baseDir}/${module.propertyName}/${module.propertyName}-${it}.component.ts"), model: module.asMap() << [initializingStatements: initializingStatements, constructorArguments: constructorArguments, componentProperties: componentProperties, componentImports: componentImports], overwrite: overwrite - render template: template("angular2/views/${it}.component.html"), + render template: template("angular/views/${it}.component.html"), destination: file("${baseDir}/${module.propertyName}/${module.propertyName}-${it}.component.html"), model: module.asMap() << [template: htmlTemplates.get(it)], overwrite: overwrite @@ -192,18 +192,18 @@ class NgGenerateAllCommand implements GrailsApplicationCommand { uri = getUri(associatedModel) boolean bidirectional = ((Association)prop.persistentProperty).bidirectional if (!bidirectional) { - render template: template("angular2/javascripts/service.ts"), + render template: template("angular/javascripts/service.ts"), destination: file("${baseDir}/${associatedModel.propertyName}/${associatedModel.propertyName}.service.ts"), model: associatedModel.asMap() << [uri: uri], overwrite: overwrite } - render template: template("angular2/javascripts/domain.ts"), + render template: template("angular/javascripts/domain.ts"), destination: file("${baseDir}/${associatedModel.propertyName}/${associatedModel.propertyName}.ts"), model: associatedModel.asMap() << [domainProperties: [:], domainConstructorInitializingStatements: [:], domainImports: []], overwrite: overwrite - render template: template("angular2/javascripts/module.ts"), + render template: template("angular/javascripts/module.ts"), destination: file("${baseDir}/${associatedModel.propertyName}/${associatedModel.propertyName}.module.ts"), model: associatedModel.asMap() << [associatedModule: true, importService: !bidirectional], overwrite: overwrite diff --git a/grails-app/commands/angular2/scaffolding/NgInstallTemplates.groovy b/grails-app/commands/angular/scaffolding/NgInstallTemplates.groovy similarity index 89% rename from grails-app/commands/angular2/scaffolding/NgInstallTemplates.groovy rename to grails-app/commands/angular/scaffolding/NgInstallTemplates.groovy index 4a52389..41bad98 100644 --- a/grails-app/commands/angular2/scaffolding/NgInstallTemplates.groovy +++ b/grails-app/commands/angular/scaffolding/NgInstallTemplates.groovy @@ -1,4 +1,4 @@ -package angular2.scaffolding +package angular.scaffolding import grails.dev.commands.GrailsApplicationCommand import org.grails.io.support.Resource @@ -11,7 +11,7 @@ class NgInstallTemplates implements GrailsApplicationCommand { @Override boolean handle() { try { - templates("angular2/**/*").each { Resource r -> + templates("angular/**/*").each { Resource r -> String path = r.URL.toString().replaceAll(/^.*?META-INF/, "src/main") if (path.endsWith('/')) { mkdir(path) diff --git a/grails-app/init/angular2/scaffolding/Application.groovy b/grails-app/init/angular/scaffolding/Application.groovy similarity index 90% rename from grails-app/init/angular2/scaffolding/Application.groovy rename to grails-app/init/angular/scaffolding/Application.groovy index c31e342..6bca215 100644 --- a/grails-app/init/angular2/scaffolding/Application.groovy +++ b/grails-app/init/angular/scaffolding/Application.groovy @@ -1,4 +1,4 @@ -package angular2.scaffolding +package angular.scaffolding import grails.boot.GrailsApp import grails.boot.config.GrailsAutoConfiguration diff --git a/settings.gradle b/settings.gradle index 52d2f64..0b76600 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -rootProject.name="angular2-scaffolding" \ No newline at end of file +rootProject.name="angular-scaffolding" \ No newline at end of file diff --git a/src/docs/asciidoc/customization/index.adoc b/src/docs/asciidoc/customization/index.adoc index 11a91d6..30665a9 100644 --- a/src/docs/asciidoc/customization/index.adoc +++ b/src/docs/asciidoc/customization/index.adoc @@ -2,8 +2,8 @@ This plugin is an extension of link:https://github.com/grails/scaffolding[Grails Scaffolding Core]. To change how markup is rendered in the html templates, see the scaffolding core link:http://grails.github.io/scaffolding/{scaffoldingCoreVersion}/[documentation]. The following changes have been made: -. The `propertyMarkupRenderer` bean has been set to an instance of link:api/org/grails/plugin/scaffolding/angular2/markup/AngularPropertyMarkupRenderer.groovy[AngularPropertyMarkupRenderer] that only overrides the link:api/org/grails/plugin/scaffolding/angular/markup/AngularPropertyMarkupRendererImpl.html#getStandardAttributes(DomainProperty)[getStandardAttributes] method to add an `[(ngModel)]` attribute. -. The `contextMarkupRenderer` has been set to an instance of link:api/org/grails/plugin/scaffolding/angular2/markup/AngularContextMarkupRenderer.groovy[AngularContextMarkupRenderer] that overrides the list output context to use an `*ngFor`. +. The `propertyMarkupRenderer` bean has been set to an instance of link:api/org/grails/plugin/scaffolding/angular/markup/AngularPropertyMarkupRenderer.groovy[AngularPropertyMarkupRenderer] that only overrides the link:api/org/grails/plugin/scaffolding/angular/markup/AngularPropertyMarkupRendererImpl.html#getStandardAttributes(DomainProperty)[getStandardAttributes] method to add an `[(ngModel)]` attribute. +. The `contextMarkupRenderer` has been set to an instance of link:api/org/grails/plugin/scaffolding/angular/markup/AngularContextMarkupRenderer.groovy[AngularContextMarkupRenderer] that overrides the list output context to use an `*ngFor`. . Additional input and output renderers are registered with a priority of 0. If you wish your own renderers to be used, set a priority higher than 0. See the link:http://grails.github.io/scaffolding/{scaffoldingCoreVersion}/#_how_properties_are_rendered[section on how properties are rendered] in the scaffolding core documentation for more details on how to do so. -The JavaScript templates used to create assets can be overridden by executing `grails ngInstallTemplates`. That will put a set of files in `src/main/templates/angular2`. You can modify the templates and they will be used in future angular code generation. You can safely remove any templates that you do not wish to override. \ No newline at end of file +The JavaScript templates used to create assets can be overridden by executing `grails ngInstallTemplates`. That will put a set of files in `src/main/templates/angular`. You can modify the templates and they will be used in future angular code generation. You can safely remove any templates that you do not wish to override. \ No newline at end of file diff --git a/src/docs/asciidoc/index.adoc b/src/docs/asciidoc/index.adoc index a811a7a..1a89786 100644 --- a/src/docs/asciidoc/index.adoc +++ b/src/docs/asciidoc/index.adoc @@ -1,4 +1,4 @@ -= Grails Angular 2 Scaffolding Plugin += Grails Angular Scaffolding Plugin :author: James Kleeh :email: kleehj@ociweb.com :source-highlighter: coderay diff --git a/src/docs/asciidoc/installation/index.adoc b/src/docs/asciidoc/installation/index.adoc index 9618643..e6a61f0 100644 --- a/src/docs/asciidoc/installation/index.adoc +++ b/src/docs/asciidoc/installation/index.adoc @@ -1,6 +1,6 @@ == Installation -To start using this plugin, add it to your `build.gradle` like the example below. If you created your project with the angular2 profile in Grails 3.2.0 or higher, this is done automatically. +To start using this plugin, add it to your `build.gradle` like the example below. If you created your project with the angular profile in Grails 3.2.0 or higher, this is done automatically. [source,groovy,subs="attributes",indent=1] .build.gradle diff --git a/src/docs/asciidoc/introduction.adoc b/src/docs/asciidoc/introduction.adoc index f8bc8ea..0b55232 100644 --- a/src/docs/asciidoc/introduction.adoc +++ b/src/docs/asciidoc/introduction.adoc @@ -1,3 +1,3 @@ == Introduction -The goal of this plugin is to provide basic CRUD abilities using Angular 2 in a single page application. It is designed to be used alongside the angular2 profile, however it can be used in applications that were not created from the angular2 profile. This guide will cover what functionality you can expect from this plugin, as well as how you can change that functionality to meet your needs. \ No newline at end of file +The goal of this plugin is to provide basic CRUD abilities using Angular in a single page application. It is designed to be used alongside the angular profile, however it can be used in applications that were not created from the angular profile. This guide will cover what functionality you can expect from this plugin, as well as how you can change that functionality to meet your needs. \ No newline at end of file diff --git a/src/docs/asciidoc/usage/index.adoc b/src/docs/asciidoc/usage/index.adoc index a28d478..0ded9aa 100644 --- a/src/docs/asciidoc/usage/index.adoc +++ b/src/docs/asciidoc/usage/index.adoc @@ -14,10 +14,10 @@ You can also execute the command via Gradle. $ ./gradlew ngGenerateAll -Pargs="com.foo.Bar" ---- -The default root path where assets will be created is "../client/src/app". That is because the plugin is configured by default to work with the angular2 profile which creates a multi-project build. To change that setting and others, see the link:configuration.html[configuration] section. +The default root path where assets will be created is "../client/src/app". That is because the plugin is configured by default to work with the angular profile which creates a multi-project build. To change that setting and others, see the link:configuration.html[configuration] section. -The command will generate everything required to create, read, update, and delete instances of domain classes with Angular 2. The following will be created if they don't already exist. +The command will generate everything required to create, read, update, and delete instances of domain classes with Angular. The following will be created if they don't already exist. . A module for the domain `../client/src/app/bar/bar.module.ts`. . A routing module `../client/src/app/bar/bar-routing.module.ts`. @@ -57,7 +57,7 @@ If it is not successful, you will be responsible for importing it. === Assumptions -This plugin assumes you have an environment that supports ES6 modules and typescript. It is based upon the angular2 profile which uses the Angular CLI. +This plugin assumes you have an environment that supports ES6 modules and typescript. It is based upon the angular profile which uses the Angular CLI. === REST API @@ -92,7 +92,7 @@ grails: === Routing -If you are using the angular2 profile, the default index page is modified so that clicking on the link to the controller will automatically route you to the module the controller represents. If you are using this plugin in an existing application, you will have a little bit of work to do to use the generated assets. +If you are using the angular profile, the default index page is modified so that clicking on the link to the controller will automatically route you to the module the controller represents. If you are using this plugin in an existing application, you will have a little bit of work to do to use the generated assets. The first step is to ensure the module is included in the page. If the bootstrap module is found, a dependency will automatically be created, however if the bootstrap module is not found, it is up to you to ensure the newly created module is imported. diff --git a/src/main/groovy/org/grails/plugin/scaffolding/angular2/Angular2ScaffoldingGrailsPlugin.groovy b/src/main/groovy/org/grails/plugin/scaffolding/angular/AngularScaffoldingGrailsPlugin.groovy similarity index 58% rename from src/main/groovy/org/grails/plugin/scaffolding/angular2/Angular2ScaffoldingGrailsPlugin.groovy rename to src/main/groovy/org/grails/plugin/scaffolding/angular/AngularScaffoldingGrailsPlugin.groovy index 455a5dd..36f9c3a 100644 --- a/src/main/groovy/org/grails/plugin/scaffolding/angular2/Angular2ScaffoldingGrailsPlugin.groovy +++ b/src/main/groovy/org/grails/plugin/scaffolding/angular/AngularScaffoldingGrailsPlugin.groovy @@ -1,30 +1,30 @@ -package org.grails.plugin.scaffolding.angular2 +package org.grails.plugin.scaffolding.angular import grails.plugins.Plugin -import org.grails.plugin.scaffolding.angular2.markup.AngularContextMarkupRenderer -import org.grails.plugin.scaffolding.angular2.markup.AngularPropertyMarkupRenderer -import org.grails.plugin.scaffolding.angular2.registry.AngularDomainRendererRegisterer -import org.grails.plugin.scaffolding.angular2.template.AngularModuleEditorImpl +import org.grails.plugin.scaffolding.angular.markup.AngularContextMarkupRenderer +import org.grails.plugin.scaffolding.angular.markup.AngularPropertyMarkupRenderer +import org.grails.plugin.scaffolding.angular.registry.AngularDomainRendererRegisterer +import org.grails.plugin.scaffolding.angular.template.AngularModuleEditorImpl import org.grails.scaffolding.ScaffoldingBeanConfiguration -class Angular2ScaffoldingGrailsPlugin extends Plugin { +class AngularScaffoldingGrailsPlugin extends Plugin { // the version or versions of Grails the plugin is designed for def grailsVersion = "3.2.0 > *" // TODO Fill in these fields - def title = "Grails Angular 2 Scaffolding" // Headline output name of the plugin + def title = "Grails Angular Scaffolding" // Headline output name of the plugin def author = "James Kleeh" def authorEmail = "kleehj@ociweb.com" def description = '''\ -This plugin provides the ability to generate an AngularJS CRUD interface based on a domain class +This plugin provides the ability to generate an Angular CRUD interface based on a domain class ''' - String documentation = 'http://grails-plugins.github.io/grails-angular2-scaffolding/latest' + String documentation = 'http://grails-plugins.github.io/grails-angular-scaffolding/latest' String license = 'APACHE' def organization = [name: 'Grails', url: 'http://www.grails.org/'] - def issueManagement = [url: 'https://github.com/grails-plugins/grails-angular2-scaffolding/issues'] - def scm = [url: 'https://github.com/grails-plugins/grails-angular2-scaffolding'] + def issueManagement = [url: 'https://github.com/grails-plugins/grails-angular-scaffolding/issues'] + def scm = [url: 'https://github.com/grails-plugins/grails-angular-scaffolding'] Closure doWithSpring() {{ -> scaffoldingCoreConfig(ScaffoldingBeanConfiguration) diff --git a/src/main/groovy/org/grails/plugin/scaffolding/angular2/markup/AngularContextMarkupRenderer.groovy b/src/main/groovy/org/grails/plugin/scaffolding/angular/markup/AngularContextMarkupRenderer.groovy similarity index 95% rename from src/main/groovy/org/grails/plugin/scaffolding/angular2/markup/AngularContextMarkupRenderer.groovy rename to src/main/groovy/org/grails/plugin/scaffolding/angular/markup/AngularContextMarkupRenderer.groovy index 778791b..a5deeb8 100644 --- a/src/main/groovy/org/grails/plugin/scaffolding/angular2/markup/AngularContextMarkupRenderer.groovy +++ b/src/main/groovy/org/grails/plugin/scaffolding/angular/markup/AngularContextMarkupRenderer.groovy @@ -1,4 +1,4 @@ -package org.grails.plugin.scaffolding.angular2.markup +package org.grails.plugin.scaffolding.angular.markup import org.grails.datastore.mapping.model.PersistentEntity import org.grails.scaffolding.markup.ContextMarkupRendererImpl diff --git a/src/main/groovy/org/grails/plugin/scaffolding/angular2/markup/AngularPropertyMarkupRenderer.groovy b/src/main/groovy/org/grails/plugin/scaffolding/angular/markup/AngularPropertyMarkupRenderer.groovy similarity index 91% rename from src/main/groovy/org/grails/plugin/scaffolding/angular2/markup/AngularPropertyMarkupRenderer.groovy rename to src/main/groovy/org/grails/plugin/scaffolding/angular/markup/AngularPropertyMarkupRenderer.groovy index ff07232..27078c4 100644 --- a/src/main/groovy/org/grails/plugin/scaffolding/angular2/markup/AngularPropertyMarkupRenderer.groovy +++ b/src/main/groovy/org/grails/plugin/scaffolding/angular/markup/AngularPropertyMarkupRenderer.groovy @@ -1,4 +1,4 @@ -package org.grails.plugin.scaffolding.angular2.markup +package org.grails.plugin.scaffolding.angular.markup import grails.util.GrailsNameUtils import org.grails.scaffolding.markup.PropertyMarkupRendererImpl diff --git a/src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/AngularDomainRendererRegisterer.groovy b/src/main/groovy/org/grails/plugin/scaffolding/angular/registry/AngularDomainRendererRegisterer.groovy similarity index 73% rename from src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/AngularDomainRendererRegisterer.groovy rename to src/main/groovy/org/grails/plugin/scaffolding/angular/registry/AngularDomainRendererRegisterer.groovy index 2a55319..9b3834b 100644 --- a/src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/AngularDomainRendererRegisterer.groovy +++ b/src/main/groovy/org/grails/plugin/scaffolding/angular/registry/AngularDomainRendererRegisterer.groovy @@ -1,10 +1,10 @@ -package org.grails.plugin.scaffolding.angular2.registry +package org.grails.plugin.scaffolding.angular.registry -import org.grails.plugin.scaffolding.angular2.registry.input.AngularAssociationInputRenderer -import org.grails.plugin.scaffolding.angular2.registry.input.AngularBidirectionalToManyInputRenderer -import org.grails.plugin.scaffolding.angular2.registry.input.AngularDateInputRenderer -import org.grails.plugin.scaffolding.angular2.registry.input.AngularFileInputRenderer -import org.grails.plugin.scaffolding.angular2.registry.output.* +import org.grails.plugin.scaffolding.angular.registry.input.AngularAssociationInputRenderer +import org.grails.plugin.scaffolding.angular.registry.input.AngularBidirectionalToManyInputRenderer +import org.grails.plugin.scaffolding.angular.registry.input.AngularDateInputRenderer +import org.grails.plugin.scaffolding.angular.registry.input.AngularFileInputRenderer +import org.grails.plugin.scaffolding.angular.registry.output.* import org.grails.scaffolding.registry.DomainInputRendererRegistry import org.grails.scaffolding.registry.DomainOutputRendererRegistry import org.springframework.beans.factory.annotation.Autowired diff --git a/src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/input/AngularAssociationInputRenderer.groovy b/src/main/groovy/org/grails/plugin/scaffolding/angular/registry/input/AngularAssociationInputRenderer.groovy similarity index 90% rename from src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/input/AngularAssociationInputRenderer.groovy rename to src/main/groovy/org/grails/plugin/scaffolding/angular/registry/input/AngularAssociationInputRenderer.groovy index b8658b9..24fd6cb 100644 --- a/src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/input/AngularAssociationInputRenderer.groovy +++ b/src/main/groovy/org/grails/plugin/scaffolding/angular/registry/input/AngularAssociationInputRenderer.groovy @@ -1,11 +1,11 @@ -package org.grails.plugin.scaffolding.angular2.registry.input +package org.grails.plugin.scaffolding.angular.registry.input import grails.util.GrailsNameUtils import org.grails.datastore.mapping.model.PersistentProperty import org.grails.datastore.mapping.model.types.Association import org.grails.datastore.mapping.model.types.Basic import org.grails.datastore.mapping.model.types.ToMany -import org.grails.plugin.scaffolding.angular2.registry.output.PropertyHelper +import org.grails.plugin.scaffolding.angular.registry.output.PropertyHelper import org.grails.scaffolding.model.property.DomainProperty import org.grails.scaffolding.registry.DomainInputRenderer diff --git a/src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/input/AngularBidirectionalToManyInputRenderer.groovy b/src/main/groovy/org/grails/plugin/scaffolding/angular/registry/input/AngularBidirectionalToManyInputRenderer.groovy similarity index 94% rename from src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/input/AngularBidirectionalToManyInputRenderer.groovy rename to src/main/groovy/org/grails/plugin/scaffolding/angular/registry/input/AngularBidirectionalToManyInputRenderer.groovy index ec81653..c646e5e 100644 --- a/src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/input/AngularBidirectionalToManyInputRenderer.groovy +++ b/src/main/groovy/org/grails/plugin/scaffolding/angular/registry/input/AngularBidirectionalToManyInputRenderer.groovy @@ -1,4 +1,4 @@ -package org.grails.plugin.scaffolding.angular2.registry.input +package org.grails.plugin.scaffolding.angular.registry.input import grails.util.GrailsNameUtils import org.grails.datastore.mapping.model.types.Association diff --git a/src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/input/AngularDateInputRenderer.groovy b/src/main/groovy/org/grails/plugin/scaffolding/angular/registry/input/AngularDateInputRenderer.groovy similarity index 91% rename from src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/input/AngularDateInputRenderer.groovy rename to src/main/groovy/org/grails/plugin/scaffolding/angular/registry/input/AngularDateInputRenderer.groovy index 6796d52..c0c29f6 100644 --- a/src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/input/AngularDateInputRenderer.groovy +++ b/src/main/groovy/org/grails/plugin/scaffolding/angular/registry/input/AngularDateInputRenderer.groovy @@ -1,4 +1,4 @@ -package org.grails.plugin.scaffolding.angular2.registry.input +package org.grails.plugin.scaffolding.angular.registry.input import org.grails.scaffolding.model.property.DomainProperty import org.grails.scaffolding.registry.input.DateInputRenderer diff --git a/src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/input/AngularFileInputRenderer.groovy b/src/main/groovy/org/grails/plugin/scaffolding/angular/registry/input/AngularFileInputRenderer.groovy similarity index 93% rename from src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/input/AngularFileInputRenderer.groovy rename to src/main/groovy/org/grails/plugin/scaffolding/angular/registry/input/AngularFileInputRenderer.groovy index 9316a5f..49266c9 100644 --- a/src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/input/AngularFileInputRenderer.groovy +++ b/src/main/groovy/org/grails/plugin/scaffolding/angular/registry/input/AngularFileInputRenderer.groovy @@ -1,4 +1,4 @@ -package org.grails.plugin.scaffolding.angular2.registry.input +package org.grails.plugin.scaffolding.angular.registry.input import grails.util.GrailsNameUtils import org.grails.scaffolding.model.property.DomainProperty diff --git a/src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/output/AngularDateOutputRenderer.groovy b/src/main/groovy/org/grails/plugin/scaffolding/angular/registry/output/AngularDateOutputRenderer.groovy similarity index 88% rename from src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/output/AngularDateOutputRenderer.groovy rename to src/main/groovy/org/grails/plugin/scaffolding/angular/registry/output/AngularDateOutputRenderer.groovy index b0c0799..d6ce167 100644 --- a/src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/output/AngularDateOutputRenderer.groovy +++ b/src/main/groovy/org/grails/plugin/scaffolding/angular/registry/output/AngularDateOutputRenderer.groovy @@ -1,4 +1,4 @@ -package org.grails.plugin.scaffolding.angular2.registry.output +package org.grails.plugin.scaffolding.angular.registry.output import org.grails.scaffolding.model.property.DomainProperty diff --git a/src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/output/AngularDefaultOutputRenderer.groovy b/src/main/groovy/org/grails/plugin/scaffolding/angular/registry/output/AngularDefaultOutputRenderer.groovy similarity index 87% rename from src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/output/AngularDefaultOutputRenderer.groovy rename to src/main/groovy/org/grails/plugin/scaffolding/angular/registry/output/AngularDefaultOutputRenderer.groovy index ce09105..abc93d3 100644 --- a/src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/output/AngularDefaultOutputRenderer.groovy +++ b/src/main/groovy/org/grails/plugin/scaffolding/angular/registry/output/AngularDefaultOutputRenderer.groovy @@ -1,4 +1,4 @@ -package org.grails.plugin.scaffolding.angular2.registry.output +package org.grails.plugin.scaffolding.angular.registry.output import org.grails.scaffolding.model.property.DomainProperty diff --git a/src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/output/AngularDomainOutputRenderer.groovy b/src/main/groovy/org/grails/plugin/scaffolding/angular/registry/output/AngularDomainOutputRenderer.groovy similarity index 86% rename from src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/output/AngularDomainOutputRenderer.groovy rename to src/main/groovy/org/grails/plugin/scaffolding/angular/registry/output/AngularDomainOutputRenderer.groovy index 8d85d63..6761594 100644 --- a/src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/output/AngularDomainOutputRenderer.groovy +++ b/src/main/groovy/org/grails/plugin/scaffolding/angular/registry/output/AngularDomainOutputRenderer.groovy @@ -1,6 +1,5 @@ -package org.grails.plugin.scaffolding.angular2.registry.output +package org.grails.plugin.scaffolding.angular.registry.output -import grails.util.GrailsNameUtils import org.grails.scaffolding.model.property.DomainProperty import org.grails.scaffolding.registry.DomainOutputRenderer diff --git a/src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/output/AngularIdOutputRenderer.groovy b/src/main/groovy/org/grails/plugin/scaffolding/angular/registry/output/AngularIdOutputRenderer.groovy similarity index 92% rename from src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/output/AngularIdOutputRenderer.groovy rename to src/main/groovy/org/grails/plugin/scaffolding/angular/registry/output/AngularIdOutputRenderer.groovy index 43a4712..203c204 100644 --- a/src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/output/AngularIdOutputRenderer.groovy +++ b/src/main/groovy/org/grails/plugin/scaffolding/angular/registry/output/AngularIdOutputRenderer.groovy @@ -1,4 +1,4 @@ -package org.grails.plugin.scaffolding.angular2.registry.output +package org.grails.plugin.scaffolding.angular.registry.output import org.grails.scaffolding.model.property.DomainProperty diff --git a/src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/output/AngularToManyOutputRenderer.groovy b/src/main/groovy/org/grails/plugin/scaffolding/angular/registry/output/AngularToManyOutputRenderer.groovy similarity index 94% rename from src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/output/AngularToManyOutputRenderer.groovy rename to src/main/groovy/org/grails/plugin/scaffolding/angular/registry/output/AngularToManyOutputRenderer.groovy index 7b57614..9f6e3b6 100644 --- a/src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/output/AngularToManyOutputRenderer.groovy +++ b/src/main/groovy/org/grails/plugin/scaffolding/angular/registry/output/AngularToManyOutputRenderer.groovy @@ -1,4 +1,4 @@ -package org.grails.plugin.scaffolding.angular2.registry.output +package org.grails.plugin.scaffolding.angular.registry.output import grails.util.GrailsNameUtils import org.grails.datastore.mapping.model.types.ToMany diff --git a/src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/output/AngularToOneOutputRenderer.groovy b/src/main/groovy/org/grails/plugin/scaffolding/angular/registry/output/AngularToOneOutputRenderer.groovy similarity index 90% rename from src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/output/AngularToOneOutputRenderer.groovy rename to src/main/groovy/org/grails/plugin/scaffolding/angular/registry/output/AngularToOneOutputRenderer.groovy index 3f407d6..cecdcb0 100644 --- a/src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/output/AngularToOneOutputRenderer.groovy +++ b/src/main/groovy/org/grails/plugin/scaffolding/angular/registry/output/AngularToOneOutputRenderer.groovy @@ -1,4 +1,4 @@ -package org.grails.plugin.scaffolding.angular2.registry.output +package org.grails.plugin.scaffolding.angular.registry.output import org.grails.datastore.mapping.model.types.ToOne import org.grails.scaffolding.model.property.DomainProperty diff --git a/src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/output/PropertyHelper.groovy b/src/main/groovy/org/grails/plugin/scaffolding/angular/registry/output/PropertyHelper.groovy similarity index 89% rename from src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/output/PropertyHelper.groovy rename to src/main/groovy/org/grails/plugin/scaffolding/angular/registry/output/PropertyHelper.groovy index e001e14..872d204 100644 --- a/src/main/groovy/org/grails/plugin/scaffolding/angular2/registry/output/PropertyHelper.groovy +++ b/src/main/groovy/org/grails/plugin/scaffolding/angular/registry/output/PropertyHelper.groovy @@ -1,4 +1,4 @@ -package org.grails.plugin.scaffolding.angular2.registry.output +package org.grails.plugin.scaffolding.angular.registry.output import grails.util.GrailsNameUtils import org.grails.scaffolding.model.property.DomainProperty diff --git a/src/main/groovy/org/grails/plugin/scaffolding/angular2/template/AngularModuleEditor.groovy b/src/main/groovy/org/grails/plugin/scaffolding/angular/template/AngularModuleEditor.groovy similarity index 82% rename from src/main/groovy/org/grails/plugin/scaffolding/angular2/template/AngularModuleEditor.groovy rename to src/main/groovy/org/grails/plugin/scaffolding/angular/template/AngularModuleEditor.groovy index 3d95379..980c380 100644 --- a/src/main/groovy/org/grails/plugin/scaffolding/angular2/template/AngularModuleEditor.groovy +++ b/src/main/groovy/org/grails/plugin/scaffolding/angular/template/AngularModuleEditor.groovy @@ -1,4 +1,4 @@ -package org.grails.plugin.scaffolding.angular2.template +package org.grails.plugin.scaffolding.angular.template import grails.codegen.model.Model diff --git a/src/main/groovy/org/grails/plugin/scaffolding/angular2/template/AngularModuleEditorImpl.groovy b/src/main/groovy/org/grails/plugin/scaffolding/angular/template/AngularModuleEditorImpl.groovy similarity index 99% rename from src/main/groovy/org/grails/plugin/scaffolding/angular2/template/AngularModuleEditorImpl.groovy rename to src/main/groovy/org/grails/plugin/scaffolding/angular/template/AngularModuleEditorImpl.groovy index a898dee..52757f4 100644 --- a/src/main/groovy/org/grails/plugin/scaffolding/angular2/template/AngularModuleEditorImpl.groovy +++ b/src/main/groovy/org/grails/plugin/scaffolding/angular/template/AngularModuleEditorImpl.groovy @@ -1,4 +1,4 @@ -package org.grails.plugin.scaffolding.angular2.template +package org.grails.plugin.scaffolding.angular.template import grails.codegen.model.Model import groovy.json.JsonException diff --git a/src/main/templates/angular2/javascripts/domain.ts b/src/main/templates/angular/javascripts/domain.ts similarity index 100% rename from src/main/templates/angular2/javascripts/domain.ts rename to src/main/templates/angular/javascripts/domain.ts diff --git a/src/main/templates/angular2/javascripts/list.component.ts b/src/main/templates/angular/javascripts/list.component.ts similarity index 100% rename from src/main/templates/angular2/javascripts/list.component.ts rename to src/main/templates/angular/javascripts/list.component.ts diff --git a/src/main/templates/angular2/javascripts/module.ts b/src/main/templates/angular/javascripts/module.ts similarity index 100% rename from src/main/templates/angular2/javascripts/module.ts rename to src/main/templates/angular/javascripts/module.ts diff --git a/src/main/templates/angular2/javascripts/persist.component.ts b/src/main/templates/angular/javascripts/persist.component.ts similarity index 100% rename from src/main/templates/angular2/javascripts/persist.component.ts rename to src/main/templates/angular/javascripts/persist.component.ts diff --git a/src/main/templates/angular2/javascripts/routing.module.ts b/src/main/templates/angular/javascripts/routing.module.ts similarity index 100% rename from src/main/templates/angular2/javascripts/routing.module.ts rename to src/main/templates/angular/javascripts/routing.module.ts diff --git a/src/main/templates/angular2/javascripts/service-file.ts b/src/main/templates/angular/javascripts/service-file.ts similarity index 100% rename from src/main/templates/angular2/javascripts/service-file.ts rename to src/main/templates/angular/javascripts/service-file.ts diff --git a/src/main/templates/angular2/javascripts/service.ts b/src/main/templates/angular/javascripts/service.ts similarity index 100% rename from src/main/templates/angular2/javascripts/service.ts rename to src/main/templates/angular/javascripts/service.ts diff --git a/src/main/templates/angular2/javascripts/show.component.ts b/src/main/templates/angular/javascripts/show.component.ts similarity index 100% rename from src/main/templates/angular2/javascripts/show.component.ts rename to src/main/templates/angular/javascripts/show.component.ts diff --git a/src/main/templates/angular2/views/list.component.html b/src/main/templates/angular/views/list.component.html similarity index 100% rename from src/main/templates/angular2/views/list.component.html rename to src/main/templates/angular/views/list.component.html diff --git a/src/main/templates/angular2/views/persist.component.html b/src/main/templates/angular/views/persist.component.html similarity index 100% rename from src/main/templates/angular2/views/persist.component.html rename to src/main/templates/angular/views/persist.component.html diff --git a/src/main/templates/angular2/views/show.component.html b/src/main/templates/angular/views/show.component.html similarity index 100% rename from src/main/templates/angular2/views/show.component.html rename to src/main/templates/angular/views/show.component.html diff --git a/src/test/groovy/org/grails/plugin/scaffolding/angular2/template/AngularModuleEditorSpec.groovy b/src/test/groovy/org/grails/plugin/scaffolding/angular/template/AngularModuleEditorSpec.groovy similarity index 99% rename from src/test/groovy/org/grails/plugin/scaffolding/angular2/template/AngularModuleEditorSpec.groovy rename to src/test/groovy/org/grails/plugin/scaffolding/angular/template/AngularModuleEditorSpec.groovy index 646714e..69a4f77 100644 --- a/src/test/groovy/org/grails/plugin/scaffolding/angular2/template/AngularModuleEditorSpec.groovy +++ b/src/test/groovy/org/grails/plugin/scaffolding/angular/template/AngularModuleEditorSpec.groovy @@ -1,4 +1,4 @@ -package org.grails.plugin.scaffolding.angular2.template +package org.grails.plugin.scaffolding.angular.template import grails.codegen.model.Model import grails.codegen.model.ModelBuilder