Torstens-MacBook-Pro:sculptor torsten$ git flow release finish 3.0.2 Already on 'master' Auto-merging sculptor-generator/sculptor-generator-test/src/main/java/org/sculptor/generator/test/GeneratorTestExtensions.xtend Auto-merging sculptor-generator/sculptor-generator-test/src/main/java/org/sculptor/generator/test/GeneratorTestBase.xtend Auto-merging sculptor-generator/sculptor-generator-test/src/main/java/org/sculptor/generator/test/GeneratorModelTestFixtures.xtend Auto-merging sculptor-generator/sculptor-generator-templates/src/test/resources/generator-tests/ddl/model.btdesign Auto-merging sculptor-generator/sculptor-generator-templates/src/test/java/org/sculptor/generator/template/service/PureEjb3Test.xtend Auto-merging sculptor-generator/sculptor-generator-templates/src/test/java/org/sculptor/generator/template/jpa/HibernateTest.xtend Auto-merging sculptor-generator/sculptor-generator-templates/src/test/java/org/sculptor/generator/template/jpa/DataNucleusTest.xtend Auto-merging sculptor-generator/sculptor-generator-templates/src/test/java/org/sculptor/generator/template/ext/TemplateOverrideTest.xtend Auto-merging sculptor-generator/sculptor-generator-templates/src/test/java/org/sculptor/generator/template/ext/DomainObjectReferenceTmplOverride.xtend Auto-merging sculptor-generator/sculptor-generator-templates/src/test/java/org/sculptor/generator/template/domain/DomainObjectReferenceAnnotationTmplTest.xtend Auto-merging sculptor-generator/sculptor-generator-templates/src/test/java/org/sculptor/generator/template/doc/UMLGraphTmplTest.xtend Auto-merging sculptor-generator/sculptor-generator-templates/src/test/java/org/sculptor/generator/template/db/MySQLDDLTest.xtend Auto-merging sculptor-generator/sculptor-generator-templates/src/main/java/org/sculptor/generator/template/spring/SpringTmpl.xtend Auto-merging sculptor-generator/sculptor-generator-templates/src/main/java/org/sculptor/generator/template/repository/RepositoryTmpl.xtend Removing sculptor-generator/sculptor-generator-core/src/test/java/org/sculptor/generator/transformation/TraitTransformationTest.xtend Removing sculptor-generator/sculptor-generator-core/src/test/java/org/sculptor/generator/transformation/LibraryTransformationTest.xtend Auto-merging sculptor-generator/sculptor-generator-core/src/main/java/org/sculptor/generator/xtext/ContextClassLoaderAwareRuntimeResourceSetInitializer.java Auto-merging sculptor-generator/sculptor-generator-core-test/src/test/java/org/sculptor/generator/transformation/ShippingTransformationTest.xtend Auto-merging sculptor-generator/sculptor-generator-core-test/src/test/java/org/sculptor/generator/transformation/RestTransformationTest.xtend Auto-merging sculptor-generator/sculptor-generator-core-test/src/test/java/org/sculptor/generator/transformation/DslTransformationTest.xtend Auto-merging sculptor-generator/sculptor-generator-core-test/src/test/java/org/sculptor/generator/SculptorGeneratorRunnerTest.xtend Auto-merging sculptor-generator/sculptor-generator-cartridges/src/test/java/org/sculptor/generator/cartridge/mongodb/MongoDbMapperTemplatesTest.xtend Auto-merging sculptor-generator/sculptor-generator-cartridges/src/test/java/org/sculptor/generator/cartridge/mongodb/MongoDbGeneratorTest.xtend Auto-merging sculptor-generator/sculptor-generator-cartridges/src/main/java/org/sculptor/generator/cartridge/mongodb/ServiceTmplExtension.xtend Auto-merging sculptor-generator/sculptor-generator-cartridges/src/main/java/org/sculptor/generator/cartridge/mongodb/RootTmplExtension.xtend Auto-merging sculptor-generator/sculptor-generator-cartridges/src/main/java/org/sculptor/generator/cartridge/mongodb/RepositoryTmplExtension.xtend Auto-merging sculptor-generator/sculptor-generator-cartridges/src/main/java/org/sculptor/generator/cartridge/builder/RootTmplExtension.xtend Merge made by the 'recursive' strategy. README.md | 3 +- devtools/eclipse-ide/platform.product | 64 ++++++++++++ devtools/eclipse-ide/pom.xml | 2 +- devtools/eclipse-mirror/pom.xml | 2 +- pom.xml | 95 ++++++++++------- sculptor-eclipse/eclipse-repository/pom.xml | 2 +- sculptor-eclipse/org.sculptor.dsl.feature/feature.xml | 2 +- sculptor-eclipse/org.sculptor.dsl.feature/pom.xml | 2 +- sculptor-eclipse/org.sculptor.dsl.tests/META-INF/MANIFEST.MF | 2 +- sculptor-eclipse/org.sculptor.dsl.tests/pom.xml | 2 +- sculptor-eclipse/org.sculptor.dsl.ui/META-INF/MANIFEST.MF | 2 +- sculptor-eclipse/org.sculptor.dsl.ui/pom.xml | 2 +- sculptor-eclipse/org.sculptor.dsl/META-INF/MANIFEST.MF | 2 +- sculptor-eclipse/org.sculptor.dsl/pom.xml | 35 ++++++- sculptor-eclipse/org.sculptor.dsl/src/org/sculptor/dsl/GenerateSculptorDsl.mwe2 | 35 +++++-- sculptor-eclipse/pom.xml | 2 +- sculptor-examples/DDDSample/pom.xml | 2 +- sculptor-examples/eda-samples/pom.xml | 2 +- sculptor-examples/eda-samples/sculptor-betting/pom.xml | 2 +- sculptor-examples/eda-samples/sculptor-simplecqrs-snapshots/pom.xml | 2 +- sculptor-examples/eda-samples/sculptor-simplecqrs/pom.xml | 2 +- sculptor-examples/helloworld-example/helloworld-parent/pom.xml | 2 +- sculptor-examples/helloworld-example/helloworld/pom.xml | 2 +- sculptor-examples/helloworld-example/pom.xml | 2 +- sculptor-examples/library-example/pom.xml | 2 +- sculptor-examples/mongodb-samples/blog-mongodb/pom.xml | 2 +- sculptor-examples/mongodb-samples/library-mongodb/pom.xml | 2 +- sculptor-examples/mongodb-samples/pom.xml | 2 +- sculptor-examples/mongodb-samples/sculptor-shipping-generator/pom.xml | 24 +++-- .../mongodb-samples/sculptor-shipping-generator/src/main/java/generator/DomainObjectReferenceTmplOverride.xtend | 63 ++++-------- .../mongodb-samples/sculptor-shipping-generator/src/test/java/generator/DomainObjectReferenceTmplOverrideTest.xtend | 28 ++++++ .../mongodb-samples/sculptor-shipping-generator}/src/test/resources/generator-tests/library/model-person.btdesign | 0 .../mongodb-samples/sculptor-shipping-generator}/src/test/resources/generator-tests/library/model.btdesign | 0 .../sculptor-shipping-generator}/src/test/resources/generator-tests/library/sculptor-generator.properties | 0 .../mongodb-samples/sculptor-shipping-generator}/src/test/resources/logback-test.xml | 0 sculptor-examples/mongodb-samples/sculptor-shipping/pom.xml | 2 +- sculptor-examples/pom.xml | 2 +- sculptor-framework/pom.xml | 2 +- sculptor-framework/sculptor-framework-main/pom.xml | 2 +- sculptor-framework/sculptor-framework-mongodb/pom.xml | 2 +- sculptor-framework/sculptor-framework-test/pom.xml | 2 +- sculptor-generator/eclipse-library/META-INF/MANIFEST.MF | 44 ++------ sculptor-generator/eclipse-library/pom.xml | 2 +- sculptor-generator/eclipse-library/src/main/assembly/repackaged-runtime.xml | 103 +------------------ sculptor-generator/eclipse-library/src/main/assembly/repackaged-sources.xml | 12 +-- sculptor-generator/eclipse-library/src/main/assembly/repackaged-test.xml | 4 +- sculptor-generator/eclipse-library/src/main/assembly/repackaged.xml | 16 +-- sculptor-generator/pom.xml | 6 +- sculptor-generator/sculptor-active-annotation-test/pom.xml | 10 +- sculptor-generator/sculptor-active-annotation-test/src/test/java/generator/TestTemplateOverride.xtend | 2 +- .../sculptor-active-annotation-test/src/test/java/org/sculptor/generator/cartridge/test/TestTemplateExtension.xtend | 4 +- .../sculptor-active-annotation-test/src/test/java/org/sculptor/generator/cartridge/test2/TestTemplateExtension.xtend | 29 ++++++ .../sculptor-active-annotation-test/src/test/java/org/sculptor/generator/chain/ChainOverridableTest.xtend | 48 +++------ .../sculptor-active-annotation-test/src/test/java/org/sculptor/generator/chain/ChainOverrideAwareModuleTest.xtend | 59 +++++++---- .../sculptor-active-annotation-test/src/test/java/org/sculptor/generator/chain/ChainOverrideTest.xtend | 22 +++- sculptor-generator/sculptor-active-annotation-test/src/test/resources/generator/sculptor-generator.properties | 2 +- sculptor-generator/sculptor-active-annotation/pom.xml | 5 +- sculptor-generator/sculptor-active-annotation/src/main/java/org/sculptor/generator/chain/ChainLink.java | 13 ++- sculptor-generator/sculptor-active-annotation/src/main/java/org/sculptor/generator/chain/ChainOverridable.xtend | 36 +++---- sculptor-generator/sculptor-active-annotation/src/main/java/org/sculptor/generator/chain/ChainOverride.xtend | 31 ++++-- .../sculptor-active-annotation/src/main/java/org/sculptor/generator/chain/ChainOverrideAwareModule.xtend | 179 +++++++++++++++++++-------------- sculptor-generator/sculptor-active-annotation/src/main/java/org/sculptor/generator/chain/ChainOverrideHelper.xtend | 55 ++++++---- sculptor-generator/sculptor-active-annotation/src/main/java/org/sculptor/generator/chain/OverridableMethodInfo.xtend | 4 + sculptor-generator/sculptor-generator-cartridges/pom.xml | 81 +++++++++++++++ .../src/main/java/org/sculptor/generator/cartridge/builder/BuilderTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/cartridge/builder/RootTmplExtension.xtend | 5 +- .../src/main/java/org/sculptor/generator/cartridge/mongodb/AccessObjectFactoryTmplExtension.xtend | 0 .../src/main/java/org/sculptor/generator/cartridge/mongodb/ConsumerTmplExtension.xtend | 0 .../src/main/java/org/sculptor/generator/cartridge/mongodb/MongoDbAccessObjectFactoryTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/cartridge/mongodb/MongoDbMapperTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/cartridge/mongodb/MongoDbServiceTestTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/cartridge/mongodb/RepositoryTmplExtension.xtend | 28 +++--- .../src/main/java/org/sculptor/generator/cartridge/mongodb/RootTmplExtension.xtend | 4 +- .../src/main/java/org/sculptor/generator/cartridge/mongodb/ServiceTmplExtension.xtend | 2 - .../src/test/java/org/sculptor/generator/cartridge/mongodb/MongoDbGeneratorTest.xtend | 4 +- .../src/test/java/org/sculptor/generator/cartridge/mongodb/MongoDbMapperTemplatesTest.xtend | 5 +- .../ddl => sculptor-generator-cartridges/src/test/resources/generator-tests/mongodb}/model-person.btdesign | 0 .../generator-tests/ddl => sculptor-generator-cartridges/src/test/resources/generator-tests/mongodb}/model.btdesign | 0 .../src/test/resources/generator-tests/mongodb/sculptor-generator.properties | 0 sculptor-generator/sculptor-generator-cartridges/src/test/resources/logback-test.xml | 16 +++ sculptor-generator/sculptor-generator-core-test/pom.xml | 74 ++++++++++++++ .../src/test/java/org/sculptor/generator/SculptorGeneratorRunnerTest.xtend | 1 + .../sculptor-generator-core-test/src/test/java/org/sculptor/generator/cartridge/test/PropertiesExtension.xtend | 25 +++++ .../sculptor-generator-core-test/src/test/java/org/sculptor/generator/cartridge/test/TransformationExtension.xtend | 25 +++++ .../src/test/java/org/sculptor/generator/formatter/JavaCodeAutoImporterTest.xtend | 0 .../src/test/java/org/sculptor/generator/formatter/JavaCodeFormatterTest.xtend | 0 .../sculptor-generator-core-test/src/test/java/org/sculptor/generator/transformation/CustomDatabaseNamingTest.xtend | 244 ++++++++++++++++++++++++++++++++++++++++++++ .../src/test/java/org/sculptor/generator/transformation/DslTransformationTest.xtend} | 27 ++--- .../sculptor-generator-core-test/src/test/java/org/sculptor/generator/transformation/DtoTransformationTest.xtend | 118 ++++++++++++++++++++++ .../sculptor-generator-core-test/src/test/java/org/sculptor/generator/transformation/EnumTransformationTest.xtend | 267 ++++++++++++++++++++++++++++++++++++++++++++++++ .../src/test/java/org/sculptor/generator/transformation/InheritanceTransformationTest.xtend | 157 +++++++++++++++++++++++++++++ .../sculptor-generator-core-test/src/test/java/org/sculptor/generator/transformation/LibraryTransformationTest.xtend | 330 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ .../sculptor-generator-core-test/src/test/java/org/sculptor/generator/transformation/NestedTransformationTest.xtend | 145 ++++++++++++++++++++++++++ .../src/test/java/org/sculptor/generator/transformation/RestTransformationTest.xtend | 16 +-- .../src/test/java/org/sculptor/generator/transformation/ShippingTransformationTest.xtend | 38 ++++--- .../sculptor-generator-core-test/src/test/java/org/sculptor/generator/transformation/TraitTransformationTest.xtend | 198 ++++++++++++++++++++++++++++++++++++ .../src/test/java/org/sculptor/generator/transformation/UniverseTransformationTest.xtend | 238 +++++++++++++++++++++++++++++++++++++++++++ .../src/test/java/org/sculptor/generator/util/QueryConverterTest.java | 0 sculptor-generator/sculptor-generator-core-test/src/test/resources/generator-tests/dto/model.btdesign | 33 ++++++ sculptor-generator/sculptor-generator-core-test/src/test/resources/generator-tests/enum/model.btdesign | 70 +++++++++++++ sculptor-generator/sculptor-generator-core-test/src/test/resources/generator-tests/inheritance/model.btdesign | 84 ++++++++++++++++ sculptor-generator/sculptor-generator-core-test/src/test/resources/generator-tests/library/model-person.btdesign | 49 +++++++++ sculptor-generator/sculptor-generator-core-test/src/test/resources/generator-tests/library/model.btdesign | 124 +++++++++++++++++++++++ sculptor-generator/sculptor-generator-core-test/src/test/resources/generator-tests/nested/nested1.btdesign | 17 ++++ sculptor-generator/sculptor-generator-core-test/src/test/resources/generator-tests/nested/nested2.btdesign | 14 +++ sculptor-generator/sculptor-generator-core-test/src/test/resources/generator-tests/nested/nested3.btdesign | 14 +++ sculptor-generator/sculptor-generator-core-test/src/test/resources/generator-tests/nested/nested4.btdesign | 9 ++ .../src/test/resources/generator-tests/rest/model-person.btdesign | 0 .../{sculptor-generator-core => sculptor-generator-core-test}/src/test/resources/generator-tests/rest/model.btdesign | 0 .../src/test/resources/generator-tests/runner/model.btdesign | 0 .../src/test/resources/generator-tests/runner/sculptor-generator.properties | 0 .../src/test/resources/generator-tests/shipping/model.btdesign | 0 .../src/test/resources/generator-tests/shipping/sculptor-generator.properties | 0 .../src/test/resources/generator-tests/trait/trait.btdesign | 0 .../mongodb => sculptor-generator-core-test/src/test/resources/generator-tests/transformation}/model-person.btdesign | 0 .../src/test/resources/generator-tests/transformation/model.btdesign | 0 .../sculptor-generator-core-test/src/test/resources/generator-tests/transformation/sculptor-generator.properties | 2 + sculptor-generator/sculptor-generator-core-test/src/test/resources/generator-tests/universe/model.btdesign | 62 ++++++++++++ sculptor-generator/sculptor-generator-core-test/src/test/resources/logback-test.xml | 16 +++ sculptor-generator/sculptor-generator-core/pom.xml | 83 ++------------- sculptor-generator/sculptor-generator-core/src/main/java/org/sculptor/generator/SculptorGeneratorRunner.java | 2 +- sculptor-generator/sculptor-generator-core/src/main/java/org/sculptor/generator/transform/DslTransformation.xtend | 57 +++++------ sculptor-generator/sculptor-generator-core/src/main/java/org/sculptor/generator/transform/Transformation.xtend | 148 +++++++++++++-------------- .../src/main/java/org/sculptor/generator/{mwe2 => xtext}/ContextClassLoaderAwareRuntimeResourceSetInitializer.java | 2 +- .../sculptor-generator-core/src/test/java/org/sculptor/generator/transformation/LibraryTransformationTest.xtend | 330 ------------------------------------------------------------ .../sculptor-generator-core/src/test/java/org/sculptor/generator/transformation/TraitTransformationTest.xtend | 198 ------------------------------------ sculptor-generator/sculptor-generator-dependencies/pom.xml | 14 +-- sculptor-generator/sculptor-generator-templates/pom.xml | 85 ++++++++++++++++ .../src/main/java/org/sculptor/generator/template/RootTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/camel/CamelTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/common/EhCacheTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/common/ExceptionTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/common/LogConfigTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/common/PubSubTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/consumer/ConsumerEjbTestTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/consumer/ConsumerEjbTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/consumer/ConsumerTestTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/consumer/ConsumerTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/db/CustomDDLTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/db/DDLTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/db/DatasourceTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/db/DbUnitTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/db/MysqlDDLTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/db/OracleDDLTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/doc/ModelDocCssTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/doc/ModelDocTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/doc/UMLGraphTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/domain/DomainObjectAnnotationTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/domain/DomainObjectAttributeAnnotationTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/domain/DomainObjectAttributeTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/domain/DomainObjectConstructorTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/domain/DomainObjectKeyTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/domain/DomainObjectNamesTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/domain/DomainObjectPropertiesTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/domain/DomainObjectReferenceAnnotationTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/domain/DomainObjectReferenceTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/domain/DomainObjectTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/domain/DomainObjectTraitTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/drools/DroolsTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/jpa/DataNucleusTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/jpa/EclipseLinkTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/jpa/HibernateTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/jpa/JPATmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/jpa/OpenJpaTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/repository/AccessObjectFactoryTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/repository/AccessObjectTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/repository/RepositoryTmpl.xtend | 19 ++-- .../src/main/java/org/sculptor/generator/template/rest/ResourceTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/rest/RestWebConfigTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/rest/RestWebContextTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/rest/RestWebCssTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/rest/RestWebJspTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/rest/RestWebTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/service/ServiceEjbTestTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/service/ServiceEjbTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/service/ServiceTestTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/service/ServiceTmpl.xtend | 0 .../src/main/java/org/sculptor/generator/template/spring/SpringTmpl.xtend | 81 +++++++++++++-- .../src/main/java/org/sculptor/generator/template/springint/SpringIntegrationTmpl.xtend | 0 .../src/test/java/org/sculptor/generator/template/db/MySQLDDLTest.xtend | 4 +- .../src/test/java/org/sculptor/generator/template/doc/UMLGraphTmplTest.xtend | 6 +- .../src/test/java/org/sculptor/generator/template/domain/DomainObjectReferenceAnnotationTmplTest.xtend | 6 +- .../src/test/java/org/sculptor/generator/template/ext}/DomainObjectReferenceTmplOverride.xtend | 5 +- .../src/test/java/org/sculptor/generator/template/ext/TemplateOverrideTest.xtend} | 16 ++- .../src/test/java/org/sculptor/generator/template/jpa/DataNucleusTest.xtend | 4 +- .../src/test/java/org/sculptor/generator/template/jpa/HibernateTest.xtend | 4 +- .../src/test/java/org/sculptor/generator/template/service/PureEjb3Test.xtend | 4 +- .../transformation => sculptor-generator-templates/src/test/resources/generator-tests/ddl}/model-person.btdesign | 0 .../generator-tests/mongodb => sculptor-generator-templates/src/test/resources/generator-tests/ddl}/model.btdesign | 2 +- .../src/test/resources/generator-tests/ddl/sculptor-generator.properties | 0 .../{sculptor-generator-core => sculptor-generator-templates}/src/test/resources/generator-tests/doc/model.btdesign | 0 .../src/test/resources/generator-tests/doc/model_core.btdesign | 0 .../src/test/resources/generator-tests/doc/model_statistics.btdesign | 0 .../src/test/resources/generator-tests/helloworld/model.btdesign | 0 .../src/test/resources/generator-tests/helloworld/sculptor-generator.properties | 0 sculptor-generator/sculptor-generator-templates/src/test/resources/generator-tests/library/model-person.btdesign | 78 ++++++++++++++ sculptor-generator/sculptor-generator-templates/src/test/resources/generator-tests/library/model.btdesign | 123 ++++++++++++++++++++++ .../sculptor-generator-templates/src/test/resources/generator-tests/library/sculptor-generator.properties | 6 ++ .../src/test/resources/generator-tests/pure-ejb3/model.btdesign | 0 .../src/test/resources/generator-tests/pure-ejb3/sculptor-generator.properties | 0 sculptor-generator/sculptor-generator-templates/src/test/resources/logback-test.xml | 16 +++ sculptor-generator/sculptor-generator-test/pom.xml | 74 ++++++++++++++ .../src/test => sculptor-generator-test/src/main}/java/org/sculptor/dsl/SculptordslInjectorProvider.java | 0 .../generator => sculptor-generator-test/src/main/java/org/sculptor/generator/test}/GeneratorModelTestFixtures.xtend | 2 +- .../sculptor/generator => sculptor-generator-test/src/main/java/org/sculptor/generator/test}/GeneratorTestBase.xtend | 6 +- .../generator => sculptor-generator-test/src/main/java/org/sculptor/generator/test}/GeneratorTestExtensions.xtend | 11 +- sculptor-generator/sculptor-metamodel/META-INF/MANIFEST.MF | 2 +- sculptor-generator/sculptor-metamodel/pom.xml | 30 +++++- sculptor-maven/pom.xml | 3 +- sculptor-maven/sculptor-generator-library/pom.xml | 10 +- sculptor-maven/sculptor-generator-test/pom.xml | 47 +++++++++ sculptor-maven/sculptor-generator-test/src/main/java/Fake.java | 6 ++ sculptor-maven/sculptor-maven-archetype-ear/pom.xml | 2 +- sculptor-maven/sculptor-maven-archetype-parent/pom.xml | 2 +- sculptor-maven/sculptor-maven-archetype-web/pom.xml | 2 +- sculptor-maven/sculptor-maven-archetype-web/src/main/resources/archetype-resources/pom.xml | 10 ++ sculptor-maven/sculptor-maven-archetype/pom.xml | 2 +- sculptor-maven/sculptor-maven-archetype/src/main/resources/archetype-resources/pom.xml | 12 ++- sculptor-maven/sculptor-maven-plugin/pom.xml | 18 +++- 219 files changed, 3829 insertions(+), 1336 deletions(-) create mode 100644 sculptor-examples/mongodb-samples/sculptor-shipping-generator/src/test/java/generator/DomainObjectReferenceTmplOverrideTest.xtend rename {sculptor-generator/sculptor-generator-core => sculptor-examples/mongodb-samples/sculptor-shipping-generator}/src/test/resources/generator-tests/library/model-person.btdesign (100%) rename {sculptor-generator/sculptor-generator-core => sculptor-examples/mongodb-samples/sculptor-shipping-generator}/src/test/resources/generator-tests/library/model.btdesign (100%) rename {sculptor-generator/sculptor-generator-core => sculptor-examples/mongodb-samples/sculptor-shipping-generator}/src/test/resources/generator-tests/library/sculptor-generator.properties (100%) rename {sculptor-generator/sculptor-generator-core => sculptor-examples/mongodb-samples/sculptor-shipping-generator}/src/test/resources/logback-test.xml (100%) create mode 100644 sculptor-generator/sculptor-active-annotation-test/src/test/java/org/sculptor/generator/cartridge/test2/TestTemplateExtension.xtend create mode 100644 sculptor-generator/sculptor-generator-cartridges/pom.xml rename sculptor-generator/{sculptor-generator-core => sculptor-generator-cartridges}/src/main/java/org/sculptor/generator/cartridge/builder/BuilderTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-cartridges}/src/main/java/org/sculptor/generator/cartridge/builder/RootTmplExtension.xtend (90%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-cartridges}/src/main/java/org/sculptor/generator/cartridge/mongodb/AccessObjectFactoryTmplExtension.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-cartridges}/src/main/java/org/sculptor/generator/cartridge/mongodb/ConsumerTmplExtension.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-cartridges}/src/main/java/org/sculptor/generator/cartridge/mongodb/MongoDbAccessObjectFactoryTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-cartridges}/src/main/java/org/sculptor/generator/cartridge/mongodb/MongoDbMapperTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-cartridges}/src/main/java/org/sculptor/generator/cartridge/mongodb/MongoDbServiceTestTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-cartridges}/src/main/java/org/sculptor/generator/cartridge/mongodb/RepositoryTmplExtension.xtend (87%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-cartridges}/src/main/java/org/sculptor/generator/cartridge/mongodb/RootTmplExtension.xtend (93%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-cartridges}/src/main/java/org/sculptor/generator/cartridge/mongodb/ServiceTmplExtension.xtend (99%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-cartridges}/src/test/java/org/sculptor/generator/cartridge/mongodb/MongoDbGeneratorTest.xtend (95%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-cartridges}/src/test/java/org/sculptor/generator/cartridge/mongodb/MongoDbMapperTemplatesTest.xtend (92%) rename sculptor-generator/{sculptor-generator-core/src/test/resources/generator-tests/ddl => sculptor-generator-cartridges/src/test/resources/generator-tests/mongodb}/model-person.btdesign (100%) rename sculptor-generator/{sculptor-generator-core/src/test/resources/generator-tests/ddl => sculptor-generator-cartridges/src/test/resources/generator-tests/mongodb}/model.btdesign (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-cartridges}/src/test/resources/generator-tests/mongodb/sculptor-generator.properties (100%) create mode 100644 sculptor-generator/sculptor-generator-cartridges/src/test/resources/logback-test.xml create mode 100644 sculptor-generator/sculptor-generator-core-test/pom.xml rename sculptor-generator/{sculptor-generator-core => sculptor-generator-core-test}/src/test/java/org/sculptor/generator/SculptorGeneratorRunnerTest.xtend (94%) create mode 100644 sculptor-generator/sculptor-generator-core-test/src/test/java/org/sculptor/generator/cartridge/test/PropertiesExtension.xtend create mode 100644 sculptor-generator/sculptor-generator-core-test/src/test/java/org/sculptor/generator/cartridge/test/TransformationExtension.xtend rename sculptor-generator/{sculptor-generator-core => sculptor-generator-core-test}/src/test/java/org/sculptor/generator/formatter/JavaCodeAutoImporterTest.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-core-test}/src/test/java/org/sculptor/generator/formatter/JavaCodeFormatterTest.xtend (100%) create mode 100644 sculptor-generator/sculptor-generator-core-test/src/test/java/org/sculptor/generator/transformation/CustomDatabaseNamingTest.xtend rename sculptor-generator/{sculptor-generator-core/src/test/java/org/sculptor/generator/transformation/SculptorDslTransformationTest.xtend => sculptor-generator-core-test/src/test/java/org/sculptor/generator/transformation/DslTransformationTest.xtend} (92%) create mode 100644 sculptor-generator/sculptor-generator-core-test/src/test/java/org/sculptor/generator/transformation/DtoTransformationTest.xtend create mode 100644 sculptor-generator/sculptor-generator-core-test/src/test/java/org/sculptor/generator/transformation/EnumTransformationTest.xtend create mode 100644 sculptor-generator/sculptor-generator-core-test/src/test/java/org/sculptor/generator/transformation/InheritanceTransformationTest.xtend create mode 100644 sculptor-generator/sculptor-generator-core-test/src/test/java/org/sculptor/generator/transformation/LibraryTransformationTest.xtend create mode 100644 sculptor-generator/sculptor-generator-core-test/src/test/java/org/sculptor/generator/transformation/NestedTransformationTest.xtend rename sculptor-generator/{sculptor-generator-core => sculptor-generator-core-test}/src/test/java/org/sculptor/generator/transformation/RestTransformationTest.xtend (96%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-core-test}/src/test/java/org/sculptor/generator/transformation/ShippingTransformationTest.xtend (81%) create mode 100644 sculptor-generator/sculptor-generator-core-test/src/test/java/org/sculptor/generator/transformation/TraitTransformationTest.xtend create mode 100644 sculptor-generator/sculptor-generator-core-test/src/test/java/org/sculptor/generator/transformation/UniverseTransformationTest.xtend rename sculptor-generator/{sculptor-generator-core => sculptor-generator-core-test}/src/test/java/org/sculptor/generator/util/QueryConverterTest.java (100%) create mode 100644 sculptor-generator/sculptor-generator-core-test/src/test/resources/generator-tests/dto/model.btdesign create mode 100644 sculptor-generator/sculptor-generator-core-test/src/test/resources/generator-tests/enum/model.btdesign create mode 100644 sculptor-generator/sculptor-generator-core-test/src/test/resources/generator-tests/inheritance/model.btdesign create mode 100644 sculptor-generator/sculptor-generator-core-test/src/test/resources/generator-tests/library/model-person.btdesign create mode 100644 sculptor-generator/sculptor-generator-core-test/src/test/resources/generator-tests/library/model.btdesign create mode 100644 sculptor-generator/sculptor-generator-core-test/src/test/resources/generator-tests/nested/nested1.btdesign create mode 100644 sculptor-generator/sculptor-generator-core-test/src/test/resources/generator-tests/nested/nested2.btdesign create mode 100644 sculptor-generator/sculptor-generator-core-test/src/test/resources/generator-tests/nested/nested3.btdesign create mode 100644 sculptor-generator/sculptor-generator-core-test/src/test/resources/generator-tests/nested/nested4.btdesign rename sculptor-generator/{sculptor-generator-core => sculptor-generator-core-test}/src/test/resources/generator-tests/rest/model-person.btdesign (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-core-test}/src/test/resources/generator-tests/rest/model.btdesign (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-core-test}/src/test/resources/generator-tests/runner/model.btdesign (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-core-test}/src/test/resources/generator-tests/runner/sculptor-generator.properties (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-core-test}/src/test/resources/generator-tests/shipping/model.btdesign (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-core-test}/src/test/resources/generator-tests/shipping/sculptor-generator.properties (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-core-test}/src/test/resources/generator-tests/trait/trait.btdesign (100%) rename sculptor-generator/{sculptor-generator-core/src/test/resources/generator-tests/mongodb => sculptor-generator-core-test/src/test/resources/generator-tests/transformation}/model-person.btdesign (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-core-test}/src/test/resources/generator-tests/transformation/model.btdesign (100%) create mode 100644 sculptor-generator/sculptor-generator-core-test/src/test/resources/generator-tests/transformation/sculptor-generator.properties create mode 100644 sculptor-generator/sculptor-generator-core-test/src/test/resources/generator-tests/universe/model.btdesign create mode 100644 sculptor-generator/sculptor-generator-core-test/src/test/resources/logback-test.xml rename sculptor-generator/sculptor-generator-core/src/main/java/org/sculptor/generator/{mwe2 => xtext}/ContextClassLoaderAwareRuntimeResourceSetInitializer.java (98%) delete mode 100644 sculptor-generator/sculptor-generator-core/src/test/java/org/sculptor/generator/transformation/LibraryTransformationTest.xtend delete mode 100644 sculptor-generator/sculptor-generator-core/src/test/java/org/sculptor/generator/transformation/TraitTransformationTest.xtend create mode 100644 sculptor-generator/sculptor-generator-templates/pom.xml rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/RootTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/camel/CamelTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/common/EhCacheTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/common/ExceptionTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/common/LogConfigTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/common/PubSubTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/consumer/ConsumerEjbTestTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/consumer/ConsumerEjbTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/consumer/ConsumerTestTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/consumer/ConsumerTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/db/CustomDDLTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/db/DDLTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/db/DatasourceTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/db/DbUnitTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/db/MysqlDDLTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/db/OracleDDLTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/doc/ModelDocCssTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/doc/ModelDocTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/doc/UMLGraphTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/domain/DomainObjectAnnotationTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/domain/DomainObjectAttributeAnnotationTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/domain/DomainObjectAttributeTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/domain/DomainObjectConstructorTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/domain/DomainObjectKeyTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/domain/DomainObjectNamesTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/domain/DomainObjectPropertiesTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/domain/DomainObjectReferenceAnnotationTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/domain/DomainObjectReferenceTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/domain/DomainObjectTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/domain/DomainObjectTraitTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/drools/DroolsTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/jpa/DataNucleusTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/jpa/EclipseLinkTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/jpa/HibernateTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/jpa/JPATmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/jpa/OpenJpaTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/repository/AccessObjectFactoryTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/repository/AccessObjectTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/repository/RepositoryTmpl.xtend (98%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/rest/ResourceTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/rest/RestWebConfigTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/rest/RestWebContextTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/rest/RestWebCssTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/rest/RestWebJspTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/rest/RestWebTmpl.xtend (100%) Merge branch 'release/3.0.2' rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/service/ServiceEjbTestTmpl.xtend (100%) Merge branch 'release/3.0.2' into develop rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/service/ServiceEjbTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/service/ServiceTestTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/service/ServiceTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/spring/SpringTmpl.xtend (94%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/main/java/org/sculptor/generator/template/springint/SpringIntegrationTmpl.xtend (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/test/java/org/sculptor/generator/template/db/MySQLDDLTest.xtend (95%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/test/java/org/sculptor/generator/template/doc/UMLGraphTmplTest.xtend (93%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/test/java/org/sculptor/generator/template/domain/DomainObjectReferenceAnnotationTmplTest.xtend (93%) rename sculptor-generator/{sculptor-generator-core/src/test/java/org/sculptor/generator/library => sculptor-generator-templates/src/test/java/org/sculptor/generator/template/ext}/DomainObjectReferenceTmplOverride.xtend (95%) rename sculptor-generator/{sculptor-generator-core/src/test/java/org/sculptor/generator/library/LibraryGeneratorTest.xtend => sculptor-generator-templates/src/test/java/org/sculptor/generator/template/ext/TemplateOverrideTest.xtend} (73%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/test/java/org/sculptor/generator/template/jpa/DataNucleusTest.xtend (91%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/test/java/org/sculptor/generator/template/jpa/HibernateTest.xtend (92%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/test/java/org/sculptor/generator/template/service/PureEjb3Test.xtend (94%) rename sculptor-generator/{sculptor-generator-core/src/test/resources/generator-tests/transformation => sculptor-generator-templates/src/test/resources/generator-tests/ddl}/model-person.btdesign (100%) rename sculptor-generator/{sculptor-generator-core/src/test/resources/generator-tests/mongodb => sculptor-generator-templates/src/test/resources/generator-tests/ddl}/model.btdesign (98%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/test/resources/generator-tests/ddl/sculptor-generator.properties (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/test/resources/generator-tests/doc/model.btdesign (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/test/resources/generator-tests/doc/model_core.btdesign (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/test/resources/generator-tests/doc/model_statistics.btdesign (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/test/resources/generator-tests/helloworld/model.btdesign (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/test/resources/generator-tests/helloworld/sculptor-generator.properties (100%) create mode 100644 sculptor-generator/sculptor-generator-templates/src/test/resources/generator-tests/library/model-person.btdesign create mode 100644 sculptor-generator/sculptor-generator-templates/src/test/resources/generator-tests/library/model.btdesign create mode 100644 sculptor-generator/sculptor-generator-templates/src/test/resources/generator-tests/library/sculptor-generator.properties rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/test/resources/generator-tests/pure-ejb3/model.btdesign (100%) rename sculptor-generator/{sculptor-generator-core => sculptor-generator-templates}/src/test/resources/generator-tests/pure-ejb3/sculptor-generator.properties (100%) create mode 100644 sculptor-generator/sculptor-generator-templates/src/test/resources/logback-test.xml create mode 100644 sculptor-generator/sculptor-generator-test/pom.xml rename sculptor-generator/{sculptor-generator-core/src/test => sculptor-generator-test/src/main}/java/org/sculptor/dsl/SculptordslInjectorProvider.java (100%) rename sculptor-generator/{sculptor-generator-core/src/test/java/org/sculptor/generator => sculptor-generator-test/src/main/java/org/sculptor/generator/test}/GeneratorModelTestFixtures.xtend (99%) rename sculptor-generator/{sculptor-generator-core/src/test/java/org/sculptor/generator => sculptor-generator-test/src/main/java/org/sculptor/generator/test}/GeneratorTestBase.xtend (94%) rename sculptor-generator/{sculptor-generator-core/src/test/java/org/sculptor/generator => sculptor-generator-test/src/main/java/org/sculptor/generator/test}/GeneratorTestExtensions.xtend (88%) create mode 100644 sculptor-maven/sculptor-generator-test/pom.xml create mode 100644 sculptor-maven/sculptor-generator-test/src/main/java/Fake.java fatal: no tag message? Tagging failed. Please run finish again to retry. Torstens-MacBook-Pro:sculptor torsten$ git flow release finish 3.0.2 Switched to branch 'develop' Merge made by the 'recursive' strategy. devtools/eclipse-ide/pom.xml | 2 +- devtools/eclipse-mirror/pom.xml | 2 +- pom.xml | 2 +- sculptor-eclipse/eclipse-repository/pom.xml | 2 +- sculptor-eclipse/org.sculptor.dsl.feature/feature.xml | 2 +- sculptor-eclipse/org.sculptor.dsl.feature/pom.xml | 2 +- sculptor-eclipse/org.sculptor.dsl.tests/META-INF/MANIFEST.MF | 2 +- sculptor-eclipse/org.sculptor.dsl.tests/pom.xml | 2 +- sculptor-eclipse/org.sculptor.dsl.ui/META-INF/MANIFEST.MF | 2 +- sculptor-eclipse/org.sculptor.dsl.ui/pom.xml | 2 +- sculptor-eclipse/org.sculptor.dsl/META-INF/MANIFEST.MF | 2 +- sculptor-eclipse/org.sculptor.dsl/pom.xml | 2 +- sculptor-eclipse/pom.xml | 2 +- sculptor-examples/DDDSample/pom.xml | 2 +- sculptor-examples/eda-samples/pom.xml | 2 +- sculptor-examples/eda-samples/sculptor-betting/pom.xml | 2 +- sculptor-examples/eda-samples/sculptor-simplecqrs-snapshots/pom.xml | 2 +- sculptor-examples/eda-samples/sculptor-simplecqrs/pom.xml | 2 +- sculptor-examples/helloworld-example/helloworld-parent/pom.xml | 2 +- sculptor-examples/helloworld-example/helloworld/pom.xml | 2 +- sculptor-examples/helloworld-example/pom.xml | 2 +- sculptor-examples/library-example/pom.xml | 2 +- sculptor-examples/mongodb-samples/blog-mongodb/pom.xml | 2 +- sculptor-examples/mongodb-samples/library-mongodb/pom.xml | 2 +- sculptor-examples/mongodb-samples/pom.xml | 2 +- sculptor-examples/mongodb-samples/sculptor-shipping-generator/pom.xml | 2 +- sculptor-examples/mongodb-samples/sculptor-shipping/pom.xml | 2 +- sculptor-examples/pom.xml | 2 +- sculptor-framework/pom.xml | 2 +- sculptor-framework/sculptor-framework-main/pom.xml | 2 +- sculptor-framework/sculptor-framework-mongodb/pom.xml | 2 +- sculptor-framework/sculptor-framework-test/pom.xml | 2 +- sculptor-generator/eclipse-library/META-INF/MANIFEST.MF | 2 +- sculptor-generator/eclipse-library/pom.xml | 2 +- sculptor-generator/pom.xml | 2 +- sculptor-generator/sculptor-active-annotation-test/pom.xml | 2 +- sculptor-generator/sculptor-active-annotation/pom.xml | 2 +- sculptor-generator/sculptor-generator-cartridges/pom.xml | 2 +- sculptor-generator/sculptor-generator-core-test/pom.xml | 2 +- sculptor-generator/sculptor-generator-core/pom.xml | 2 +- sculptor-generator/sculptor-generator-dependencies/pom.xml | 2 +- sculptor-generator/sculptor-generator-templates/pom.xml | 2 +- sculptor-generator/sculptor-generator-test/pom.xml | 2 +- sculptor-generator/sculptor-metamodel/META-INF/MANIFEST.MF | 2 +- sculptor-generator/sculptor-metamodel/pom.xml | 2 +- sculptor-maven/pom.xml | 2 +- sculptor-maven/sculptor-generator-library/pom.xml | 2 +- sculptor-maven/sculptor-generator-test/pom.xml | 2 +- sculptor-maven/sculptor-maven-archetype-ear/pom.xml | 2 +- sculptor-maven/sculptor-maven-archetype-parent/pom.xml | 2 +- sculptor-maven/sculptor-maven-archetype-web/pom.xml | 2 +- sculptor-maven/sculptor-maven-archetype/pom.xml | 2 +- sculptor-maven/sculptor-maven-plugin/pom.xml | 2 +- 53 files changed, 53 insertions(+), 53 deletions(-) Deleted branch release/3.0.2 (was 92481c3). Summary of actions: - Latest objects have been fetched from 'origin' - Release branch has been merged into 'master' - The release was tagged '3.0.2' - Release branch has been back-merged into 'develop' - Release branch 'release/3.0.2' has been deleted Torstens-MacBook-Pro:sculptor torsten$ git status # On branch develop # Your branch is ahead of 'sculptor/develop' by 2 commits. # (use "git push" to publish your local commits) # nothing to commit, working directory clean Torstens-MacBook-Pro:sculptor torsten$