- Eugene-commits - mailman.cloud.codelutin.com

r1305 - in tags: . eugene-2.7.2
by maven-release＠users.nuiton.org Sept. 30, 2013

Sept. 30, 2013

Author: maven-release Date: 2013-09-30 18:11:14 +0200 (Mon, 30 Sep 2013) New Revision: 1305 Url: http://nuiton.org/projects/eugene/repository/revisions/1305 Log: [maven-release-plugin] copy for tag eugene-2.7.2 Added: tags/eugene-2.7.2/ Property changes on: tags/eugene-2.7.2 ___________________________________________________________________ Added: svn:ignore + target .settings bin .classpath .project *.iml *.ipr *.iws .idea Added: svn:mergeinfo + /branches/1.0.1-Javabuilder:641-651 /branches/1.1.0-Javabuilder:652-681 /branches/eugene-2.0:682-754 /branches/eugene-2.4.3:1151-1173

1 0

r1304 - in trunk: . eugene eugene-java-templates eugene-maven-plugin eugene-plantuml-templates eugene-yaml-templates
by maven-release＠users.nuiton.org Sept. 30, 2013

Sept. 30, 2013

Author: maven-release Date: 2013-09-30 18:11:09 +0200 (Mon, 30 Sep 2013) New Revision: 1304 Url: http://nuiton.org/projects/eugene/repository/revisions/1304 Log: [maven-release-plugin] prepare release eugene-2.7.2 Modified: trunk/eugene-java-templates/pom.xml trunk/eugene-maven-plugin/pom.xml trunk/eugene-plantuml-templates/pom.xml trunk/eugene-yaml-templates/pom.xml trunk/eugene/pom.xml trunk/pom.xml Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2013-09-30 16:09:54 UTC (rev 1303) +++ trunk/eugene/pom.xml 2013-09-30 16:11:09 UTC (rev 1304) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.7.2-SNAPSHOT</version> + <version>2.7.2</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-java-templates/pom.xml =================================================================== --- trunk/eugene-java-templates/pom.xml 2013-09-30 16:09:54 UTC (rev 1303) +++ trunk/eugene-java-templates/pom.xml 2013-09-30 16:11:09 UTC (rev 1304) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.7.2-SNAPSHOT</version> + <version>2.7.2</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-maven-plugin/pom.xml =================================================================== --- trunk/eugene-maven-plugin/pom.xml 2013-09-30 16:09:54 UTC (rev 1303) +++ trunk/eugene-maven-plugin/pom.xml 2013-09-30 16:11:09 UTC (rev 1304) @@ -29,7 +29,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.7.2-SNAPSHOT</version> + <version>2.7.2</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-plantuml-templates/pom.xml =================================================================== --- trunk/eugene-plantuml-templates/pom.xml 2013-09-30 16:09:54 UTC (rev 1303) +++ trunk/eugene-plantuml-templates/pom.xml 2013-09-30 16:11:09 UTC (rev 1304) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.7.2-SNAPSHOT</version> + <version>2.7.2</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-yaml-templates/pom.xml =================================================================== --- trunk/eugene-yaml-templates/pom.xml 2013-09-30 16:09:54 UTC (rev 1303) +++ trunk/eugene-yaml-templates/pom.xml 2013-09-30 16:11:09 UTC (rev 1304) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.7.2-SNAPSHOT</version> + <version>2.7.2</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-30 16:09:54 UTC (rev 1303) +++ trunk/pom.xml 2013-09-30 16:11:09 UTC (rev 1304) @@ -32,7 +32,7 @@ </parent> <artifactId>eugene</artifactId> - <version>2.7.2-SNAPSHOT</version> + <version>2.7.2</version> <packaging>pom</packaging> <name>EUGene</name> <description>Efficient Universal Generator</description> @@ -128,11 +128,11 @@ </modules> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.7.2</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/eugene/trunk + scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.7.2 </developerConnection> - <url>http://nuiton.org/projects/eugene/repository/show/trunk</url> + <url>http://nuiton.org/projects/eugene/repository/show/tags/eugene-2.7.2</url> </scm> <distributionManagement> <site>

1 0

r1303 - in trunk: . eugene-java-templates
by tchemit＠users.nuiton.org Sept. 30, 2013

Sept. 30, 2013

Author: tchemit Date: 2013-09-30 18:09:54 +0200 (Mon, 30 Sep 2013) New Revision: 1303 Url: http://nuiton.org/projects/eugene/repository/revisions/1303 Log: fixes #2864: Updates nuiton-utils to 2.7.1 Modified: trunk/eugene-java-templates/pom.xml trunk/pom.xml Modified: trunk/eugene-java-templates/pom.xml =================================================================== --- trunk/eugene-java-templates/pom.xml 2013-09-29 14:38:04 UTC (rev 1302) +++ trunk/eugene-java-templates/pom.xml 2013-09-30 16:09:54 UTC (rev 1303) @@ -66,6 +66,11 @@ </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-29 14:38:04 UTC (rev 1302) +++ trunk/pom.xml 2013-09-30 16:09:54 UTC (rev 1303) @@ -146,7 +146,7 @@ <projectId>eugene</projectId> <processorPluginVersion>1.3</processorPluginVersion> - <nuitonUtilsVersion>2.6.5</nuitonUtilsVersion> + <nuitonUtilsVersion>2.7.1</nuitonUtilsVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion>

1 0

r1302 - trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org Sept. 29, 2013

Sept. 29, 2013

Author: tchemit Date: 2013-09-29 16:38:04 +0200 (Sun, 29 Sep 2013) New Revision: 1302 Url: http://nuiton.org/projects/eugene/repository/revisions/1302 Log: add superclass for defaults class refs #2861: [SimpleBean] Generate default class helper for each Bean Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanTransformer.java Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanTransformer.java =================================================================== --- trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanTransformer.java 2013-09-29 14:23:58 UTC (rev 1301) +++ trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanTransformer.java 2013-09-29 14:38:04 UTC (rev 1302) @@ -454,9 +454,9 @@ model, aClass); ObjectModelClass output = createAbstractClass(abstractoutclassName, packageName); - setSuperClass(output, superClassName); -// if (superClassName != null) { -// } + if (StringUtils.isNotBlank(superClassName)) { + setSuperClass(output, superClassName); + } if (log.isDebugEnabled()) { log.debug("will generate " + output.getQualifiedName()); @@ -499,9 +499,25 @@ addParameter(operation, "BeanType", "source"); setOperationBody(operation, "" /*{ - BeanType result = (BeanType) new<%=typeName%>(); Class<BeanType> sourceType = typeOf<%=typeName%>(); Binder<BeanType,BeanType> binder = BinderFactory.newBinder(sourceType); + BeanType result = new<%=typeName%>(source, binder); + return result; + }*/ + ); + + operation = addOperation( + output, + "new" + typeName, + "<BeanType extends " + typeName + "> BeanType", + ObjectModelJavaModifier.STATIC, + ObjectModelJavaModifier.PUBLIC + ); + addParameter(operation, "BeanType", "source"); + addParameter(operation, "Binder<BeanType, BeanType>", "binder"); + setOperationBody(operation, "" + /*{ + BeanType result = (BeanType) new<%=typeName%>(); binder.copy(source, result); return result; }*/

1 0

r1301 - trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org Sept. 29, 2013

Sept. 29, 2013

Author: tchemit Date: 2013-09-29 16:23:58 +0200 (Sun, 29 Sep 2013) New Revision: 1301 Url: http://nuiton.org/projects/eugene/repository/revisions/1301 Log: add superclass for defaults class refs #2861: [SimpleBean] Generate default class helper for each Bean Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesGeneratorUtil.java trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesTagValues.java trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanTransformer.java Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesGeneratorUtil.java =================================================================== --- trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesGeneratorUtil.java 2013-09-29 09:38:41 UTC (rev 1300) +++ trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesGeneratorUtil.java 2013-09-29 14:23:58 UTC (rev 1301) @@ -24,6 +24,7 @@ * #L% */ +import org.apache.commons.lang3.StringUtils; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelClassifier; @@ -110,9 +111,9 @@ * @see JavaTemplatesTagValues#TAG_SIMPLE_BEAN_GENERATE_INTERFACE * @since 2.3 */ - public static String getSimpleBeanGenerateInterfaceTagValue(ObjectModel model, ObjectModelClassifier classifier) { + public static boolean isSimpleBeanGenerateInterface(ObjectModel model, ObjectModelClassifier classifier) { String value = findTagValue(JavaTemplatesTagValues.TAG_SIMPLE_BEAN_GENERATE_INTERFACE, classifier, model); - return value; + return value != null && "true".equals(value); } /** @@ -224,10 +225,66 @@ * @param classifier classifier to seek * @return the none empty value of the found tag value or {@code null} if not found nor empty. * @see JavaTemplatesTagValues#TAG_SIMPLE_BEAN_GENERATE_DEFAULTS - * @since 2.6.2 + * @since 2.7.2 */ public static boolean isSimpleBeanGenerateDefaults(ObjectModel model, ObjectModelClassifier classifier) { String value = findTagValue(JavaTemplatesTagValues.TAG_SIMPLE_BEAN_GENERATE_DEFAULTS, classifier, model); return value != null && "true".equals(value); } + + /** + * Obtain the value of the {@link JavaTemplatesTagValues#TAG_SIMPLE_BEAN_DEFAULTS_SUPER_CLASS} + * tag value on the given model or classifier. + * + * It will first look on the model, and then in the given classifier. + * + * @param model model to seek + * @param classifier classifier to seek + * @return the none empty value of the found tag value or {@code null} if not found nor empty. + * @see JavaTemplatesTagValues#TAG_SIMPLE_BEAN_DEFAULTS_SUPER_CLASS + * @since 2.7.2 + */ + public static String getSimpleBeanDefaultsSuperClassTagValue(ObjectModel model, ObjectModelClassifier classifier) { + String value = findTagValue(JavaTemplatesTagValues.TAG_SIMPLE_BEAN_DEFAULTS_SUPER_CLASS, classifier, model); + return value; + } + + /** + * Obtain the value of the {@link JavaTemplatesTagValues#TAG_SIMPLE_BEAN_DEFAULTS_CLASS_NAME_PREFIX} + * tag value on the given model or classifier. + * + * It will first look on the model, and then in the given classifier. + * + * @param model model to seek + * @param classifier classifier to seek + * @return the none empty value of the found tag value or {@code null} if not found nor empty. + * @see JavaTemplatesTagValues#TAG_SIMPLE_BEAN_DEFAULTS_CLASS_NAME_PREFIX + * @since 2.7.2 + */ + public static String getSimpleBeanDefaultsClassNamePrefixTagValue(ObjectModel model, ObjectModelClassifier classifier) { + String value = findTagValue(JavaTemplatesTagValues.TAG_SIMPLE_BEAN_DEFAULTS_CLASS_NAME_PREFIX, classifier, model); + return value; + } + + /** + * Obtain the value of the {@link JavaTemplatesTagValues#TAG_SIMPLE_BEAN_DEFAULTS_CLASS_NAME_SUFFIX} + * tag value on the given model or classifier. + * + * It will first look on the model, and then in the given classifier. + * + * If not filled, then use default {@code s} value. + * + * @param model model to seek + * @param classifier classifier to seek + * @return the none empty value of the found tag value or {@code null} if not found nor empty. + * @see JavaTemplatesTagValues#TAG_SIMPLE_BEAN_DEFAULTS_CLASS_NAME_SUFFIX + * @since 2.6.2 + */ + public static String getSimpleBeanDefaultsClassNameSuffixTagValue(ObjectModel model, ObjectModelClassifier classifier) { + String value = findTagValue(JavaTemplatesTagValues.TAG_SIMPLE_BEAN_DEFAULTS_CLASS_NAME_SUFFIX, classifier, model); + if (StringUtils.isBlank(value)) { + value = "s"; + } + return value; + } } Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesTagValues.java =================================================================== --- trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesTagValues.java 2013-09-29 09:38:41 UTC (rev 1300) +++ trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesTagValues.java 2013-09-29 14:23:58 UTC (rev 1301) @@ -214,7 +214,7 @@ * * You can globaly use it on the complete model or to a specific classifier. * - * @see JavaTemplatesGeneratorUtil#getSimpleBeanGenerateInterfaceTagValue(ObjectModel, ObjectModelClassifier) + * @see JavaTemplatesGeneratorUtil#isSimpleBeanGenerateInterface(ObjectModel, ObjectModelClassifier) * @since 2.6.2 */ @ModelPropertiesUtil.TagValueDefinition( @@ -296,4 +296,52 @@ documentation = "To generate defaults class with simple operations on the type.\n" + "(only effective with simple bean generator)") String TAG_SIMPLE_BEAN_GENERATE_DEFAULTS = "simpleBeanGenerateDefaults"; + + /** + * Tag value to use a super super-class for generated defaults class of a + * simple bean. + * + * You can globaly use it on the complete model or to a specific classifier. + * + * @see JavaTemplatesGeneratorUtil#getSimpleBeanDefaultsSuperClassTagValue(ObjectModel, ObjectModelClassifier) + * @since 2.7.2 + */ + @ModelPropertiesUtil.TagValueDefinition( + target = {ObjectModel.class, ObjectModelClassifier.class}, + documentation = "To specify a super-class to used on generated defaults classes" + + "for a bean or any bean of a model.\n" + + "(only effective with simple bean generator)") + String TAG_SIMPLE_BEAN_DEFAULTS_SUPER_CLASS = "simpleBeanDefaultsSuperClass"; + + /** + * To add a prefix on the name of each generated bean class. + * + * You can globaly use it on the complete model or to a specific classifier. + * + * @see JavaTemplatesGeneratorUtil#getSimpleBeanDefaultsClassNamePrefixTagValue(ObjectModel, ObjectModelClassifier) + * @since 2.7.2 + */ + @ModelPropertiesUtil.TagValueDefinition( + target = {ObjectModel.class, ObjectModelClassifier.class}, + documentation = "To add a prefix on class name of generated defaults bean " + + "for a class or any class of a model.\n" + + "(only effective with simple bean generator)") + String TAG_SIMPLE_BEAN_DEFAULTS_CLASS_NAME_PREFIX = "simpleBeanDefaultsClassNamePrefix"; + + /** + * To add a suffix on the name of each generated bean class. + * + * You can globaly use it on the complete model or to a specific classifier. + * + * @see JavaTemplatesGeneratorUtil#getSimpleBeanDefaultsClassNameSuffixTagValue(ObjectModel, ObjectModelClassifier) + * @since 2.6.2 + */ + @ModelPropertiesUtil.TagValueDefinition( + target = {ObjectModel.class, ObjectModelClassifier.class}, + documentation = "To add a suffix on class name of generated defaults bean " + + "for a class or any class of a model.\n" + + "(only effective with simple bean generator)") + String TAG_SIMPLE_BEAN_DEFAULTS_CLASS_NAME_SUFFIX = "simpleBeanDefaultsClassNameSuffix"; + + } Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanTransformer.java =================================================================== --- trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanTransformer.java 2013-09-29 09:38:41 UTC (rev 1300) +++ trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanTransformer.java 2013-09-29 14:23:58 UTC (rev 1301) @@ -72,10 +72,6 @@ generateBeanFactory(model, className); } - - if (canGenerateBeanDefaults(model, null)) { - generateBeanDefaults(model); - } } @Override @@ -89,7 +85,10 @@ String interfaceName = getBeanInterfaceName(input); String className = getBeanClassName(input); + String defaultClassName = getBeanDefaultsClassName(input); + boolean generateDefaults = canGenerateBeanDefaults(input); + boolean generateInterface = canGenerateInterface(input, interfaceName); boolean generateClass = canGenerateBean(input, className); @@ -123,7 +122,10 @@ } } + if (generateDefaults) { + generateBeanDefaults(input, defaultClassName); + } } protected boolean canGenerateFactory(ObjectModel model, String className) { @@ -144,12 +146,12 @@ protected boolean canGenerateInterface(ObjectModelClass input, String className) { - String generateTagValue = - JavaTemplatesGeneratorUtil.getSimpleBeanGenerateInterfaceTagValue(model, input); + boolean generateInterface = + JavaTemplatesGeneratorUtil.isSimpleBeanGenerateInterface(model, input); - boolean generateInterface = generateTagValue != null && - Boolean.valueOf(generateTagValue); - +// boolean generateInterface = generateTagValue != null && +// Boolean.valueOf(generateTagValue); +// String fqn = input.getPackageName() + "." + className; boolean canGenerate = generateInterface && !isInClassPath(fqn); @@ -188,8 +190,7 @@ return canGenerate; } - protected boolean canGenerateBeanDefaults(ObjectModel model, - ObjectModelClass input) { + protected boolean canGenerateBeanDefaults(ObjectModelClass input) { boolean withInput = input != null; @@ -390,7 +391,7 @@ // Get available properties List<ObjectModelAttribute> properties = getProperties(input); - boolean usePCS= !JavaTemplatesGeneratorUtil.isNoPCS(model, input); + boolean usePCS = !JavaTemplatesGeneratorUtil.isNoPCS(model, input); // boolean usePCS = StringUtils.isEmpty(noPCSTagValue) || // !"true".equals(noPCSTagValue.trim()); @@ -416,86 +417,87 @@ return output; } - protected void generateBeanDefaults(ObjectModel model) { + protected void generateBeanDefaults(ObjectModelClass aClass, + String defaultClassName) { - for (ObjectModelClass aClass : model.getClasses()) { + boolean generateDefault = canGenerateBeanDefaults(aClass); - boolean generateDefault = canGenerateBeanDefaults(model, aClass); + if (!generateDefault) { + return; + } - if (!generateDefault) { - continue; - } + String packageName = aClass.getPackageName(); + String typeName = getBeanInterfaceName(aClass); + String typeBeanName = getBeanClassName(aClass); - String packageName = aClass.getPackageName(); - String typeName = getBeanInterfaceName(aClass); - String typeBeanName = getBeanClassName(aClass); + String abstractoutclassName = "Abstract" + defaultClassName; - String outclassName = typeName + "s"; - String abstractoutclassName = "Abstract" + outclassName; + if (!isInClassPath(packageName, defaultClassName)) { - if (!isInClassPath(packageName, outclassName)) { + // generate defaults class - // generate defaults class - - ObjectModelClass output = createClass(outclassName, packageName); -// addImport(output, packageName + "." + typeName); -// addImport(output, packageName + "." + typeBeanName); - setSuperClass(output, packageName + "." + abstractoutclassName); - if (log.isDebugEnabled()) { - log.debug("will generate " + output.getQualifiedName()); - } + ObjectModelClass output = createClass(defaultClassName, packageName); + setSuperClass(output, packageName + "." + abstractoutclassName); + if (log.isDebugEnabled()) { + log.debug("will generate " + output.getQualifiedName()); } + } - if (!isInClassPath(packageName, abstractoutclassName)) { + if (!isInClassPath(packageName, abstractoutclassName)) { - // generate abstract defaults class + // generate abstract defaults class - ObjectModelClass output = createAbstractClass(abstractoutclassName, packageName); + // try to find a super class by tag-value + String superClassName = + JavaTemplatesGeneratorUtil.getSimpleBeanDefaultsSuperClassTagValue( + model, aClass); -// addImport(output, packageName + "." + typeName); -// addImport(output, packageName + "." + typeBeanName); + ObjectModelClass output = createAbstractClass(abstractoutclassName, packageName); + setSuperClass(output, superClassName); +// if (superClassName != null) { +// } - if (log.isDebugEnabled()) { - log.debug("will generate " + output.getQualifiedName()); - } + if (log.isDebugEnabled()) { + log.debug("will generate " + output.getQualifiedName()); + } - ObjectModelOperation operation = addOperation( - output, - "typeOf" + typeName, - "<BeanType extends " + typeName + "> Class<BeanType>", - ObjectModelJavaModifier.STATIC, - ObjectModelJavaModifier.PUBLIC - ); - setOperationBody(operation, "" + ObjectModelOperation operation = addOperation( + output, + "typeOf" + typeName, + "<BeanType extends " + typeName + "> Class<BeanType>", + ObjectModelJavaModifier.STATIC, + ObjectModelJavaModifier.PUBLIC + ); + setOperationBody(operation, "" /*{ return (Class<BeanType>) <%=typeBeanName%>.class; }*/ - ); - operation = addOperation( - output, - "new" + typeName, - typeName, - ObjectModelJavaModifier.STATIC, - ObjectModelJavaModifier.PUBLIC - ); - setOperationBody(operation, "" + ); + operation = addOperation( + output, + "new" + typeName, + typeName, + ObjectModelJavaModifier.STATIC, + ObjectModelJavaModifier.PUBLIC + ); + setOperationBody(operation, "" /*{ return new <%=typeBeanName%>(); }*/ - ); + ); - addImport(output, Binder.class); - addImport(output, BinderFactory.class); - operation = addOperation( - output, - "new" + typeName, - "<BeanType extends " + typeName + "> BeanType", - ObjectModelJavaModifier.STATIC, - ObjectModelJavaModifier.PUBLIC - ); - addParameter(operation, "BeanType", "source"); - setOperationBody(operation, "" + addImport(output, Binder.class); + addImport(output, BinderFactory.class); + operation = addOperation( + output, + "new" + typeName, + "<BeanType extends " + typeName + "> BeanType", + ObjectModelJavaModifier.STATIC, + ObjectModelJavaModifier.PUBLIC + ); + addParameter(operation, "BeanType", "source"); + setOperationBody(operation, "" /*{ BeanType result = (BeanType) new<%=typeName%>(); Class<BeanType> sourceType = typeOf<%=typeName%>(); @@ -503,8 +505,7 @@ binder.copy(source, result); return result; }*/ - ); - } + ); } } @@ -545,6 +546,16 @@ ); } + protected String getBeanDefaultsClassName(ObjectModelClass input) { + String classNamePrefix = JavaTemplatesGeneratorUtil.getSimpleBeanDefaultsClassNamePrefixTagValue(model, input); + String classNameSuffix = JavaTemplatesGeneratorUtil.getSimpleBeanDefaultsClassNameSuffixTagValue(model, input); + return generateName( + classNamePrefix, + input.getName(), + classNameSuffix + ); + } + protected String generateName(String prefix, String name, String suffix) {

1 0

r1300 - in trunk: . eugene/src/main/java/org/nuiton/eugene eugene/src/main/java/org/nuiton/eugene/java eugene-java-templates/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org Sept. 29, 2013

Sept. 29, 2013

Author: tchemit Date: 2013-09-29 11:38:41 +0200 (Sun, 29 Sep 2013) New Revision: 1300 Url: http://nuiton.org/projects/eugene/repository/revisions/1300 Log: fixes #2860: Update mavenpom to 4.1 fixes #2861: [SimpleBean] Generate default class helper for each Bean Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesGeneratorUtil.java trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesTagValues.java trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanTransformer.java trunk/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java trunk/pom.xml Modified: trunk/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java 2013-09-17 16:44:15 UTC (rev 1299) +++ trunk/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java 2013-09-29 09:38:41 UTC (rev 1300) @@ -99,7 +99,7 @@ * Tag value to specify to not generate only the {@code isXXX} methods for * a boolean property. * - * @see JavaGeneratorUtil#getDoNotGenerateBooleanGetMethods(ObjectModel, ObjectModelClassifier) + * @see JavaGeneratorUtil#isDoNotGenerateBooleanGetMethods(ObjectModel, ObjectModelClassifier) * @since 2.4.1 */ @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class}, Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2013-09-17 16:44:15 UTC (rev 1299) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2013-09-29 09:38:41 UTC (rev 1300) @@ -158,10 +158,10 @@ * @see EugeneTagValues#TAG_DO_NOT_GENERATE_BOOLEAN_GET_METHODS * @since 2.4.1 */ - public static String getDoNotGenerateBooleanGetMethods(ObjectModel model, - ObjectModelClassifier classifier) { + public static boolean isDoNotGenerateBooleanGetMethods(ObjectModel model, + ObjectModelClassifier classifier) { String value = findTagValue(EugeneTagValues.TAG_DO_NOT_GENERATE_BOOLEAN_GET_METHODS, classifier, model); - return value; + return value!=null && "true".equals(value); } /** Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java =================================================================== --- trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2013-09-17 16:44:15 UTC (rev 1299) +++ trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2013-09-29 09:38:41 UTC (rev 1300) @@ -189,15 +189,13 @@ generateI18nBlockAndConstants(input, output); - String noPCSTagValue = JavaTemplatesGeneratorUtil.getNoPCSTagValue(model, input); - boolean usePCS = StringUtils.isEmpty(noPCSTagValue) || - !"true".equals(noPCSTagValue.trim()); + boolean usePCS = !JavaTemplatesGeneratorUtil.isNoPCS(model, input); - String noGenerateBooleanGetMethods = - JavaTemplatesGeneratorUtil.getDoNotGenerateBooleanGetMethods(model, input); - boolean generateBooleanGetMethods = - StringUtils.isEmpty(noGenerateBooleanGetMethods) || - !"true".equals(noGenerateBooleanGetMethods.trim()); + boolean generateBooleanGetMethods = ! + JavaTemplatesGeneratorUtil.isDoNotGenerateBooleanGetMethods(model, input); +// boolean generateBooleanGetMethods = +// StringUtils.isEmpty(noGenerateBooleanGetMethods) || +// !"true".equals(noGenerateBooleanGetMethods.trim()); // Get available properties List<ObjectModelAttribute> properties = getProperties(input); Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesGeneratorUtil.java =================================================================== --- trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesGeneratorUtil.java 2013-09-17 16:44:15 UTC (rev 1299) +++ trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesGeneratorUtil.java 2013-09-29 09:38:41 UTC (rev 1300) @@ -59,9 +59,9 @@ * @see JavaTemplatesTagValues#TAG_NO_PCS * @since 2.3 */ - public static String getNoPCSTagValue(ObjectModel model, ObjectModelClassifier classifier) { + public static boolean isNoPCS(ObjectModel model, ObjectModelClassifier classifier) { String value = findTagValue(JavaTemplatesTagValues.TAG_NO_PCS, classifier, model); - return value; + return value != null && "true".equals(value); } /** @@ -122,11 +122,11 @@ * @param model model to seek * @return the none empty value of the found tag value or {@code null} if not found nor empty. * @see JavaTemplatesTagValues#TAG_SIMPLE_BEAN_GENERATE_FACTORY - * @since 2.3 + * @since 2.7.2 */ - public static String getSimpleBeanGenerateFactoryTagValue(ObjectModel model) { + public static boolean isSimpleBeanGenerateFactory(ObjectModel model) { String value = findTagValue(JavaTemplatesTagValues.TAG_SIMPLE_BEAN_GENERATE_FACTORY, null, model); - return value; + return value != null && "true".equals(value); } /** @@ -213,4 +213,21 @@ String value = findTagValue(JavaTemplatesTagValues.TAG_SIMPLE_BEAN_INTERFACE_NAME_SUFFIX, classifier, model); return value; } + + /** + * Obtain the value of the {@link JavaTemplatesTagValues#TAG_SIMPLE_BEAN_GENERATE_DEFAULTS} + * tag value on the given model or classifier. + * + * It will first look on the model, and then in the given classifier. + * + * @param model model to seek + * @param classifier classifier to seek + * @return the none empty value of the found tag value or {@code null} if not found nor empty. + * @see JavaTemplatesTagValues#TAG_SIMPLE_BEAN_GENERATE_DEFAULTS + * @since 2.6.2 + */ + public static boolean isSimpleBeanGenerateDefaults(ObjectModel model, ObjectModelClassifier classifier) { + String value = findTagValue(JavaTemplatesTagValues.TAG_SIMPLE_BEAN_GENERATE_DEFAULTS, classifier, model); + return value != null && "true".equals(value); + } } Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesTagValues.java =================================================================== --- trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesTagValues.java 2013-09-17 16:44:15 UTC (rev 1299) +++ trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaTemplatesTagValues.java 2013-09-29 09:38:41 UTC (rev 1300) @@ -42,7 +42,7 @@ * * You can globaly use it on the complete model or to a specific classifier. * - * @see JavaTemplatesGeneratorUtil#getNoPCSTagValue(ObjectModel, ObjectModelClassifier) + * @see JavaTemplatesGeneratorUtil#isNoPCS(ObjectModel, ObjectModelClassifier) * @since 2.5.6 */ @ModelPropertiesUtil.TagValueDefinition( @@ -270,11 +270,11 @@ String TAG_SIMPLE_BEAN_INTERFACE_NAME_SUFFIX = "simpleBeanInterfaceNameSuffix"; /** - * To generate an factory of generated simple beans. + * To generate a factory of generated simple beans. * * You must use it on the complete model. * - * @see JavaTemplatesGeneratorUtil#getSimpleBeanGenerateFactoryTagValue(ObjectModel) + * @see JavaTemplatesGeneratorUtil#isSimpleBeanGenerateFactory(ObjectModel) * @since 2.6.2 */ @ModelPropertiesUtil.TagValueDefinition( @@ -282,4 +282,18 @@ documentation = "To generate a factory of simple bean.\n" + "(only effective with simple bean generator)") String TAG_SIMPLE_BEAN_GENERATE_FACTORY = "simpleBeanGenerateFactory"; + + /** + * To generate a factory of generated simple beans. + * + * You must use it on the complete model. + * + * @see JavaTemplatesGeneratorUtil#isSimpleBeanGenerateDefaults(ObjectModel, ObjectModelClassifier) + * @since 2.7.2 + */ + @ModelPropertiesUtil.TagValueDefinition( + target = {ObjectModel.class, ObjectModelClassifier.class}, + documentation = "To generate defaults class with simple operations on the type.\n" + + "(only effective with simple bean generator)") + String TAG_SIMPLE_BEAN_GENERATE_DEFAULTS = "simpleBeanGenerateDefaults"; } Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanTransformer.java =================================================================== --- trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanTransformer.java 2013-09-17 16:44:15 UTC (rev 1299) +++ trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanTransformer.java 2013-09-29 09:38:41 UTC (rev 1300) @@ -38,6 +38,8 @@ import org.nuiton.eugene.models.object.ObjectModelInterface; import org.nuiton.eugene.models.object.ObjectModelJavaModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; +import org.nuiton.util.beans.Binder; +import org.nuiton.util.beans.BinderFactory; import java.io.Serializable; import java.util.ArrayList; @@ -70,6 +72,10 @@ generateBeanFactory(model, className); } + + if (canGenerateBeanDefaults(model, null)) { + generateBeanDefaults(model); + } } @Override @@ -121,11 +127,9 @@ } protected boolean canGenerateFactory(ObjectModel model, String className) { - String generateTagValue = - JavaTemplatesGeneratorUtil.getSimpleBeanGenerateFactoryTagValue(model); - boolean generateFactory = generateTagValue != null && - Boolean.valueOf(generateTagValue); + boolean generateFactory = + JavaTemplatesGeneratorUtil.isSimpleBeanGenerateFactory(model); String defaultPackage = getConfiguration().getProperty(PROP_DEFAULT_PACKAGE); @@ -184,6 +188,43 @@ return canGenerate; } + protected boolean canGenerateBeanDefaults(ObjectModel model, + ObjectModelClass input) { + + boolean withInput = input != null; + + boolean canGenerate = + JavaTemplatesGeneratorUtil.isSimpleBeanGenerateDefaults( + model, input); + + if (canGenerate) { + + if (withInput) { + + // class in not abstract + // class is a bean + + canGenerate = !input.isAbstract() && + JavaTemplatesGeneratorUtil.hasBeanStereotype(input); + + } + } + + return canGenerate; + } + + protected boolean canGenerateBeanAbstractDefaults(ObjectModelClass input, + String className) { + + String classPackage = input.getPackageName(); + + String fqn = classPackage + "." + className; + + boolean canGenerate = !isInClassPath(fqn); + + return canGenerate; + } + protected void generateBeanFactory(ObjectModel model, String className) { String defaultPackage = getConfiguration().getProperty(PROP_DEFAULT_PACKAGE); @@ -201,13 +242,13 @@ ObjectModelOperation operation = addOperation( output, "typeOf" + typeName, - "Class<? extends " + typeName + ">", + "<BeanType extends " + typeName + "> Class<BeanType>", ObjectModelJavaModifier.STATIC, ObjectModelJavaModifier.PUBLIC ); setOperationBody(operation, "" /*{ - return <%=typeBeanName%>.class; + return (Class<BeanType>) <%=typeBeanName%>.class; }*/ ); operation = addOperation( @@ -349,15 +390,16 @@ // Get available properties List<ObjectModelAttribute> properties = getProperties(input); - String noPCSTagValue = JavaTemplatesGeneratorUtil.getNoPCSTagValue(model, input); - boolean usePCS = StringUtils.isEmpty(noPCSTagValue) || - !"true".equals(noPCSTagValue.trim()); + boolean usePCS= !JavaTemplatesGeneratorUtil.isNoPCS(model, input); +// boolean usePCS = StringUtils.isEmpty(noPCSTagValue) || +// !"true".equals(noPCSTagValue.trim()); - String noGenerateBooleanGetMethods = - JavaGeneratorUtil.getDoNotGenerateBooleanGetMethods(model, input); boolean generateBooleanGetMethods = - StringUtils.isEmpty(noGenerateBooleanGetMethods) || - !"true".equals(noGenerateBooleanGetMethods.trim()); + !JavaGeneratorUtil.isDoNotGenerateBooleanGetMethods(model, + input); +// boolean generateBooleanGetMethods = +// StringUtils.isEmpty(noGenerateBooleanGetMethods) || +// !"true".equals(noGenerateBooleanGetMethods.trim()); // Add properties field + javabean methods for (ObjectModelAttribute attr : properties) { @@ -374,7 +416,98 @@ return output; } + protected void generateBeanDefaults(ObjectModel model) { + for (ObjectModelClass aClass : model.getClasses()) { + + boolean generateDefault = canGenerateBeanDefaults(model, aClass); + + if (!generateDefault) { + continue; + } + + String packageName = aClass.getPackageName(); + String typeName = getBeanInterfaceName(aClass); + String typeBeanName = getBeanClassName(aClass); + + String outclassName = typeName + "s"; + String abstractoutclassName = "Abstract" + outclassName; + + if (!isInClassPath(packageName, outclassName)) { + + // generate defaults class + + ObjectModelClass output = createClass(outclassName, packageName); +// addImport(output, packageName + "." + typeName); +// addImport(output, packageName + "." + typeBeanName); + setSuperClass(output, packageName + "." + abstractoutclassName); + if (log.isDebugEnabled()) { + log.debug("will generate " + output.getQualifiedName()); + } + } + + + if (!isInClassPath(packageName, abstractoutclassName)) { + + // generate abstract defaults class + + ObjectModelClass output = createAbstractClass(abstractoutclassName, packageName); + +// addImport(output, packageName + "." + typeName); +// addImport(output, packageName + "." + typeBeanName); + + if (log.isDebugEnabled()) { + log.debug("will generate " + output.getQualifiedName()); + } + + ObjectModelOperation operation = addOperation( + output, + "typeOf" + typeName, + "<BeanType extends " + typeName + "> Class<BeanType>", + ObjectModelJavaModifier.STATIC, + ObjectModelJavaModifier.PUBLIC + ); + setOperationBody(operation, "" + /*{ + return (Class<BeanType>) <%=typeBeanName%>.class; + }*/ + ); + operation = addOperation( + output, + "new" + typeName, + typeName, + ObjectModelJavaModifier.STATIC, + ObjectModelJavaModifier.PUBLIC + ); + setOperationBody(operation, "" + /*{ + return new <%=typeBeanName%>(); + }*/ + ); + + addImport(output, Binder.class); + addImport(output, BinderFactory.class); + operation = addOperation( + output, + "new" + typeName, + "<BeanType extends " + typeName + "> BeanType", + ObjectModelJavaModifier.STATIC, + ObjectModelJavaModifier.PUBLIC + ); + addParameter(operation, "BeanType", "source"); + setOperationBody(operation, "" + /*{ + BeanType result = (BeanType) new<%=typeName%>(); + Class<BeanType> sourceType = typeOf<%=typeName%>(); + Binder<BeanType,BeanType> binder = BinderFactory.newBinder(sourceType); + binder.copy(source, result); + return result; + }*/ + ); + } + } + } + protected Collection<ObjectModelOperation> getPublicOperations(ObjectModelClass clazz) { Collection<ObjectModelOperation> result = new ArrayList<ObjectModelOperation>(); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-17 16:44:15 UTC (rev 1299) +++ trunk/pom.xml 2013-09-29 09:38:41 UTC (rev 1300) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.0</version> + <version>4.1</version> </parent> <artifactId>eugene</artifactId>

1 0

[ANN] - EUGene 2.7.1 released
by nuiton.org Release Notification Sept. 17, 2013

Sept. 17, 2013

The EUGene team is pleased to announce the eugene-2.7.1 release! Efficient Universal Generator Documentation of the project can be found here: http://maven-site.nuiton.org/eugene Changes ------- Changes in this version include: New features: o Obtain the default output package name in a Transformer Issue: 2827. Thanks to Tony Chemit. Resolved by tchemit. o Add a new method ObjectModelTransformerToJava.isInClassPath Issue: 2826. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- No release file deployed. (all files are deployed in the maven repository) Maven artifacts --------------- Artifacts are deployed in Maven Central Repository http://repo1.maven.org/maven2/ Find us at * http://search.maven.org/#artifactdetails|org.nuiton.eugene|eugene-yaml-temp… Have fun! -EUGene team

1 0

r1299 - in trunk: . eugene eugene-java-templates eugene-maven-plugin eugene-plantuml-templates eugene-yaml-templates
by maven-release＠users.nuiton.org Sept. 17, 2013

Sept. 17, 2013

Author: maven-release Date: 2013-09-17 18:44:15 +0200 (Tue, 17 Sep 2013) New Revision: 1299 Url: http://nuiton.org/projects/eugene/repository/revisions/1299 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/eugene-java-templates/pom.xml trunk/eugene-maven-plugin/pom.xml trunk/eugene-plantuml-templates/pom.xml trunk/eugene-yaml-templates/pom.xml trunk/eugene/pom.xml trunk/pom.xml Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2013-09-17 16:44:12 UTC (rev 1298) +++ trunk/eugene/pom.xml 2013-09-17 16:44:15 UTC (rev 1299) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.7.1</version> + <version>2.7.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-java-templates/pom.xml =================================================================== --- trunk/eugene-java-templates/pom.xml 2013-09-17 16:44:12 UTC (rev 1298) +++ trunk/eugene-java-templates/pom.xml 2013-09-17 16:44:15 UTC (rev 1299) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.7.1</version> + <version>2.7.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-maven-plugin/pom.xml =================================================================== --- trunk/eugene-maven-plugin/pom.xml 2013-09-17 16:44:12 UTC (rev 1298) +++ trunk/eugene-maven-plugin/pom.xml 2013-09-17 16:44:15 UTC (rev 1299) @@ -29,7 +29,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.7.1</version> + <version>2.7.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-plantuml-templates/pom.xml =================================================================== --- trunk/eugene-plantuml-templates/pom.xml 2013-09-17 16:44:12 UTC (rev 1298) +++ trunk/eugene-plantuml-templates/pom.xml 2013-09-17 16:44:15 UTC (rev 1299) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.7.1</version> + <version>2.7.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-yaml-templates/pom.xml =================================================================== --- trunk/eugene-yaml-templates/pom.xml 2013-09-17 16:44:12 UTC (rev 1298) +++ trunk/eugene-yaml-templates/pom.xml 2013-09-17 16:44:15 UTC (rev 1299) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.7.1</version> + <version>2.7.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-17 16:44:12 UTC (rev 1298) +++ trunk/pom.xml 2013-09-17 16:44:15 UTC (rev 1299) @@ -32,7 +32,7 @@ </parent> <artifactId>eugene</artifactId> - <version>2.7.1</version> + <version>2.7.2-SNAPSHOT</version> <packaging>pom</packaging> <name>EUGene</name> <description>Efficient Universal Generator</description> @@ -128,11 +128,11 @@ </modules> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.7.1</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.7.1 + scm:svn:http://svn.nuiton.org/svn/eugene/trunk </developerConnection> - <url>http://nuiton.org/projects/eugene/repository/show/tags/eugene-2.7.1</url> + <url>http://nuiton.org/projects/eugene/repository/show/trunk</url> </scm> <distributionManagement> <site>

1 0

r1298 - in tags: . eugene-2.7.1
by maven-release＠users.nuiton.org Sept. 17, 2013

Sept. 17, 2013

Author: maven-release Date: 2013-09-17 18:44:12 +0200 (Tue, 17 Sep 2013) New Revision: 1298 Url: http://nuiton.org/projects/eugene/repository/revisions/1298 Log: [maven-release-plugin] copy for tag eugene-2.7.1 Added: tags/eugene-2.7.1/ Property changes on: tags/eugene-2.7.1 ___________________________________________________________________ Added: svn:ignore + target .settings bin .classpath .project *.iml *.ipr *.iws .idea Added: svn:mergeinfo + /branches/1.0.1-Javabuilder:641-651 /branches/1.1.0-Javabuilder:652-681 /branches/eugene-2.0:682-754 /branches/eugene-2.4.3:1151-1173

1 0

r1297 - in trunk: . eugene eugene-java-templates eugene-maven-plugin eugene-plantuml-templates eugene-yaml-templates
by maven-release＠users.nuiton.org Sept. 17, 2013

Sept. 17, 2013

Author: maven-release Date: 2013-09-17 18:44:09 +0200 (Tue, 17 Sep 2013) New Revision: 1297 Url: http://nuiton.org/projects/eugene/repository/revisions/1297 Log: [maven-release-plugin] prepare release eugene-2.7.1 Modified: trunk/eugene-java-templates/pom.xml trunk/eugene-maven-plugin/pom.xml trunk/eugene-plantuml-templates/pom.xml trunk/eugene-yaml-templates/pom.xml trunk/eugene/pom.xml trunk/pom.xml Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2013-08-15 10:45:40 UTC (rev 1296) +++ trunk/eugene/pom.xml 2013-09-17 16:44:09 UTC (rev 1297) @@ -22,14 +22,12 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.7.1-SNAPSHOT</version> + <version>2.7.1</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-java-templates/pom.xml =================================================================== --- trunk/eugene-java-templates/pom.xml 2013-08-15 10:45:40 UTC (rev 1296) +++ trunk/eugene-java-templates/pom.xml 2013-09-17 16:44:09 UTC (rev 1297) @@ -22,15 +22,13 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.7.1-SNAPSHOT</version> + <version>2.7.1</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-maven-plugin/pom.xml =================================================================== --- trunk/eugene-maven-plugin/pom.xml 2013-08-15 10:45:40 UTC (rev 1296) +++ trunk/eugene-maven-plugin/pom.xml 2013-09-17 16:44:09 UTC (rev 1297) @@ -23,15 +23,13 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.7.1-SNAPSHOT</version> + <version>2.7.1</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-plantuml-templates/pom.xml =================================================================== --- trunk/eugene-plantuml-templates/pom.xml 2013-08-15 10:45:40 UTC (rev 1296) +++ trunk/eugene-plantuml-templates/pom.xml 2013-09-17 16:44:09 UTC (rev 1297) @@ -22,15 +22,13 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.7.1-SNAPSHOT</version> + <version>2.7.1</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-yaml-templates/pom.xml =================================================================== --- trunk/eugene-yaml-templates/pom.xml 2013-08-15 10:45:40 UTC (rev 1296) +++ trunk/eugene-yaml-templates/pom.xml 2013-09-17 16:44:09 UTC (rev 1297) @@ -22,15 +22,13 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.7.1-SNAPSHOT</version> + <version>2.7.1</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-08-15 10:45:40 UTC (rev 1296) +++ trunk/pom.xml 2013-09-17 16:44:09 UTC (rev 1297) @@ -22,9 +22,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -34,7 +32,7 @@ </parent> <artifactId>eugene</artifactId> - <version>2.7.1-SNAPSHOT</version> + <version>2.7.1</version> <packaging>pom</packaging> <name>EUGene</name> <description>Efficient Universal Generator</description> @@ -130,11 +128,11 @@ </modules> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.7.1</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/eugene/trunk + scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.7.1 </developerConnection> - <url>http://nuiton.org/projects/eugene/repository/show/trunk</url> + <url>http://nuiton.org/projects/eugene/repository/show/tags/eugene-2.7.1</url> </scm> <distributionManagement> <site> @@ -431,16 +429,14 @@ <phase>pre-site</phase> <configuration> <tasks> - <copy todir="target/site/xsd/v1" verbose="${maven.verbose}" - failonerror="false" overwrite="true"> + <copy todir="target/site/xsd/v1" verbose="${maven.verbose}" failonerror="false" overwrite="true"> <fileset dir="${basedir}/eugene/src/main/resources/xsd"> - <include name="**/*.xsd"/> + <include name="**/*.xsd" /> </fileset> </copy> - <copy todir="target/site/dtd/v1" verbose="${maven.verbose}" - failonerror="false" overwrite="true"> + <copy todir="target/site/dtd/v1" verbose="${maven.verbose}" failonerror="false" overwrite="true"> <fileset dir="${basedir}/eugene/src/main/resources/dtd"> - <include name="**/*.dtd"/> + <include name="**/*.dtd" /> </fileset> </copy> </tasks>

1 0