January 2011 - Jaxx-commits - mailman.cloud.codelutin.com

r2177 - trunk/jaxx-compiler/src/main/java/jaxx/compiler
by tchemit＠users.nuiton.org 26 Jan '11

26 Jan '11

Author: tchemit Date: 2011-01-26 15:39:52 +0100 (Wed, 26 Jan 2011) New Revision: 2177 Url: http://nuiton.org/repositories/revision/jaxx/2177 Log: reformat code Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompilerFinalizer.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompilerFinalizer.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompilerFinalizer.java 2011-01-26 14:38:37 UTC (rev 2176) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompilerFinalizer.java 2011-01-26 14:39:52 UTC (rev 2177) @@ -54,7 +54,11 @@ * @param className the class name of the file to generate * @throws Exception if any pb */ - void finalizeCompiler(CompiledObject root, JAXXCompiler compiler, JavaFile javaFile, String packageName, String className) throws Exception; + void finalizeCompiler(CompiledObject root, + JAXXCompiler compiler, + JavaFile javaFile, + String packageName, + String className) throws Exception; /** * Prepare java file after any compiler finalizer pass, says the last @@ -67,5 +71,9 @@ * @param className the class name of the file to generate * @throws Exception if any pb */ - void prepareJavaFile(CompiledObject root, JAXXCompiler compiler, JavaFile javaFile, String packageName, String className) throws Exception; + void prepareJavaFile(CompiledObject root, + JAXXCompiler compiler, + JavaFile javaFile, + String packageName, + String className) throws Exception; }

1 0

r2176 - trunk/jaxx-compiler/src/main/java/jaxx/compiler/java
by tchemit＠users.nuiton.org 26 Jan '11

26 Jan '11

Author: tchemit Date: 2011-01-26 15:38:37 +0100 (Wed, 26 Jan 2011) New Revision: 2176 Url: http://nuiton.org/repositories/revision/jaxx/2176 Log: Evolution #1236: Can generate annotations on fields or methods Reformat the java package code Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaArgument.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaElement.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaField.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFile.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFileGenerator.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaMethod.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaArgument.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaArgument.java 2011-01-26 14:23:12 UTC (rev 2175) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaArgument.java 2011-01-26 14:38:37 UTC (rev 2176) @@ -33,6 +33,7 @@ public class JavaArgument extends JavaElement { private String type; + private boolean isFinal; /** Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaElement.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaElement.java 2011-01-26 14:23:12 UTC (rev 2175) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaElement.java 2011-01-26 14:38:37 UTC (rev 2176) @@ -28,9 +28,9 @@ import org.apache.commons.collections.CollectionUtils; import java.lang.reflect.Modifier; -import java.util.ArrayList; import java.util.Comparator; -import java.util.List; +import java.util.HashSet; +import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -52,7 +52,7 @@ * * @since 2.3 */ - private List<String> annotations; + private Set<String> annotations; public JavaElement(int modifiers, String name) { this.modifiers = modifiers; @@ -83,9 +83,9 @@ } } - public List<String> getAnnotations() { + public Set<String> getAnnotations() { if (annotations == null) { - annotations = new ArrayList<String>(); + annotations = new HashSet<String>(); } return annotations; } Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaField.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaField.java 2011-01-26 14:23:12 UTC (rev 2175) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaField.java 2011-01-26 14:38:37 UTC (rev 2176) @@ -103,10 +103,6 @@ return override; } -// public void setOverride(boolean override) { -// this.override = override; -// } - public String getInitializer() { return initializer; } @@ -118,39 +114,42 @@ @Override public String toString() { - return super.toString() + " " + getName() + ", type:" + getType() + ", modifiers:" + Modifier.toString(getModifiers()); + return super.toString() + " " + getName() + ", type:" + + getType() + ", modifiers:" + Modifier.toString(getModifiers()); } public enum FieldOrder { - staticsBean(Modifier.STATIC | Modifier.PUBLIC, "Constants for all javaBean properties") { - + staticsBean(Modifier.STATIC | Modifier.PUBLIC, + "Constants for all javaBean properties") { @Override public boolean accept(JavaField field) { return field.getName().startsWith("PROPERTY_"); -// return field.getName().startsWith("PROPERTY_") && Modifier.isPublic(field.getModifiers()); } }, - staticsPublicBindings(Modifier.STATIC | Modifier.PUBLIC, "Constants for all public bindings") { - + staticsPublicBindings(Modifier.STATIC | Modifier.PUBLIC, + "Constants for all public bindings") { @Override public boolean accept(JavaField field) { - return field.getName().startsWith("BINDING_") && Modifier.isPublic(field.getModifiers()); + return field.getName().startsWith("BINDING_") && + Modifier.isPublic(field.getModifiers()); } }, - staticsPrivateBindings(Modifier.STATIC | Modifier.PRIVATE, "Constants for all none public bindings") { - + staticsPrivateBindings(Modifier.STATIC | Modifier.PRIVATE, + "Constants for all none public bindings") { @Override public boolean accept(JavaField field) { - return field.getName().startsWith("BINDING_$") && Modifier.isPrivate(field.getModifiers()); + return field.getName().startsWith("BINDING_$") && + Modifier.isPrivate(field.getModifiers()); } }, staticsOthers(Modifier.STATIC, "Other static fields"), - internalFields(Modifier.PROTECTED | Modifier.PRIVATE, "Internal states") { + internalFields(Modifier.PROTECTED | Modifier.PRIVATE, + "Internal states") { private final List<String> fields = Arrays.asList( "delegateContext", @@ -209,22 +208,30 @@ return o; } } - throw new IllegalArgumentException("could not find a " + FieldOrder.class + " for method " + method); + throw new IllegalArgumentException( + "could not find a " + FieldOrder.class + + " for method " + method); } } public static EnumMap<FieldOrder, List<JavaField>> getSortedFields(List<JavaField> fields) { - EnumMap<FieldOrder, List<JavaField>> result = new EnumMap<FieldOrder, List<JavaField>>(FieldOrder.class); + EnumMap<FieldOrder, List<JavaField>> result = + new EnumMap<FieldOrder, List<JavaField>>(FieldOrder.class); for (FieldOrder fieldOrder : FieldOrder.values()) { result.put(fieldOrder, new ArrayList<JavaField>()); } EnumSet<FieldOrder> allConstants = EnumSet.allOf(FieldOrder.class); List<JavaField> allFields = new ArrayList<JavaField>(fields); - int[] scopes = new int[]{Modifier.STATIC, Modifier.PUBLIC, Modifier.PROTECTED, Modifier.PRIVATE}; + int[] scopes = new int[]{Modifier.STATIC, + Modifier.PUBLIC, + Modifier.PROTECTED, + Modifier.PRIVATE + }; for (int scope : scopes) { - EnumSet<FieldOrder> constants = getFieldOrderScope(allConstants, scope); + EnumSet<FieldOrder> constants = + getFieldOrderScope(allConstants, scope); Iterator<JavaField> itMethods = allFields.iterator(); while (itMethods.hasNext()) { Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFile.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFile.java 2011-01-26 14:23:12 UTC (rev 2175) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFile.java 2011-01-26 14:38:37 UTC (rev 2176) @@ -27,9 +27,15 @@ import jaxx.compiler.types.TypeManager; import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import java.lang.reflect.Modifier; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; /** * A Java source file being generated for output. Once the class is completely initialized, use the @@ -37,30 +43,53 @@ */ public class JavaFile extends JavaElement { + /** Logger */ + static Log log = LogFactory.getLog(JavaFile.class); + protected static final String GETTER_PATTERN = "return %1$s;"; + protected static final String BOOLEAN_GETTER_PATTERN = "return %1$s !=null && %1$s;"; + protected static final String SETTER_PATTERN = "%1$s oldValue = this.%2$s;\nthis.%2$s = newValue;\nfirePropertyChange(%3$s, oldValue, newValue);"; + private Set<String> imports = new HashSet<String>(); + private List<JavaField> fields = new ArrayList<JavaField>(); + private List<JavaMethod> methods = new ArrayList<JavaMethod>(); + private List<JavaFile> innerClasses = new ArrayList<JavaFile>(); + private String superClass; + private List<String> interfaces; + private StringBuffer rawBodyCode = new StringBuffer(); + private boolean superclassIsJAXXObject; + private boolean abstractClass; + private String genericType; + private String superGenericType; public JavaFile() { - super(0, ""); + this(0, ""); } + public JavaFile(int modifiers, String className) { + super(modifiers, className); + } + public JavaFile(int modifiers, String className, String superClass) { this(modifiers, className, superClass, null); } - public JavaFile(int modifiers, String className, String superClass, List<String> interfaces) { + public JavaFile(int modifiers, + String className, + String superClass, + List<String> interfaces) { super(modifiers, className); this.superClass = superClass; this.interfaces = interfaces; @@ -112,36 +141,72 @@ } public void addField(JavaField field) { + addField(field, false); } + public JavaMethod addGetterMethod(String id, + int modifiers, + String type, + boolean overridde, + boolean useOverride) { + + String capitalizedName = StringUtils.capitalize(id); + String methodName = "get" + capitalizedName; + String bodyCode; + if (useOverride) { + bodyCode = "super." + methodName + "()"; + } else { + bodyCode = id; + } + String content = String.format(GETTER_PATTERN, bodyCode); + JavaMethod method = JavaFileGenerator.newMethod(modifiers, + type, + methodName, + content, + overridde + ); + addMethod(method); + return method; + } + public void addField(JavaField field, boolean javaBean) { addSimpleField(field); String id = field.getName(); String capitalizedName = StringUtils.capitalize(id); - // add getter file - String content = String.format(GETTER_PATTERN, id); - addMethod(new JavaMethod( - Modifier.isProtected(field.getModifiers()) ? Modifier.PUBLIC : Modifier.PROTECTED, - field.getType(), "get" + capitalizedName, null, null, content, field.isOverride())); + // add accessor method + int modifiers = Modifier.isProtected(field.getModifiers()) ? + Modifier.PUBLIC : Modifier.PROTECTED; + + addGetterMethod(id, + modifiers, + field.getType(), + field.isOverride(), + false + ); + if (javaBean) { - // add full javabean support accessor + mutator + constante with name of property to make it easier to use - // compute the property constante + // add full javabean support accessor + mutator + constant with + // name of property to make it easier to use + // compute the property constant String constantId = TypeManager.convertVariableNameToConstantName("property" + capitalizedName); addSimpleField(JavaFileGenerator.newField(Modifier.PUBLIC | Modifier.STATIC | Modifier.FINAL, String.class.getSimpleName(), constantId, false, "\"" + id + "\"")); if (Boolean.class.getName().equals(field.getType())) { - content = String.format(BOOLEAN_GETTER_PATTERN, id); + String content = String.format(BOOLEAN_GETTER_PATTERN, id); addMethod(new JavaMethod(Modifier.PUBLIC, field.getType(), "is" + capitalizedName, null, null, content, field.isOverride())); } - content = String.format(SETTER_PATTERN, field.getType(), id, constantId); + String content = String.format(SETTER_PATTERN, field.getType(), id, constantId); JavaArgument arg = new JavaArgument(field.getType(), "newValue"); addMethod(new JavaMethod(Modifier.PUBLIC, "void", "set" + capitalizedName, new JavaArgument[]{arg}, null, content, field.isOverride())); } } public void addSimpleField(JavaField field) { + if (log.isDebugEnabled()) { + log.debug("[" + getName() + "] Add field " + field.getName()); + } fields.add(field); } Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFileGenerator.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFileGenerator.java 2011-01-26 14:23:12 UTC (rev 2175) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFileGenerator.java 2011-01-26 14:38:37 UTC (rev 2176) @@ -29,6 +29,7 @@ import jaxx.compiler.java.JavaMethod.MethodOrder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.StringUtil; import java.io.PrintWriter; import java.util.Arrays; @@ -48,20 +49,57 @@ /** Logger */ static private final Log log = LogFactory.getLog(JavaFileGenerator.class); - public static JavaField newField(int modifiers, String returnType, String name, boolean override) { + public static JavaField newField(int modifiers, + String returnType, + String name, + boolean override) { return newField(modifiers, returnType, name, override, null); } - public static JavaField newField(int modifiers, String returnType, String name, boolean override, String initializer) { - return new JavaField(modifiers, returnType, name, override, initializer); + public static JavaField newField(int modifiers, + String returnType, + String name, + boolean override, + String initializer) { + return new JavaField(modifiers, + returnType, + name, + override, + initializer + ); } - public static JavaMethod newMethod(int modifiers, String returnType, String name, String initializer, boolean override, String[] exceptions, JavaArgument... arguments) { - return new JavaMethod(modifiers, returnType, name, arguments, exceptions, initializer, override); + public static JavaMethod newMethod(int modifiers, + String returnType, + String name, + String initializer, + boolean override, + String[] exceptions, + JavaArgument... arguments) { + return new JavaMethod(modifiers, + returnType, + name, + arguments, + exceptions, + initializer, + override + ); } - public static JavaMethod newMethod(int modifiers, String returnType, String name, String initializer, boolean override, JavaArgument... arguments) { - return newMethod(modifiers, returnType, name, initializer, override, new String[0], arguments); + public static JavaMethod newMethod(int modifiers, + String returnType, + String name, + String initializer, + boolean override, + JavaArgument... arguments) { + return newMethod(modifiers, + returnType, + name, + initializer, + override, + StringUtil.EMPTY_STRING_ARRAY, + arguments + ); } public static String getHeader(String header) { @@ -77,7 +115,9 @@ String eol = JAXXCompiler.getLineSeparator(); - return all + eol + "/*--" + new String(prefix) + " " + header + " " + new String(prefix) + "--*/" + eol + all + eol; + return all + eol + "/*--" + new String(prefix) + + " " + header + " " + new String(prefix) + "--*/" + eol + all + + eol; } /** End of line */ @@ -99,12 +139,15 @@ } public void generateFile(JavaFile f, PrintWriter result) { + String name = f.getName(); if (verbose) { - log.info(f.getName()); + log.info(name); } indentationLevel = 0; - if (f.getName().indexOf(".") != -1) { - result.append("package ").append(f.getName().substring(0, f.getName().lastIndexOf("."))).append(";"); + if (name.contains(".")) { + result.append("package "); + result.append(name.substring(0, name.lastIndexOf("."))); + result.append(";"); result.append(eol).append(eol); } String[] imports = f.getImports(); @@ -119,10 +162,10 @@ } public String generateClass(JavaFile f) { - if (verbose) { log.info(f.getName()); } + StringBuffer result = new StringBuffer(); String genericType = f.getGenericType(); @@ -156,8 +199,11 @@ if (!fields.isEmpty()) { - EnumMap<JavaField.FieldOrder, List<JavaField>> map = JavaField.getSortedFields(fields); - for (Entry<JavaField.FieldOrder, List<JavaField>> entry : map.entrySet()) { + EnumMap<JavaField.FieldOrder, List<JavaField>> map = + JavaField.getSortedFields(fields); + for (Entry<JavaField.FieldOrder, List<JavaField>> entry : + map.entrySet()) { + List<JavaField> list = entry.getValue(); // sort fields @@ -166,7 +212,11 @@ if (!list.isEmpty()) { // add field group header - result.append(eol).append(addIndentation(entry.getKey().getHeader(), 4, eol)).append(eol).append(eol); + result.append(eol); + result.append( + addIndentation(entry.getKey().getHeader(), 4, eol)); + result.append(eol); + result.append(eol); // add all fields of group for (JavaField method : list) { @@ -185,7 +235,9 @@ StringBuffer rawBodyCode = f.getRawBodyCode(); if (rawBodyCode.length() > 0) { - result.append(addIndentation(getHeader("Raw body code from script"), 4, eol)).append(eol); + result.append(addIndentation( + getHeader("Raw body code from script"), 4, eol)); + result.append(eol); String s = rawBodyCode.toString(); if (!s.startsWith(eol)) { result.append(eol); @@ -200,7 +252,9 @@ indentationLevel += 4; try { String txt = generateClass(innerClass); - result.append(addIndentation(txt, 4, eol)).append(eol).append(eol); + result.append(addIndentation(txt, 4, eol)); + result.append(eol); + result.append(eol); } finally { indentationLevel -= 4; } @@ -208,7 +262,8 @@ // generate methods - EnumMap<MethodOrder, List<JavaMethod>> map = JavaMethod.getSortedMethods(f.getMethods()); + EnumMap<MethodOrder, List<JavaMethod>> map = + JavaMethod.getSortedMethods(f.getMethods()); for (Entry<MethodOrder, List<JavaMethod>> entry : map.entrySet()) { List<JavaMethod> list = entry.getValue(); if (!list.isEmpty()) { @@ -217,12 +272,16 @@ Collections.sort(list); // add method group header - result.append(addIndentation(entry.getKey().getHeader(), 4, eol)).append(eol).append(eol); + result.append(addIndentation(entry.getKey().getHeader(), 4, eol)); + result.append(eol); + result.append(eol); // add all methods of group for (JavaMethod method : list) { String txt = generateMethod(method); - result.append(addIndentation(txt, 4, eol)).append(eol).append(eol); + result.append(addIndentation(txt, 4, eol)); + result.append(eol); + result.append(eol); } } list.clear(); @@ -269,8 +328,9 @@ StringBuffer result = new StringBuffer(); if (m.isOverride()) { - result.append("@Override").append(eol); + m.addAnnotation(Override.class.getSimpleName()); } + generateAnnotations(m, result, eol); result.append(m.getModifiersText()); if (m.getReturnType() != null) { result.append(m.getReturnType()); @@ -322,11 +382,20 @@ return argument.isFinal() ? "final " + result : result; } - public String addIndentation(String source, int indentation, String lineSeparator) { - return indent(source, indentationLevel + indentation, false, lineSeparator); + public String addIndentation(String source, + int indentation, + String lineSeparator) { + return indent(source, + indentationLevel + indentation, + false, + lineSeparator + ); } - public static String indent(String source, int indentation, boolean trim, String lineSeparator) { + public static String indent(String source, + int indentation, + boolean trim, + String lineSeparator) { if (trim) { source = source.trim(); } Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaMethod.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaMethod.java 2011-01-26 14:23:12 UTC (rev 2175) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaMethod.java 2011-01-26 14:38:37 UTC (rev 2176) @@ -26,7 +26,13 @@ package jaxx.compiler.java; import java.lang.reflect.Modifier; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.EnumMap; +import java.util.EnumSet; +import java.util.Iterator; +import java.util.List; /** * Represents a method in a Java source file being generated for output. <code>JavaMethods</code> are created @@ -36,25 +42,19 @@ */ public class JavaMethod extends JavaElement implements Comparable<JavaMethod> { - /** - * return type of the method (null for constructors) - */ + /** return type of the method (null for constructors) */ private String returnType; - /** - * arguments of the method (can be empty) - */ + + /** arguments of the method (can be empty) */ private JavaArgument[] arguments; - /** - * exceptions thrown by the method( can be empty) - */ + + /** exceptions thrown by the method( can be empty) */ private String[] exceptions; - /** - * body of the mehotd (can be empty) - */ + + /** body of the mehotd (can be empty) */ private String body; - /** - * flag to known if the method overrids a super-method - */ + + /** flag to known if the method overrids a super-method */ private boolean override; /** @@ -71,7 +71,13 @@ * @param bodyCode Java source code which should appear in the method body * @param override flag with {@code true} value when the method overrides (or implements) a super class method */ - public JavaMethod(int modifiers, String returnType, String name, JavaArgument[] arguments, String[] exceptions, String bodyCode, boolean override) { + public JavaMethod(int modifiers, + String returnType, + String name, + JavaArgument[] arguments, + String[] exceptions, + String bodyCode, + boolean override) { super(modifiers, name); this.returnType = returnType; this.override = override; @@ -81,7 +87,8 @@ } /** - * Returns the method's return type, as it would be represented in Java source code. + * Returns the method's return type, as it would be represented + * in Java source code. * * @return the method's return type */ @@ -125,7 +132,6 @@ statics(Modifier.STATIC, "Statics methods"), constructors(Modifier.PUBLIC, "Constructors") { - @Override public boolean accept(JavaMethod method) { return method.returnType == null; @@ -164,7 +170,8 @@ }, JAXXValidation(Modifier.PUBLIC, "JAXXValidation implementation") { - private final List<String> methods = Arrays.asList("getValidator", "getValidatorIds"); + private final List<String> methods = + Arrays.asList("getValidator", "getValidatorIds"); @Override public boolean accept(JavaMethod method) { @@ -172,44 +179,44 @@ } }, events(Modifier.PUBLIC, "Event methods") { - @Override public boolean accept(JavaMethod method) { - return method.getName().startsWith("do") && method.getName().contains("__"); + return method.getName().startsWith("do") && + method.getName().contains("__"); } }, publicGetters(Modifier.PUBLIC, "Public acessor methods") { - @Override public boolean accept(JavaMethod method) { - return method.getName().startsWith("get") || method.getName().startsWith("is"); + return method.getName().startsWith("get") || + method.getName().startsWith("is"); } }, publicSetters(Modifier.PUBLIC, "Public mutator methods") { - @Override public boolean accept(JavaMethod method) { return method.getName().startsWith("set"); } }, otherPublic(Modifier.PUBLIC, "Public mutator methods") { - @Override public boolean accept(int mod) { return super.accept(mod) && !Modifier.isStatic(mod); } }, protectedGetters(Modifier.PROTECTED, "Protected acessors methods") { - @Override public boolean accept(JavaMethod method) { - return method.getName().startsWith("get") || method.getName().startsWith("is"); + return method.getName().startsWith("get") || + method.getName().startsWith("is"); } }, - createMethod(Modifier.PROTECTED | Modifier.PRIVATE, "Components creation methods") { + createMethod(Modifier.PROTECTED | Modifier.PRIVATE, + "Components creation methods") { @Override public boolean accept(JavaMethod method) { - return method.getName().startsWith("create") || method.getName().startsWith("add"); + return method.getName().startsWith("create") || + method.getName().startsWith("add"); } }, internalMethod(Modifier.PRIVATE, "Internal jaxx methods") { @@ -217,6 +224,7 @@ "$completeSetup", "$registerDefaultBindings", "$initialize"); + @Override public boolean accept(JavaMethod method) { return methods.contains(method.getName()); @@ -225,14 +233,17 @@ protecteds(Modifier.PROTECTED, "Other protected methods") { }, packageLocal(0, "Package methods") { - @Override public boolean accept(int mod) { - return !Modifier.isStatic(mod) && !Modifier.isPublic(mod) && !Modifier.isProtected(mod); + return !Modifier.isStatic(mod) && + !Modifier.isPublic(mod) && + !Modifier.isProtected(mod); } }, privates(Modifier.PRIVATE, "Other private methods"); + private final String header; + private int modifier; MethodOrder(int modifier, String header) { @@ -262,22 +273,30 @@ return o; } } - throw new IllegalArgumentException("could not find a " + MethodOrder.class + " for method " + method); + throw new IllegalArgumentException( + "could not find a " + MethodOrder.class + + " for method " + method); } } public static EnumMap<MethodOrder, List<JavaMethod>> getSortedMethods(List<JavaMethod> methods) { - EnumMap<MethodOrder, List<JavaMethod>> result = new EnumMap<MethodOrder, List<JavaMethod>>(MethodOrder.class); + EnumMap<MethodOrder, List<JavaMethod>> result = + new EnumMap<MethodOrder, List<JavaMethod>>(MethodOrder.class); for (MethodOrder methodOrder : MethodOrder.values()) { result.put(methodOrder, new ArrayList<JavaMethod>()); } EnumSet<MethodOrder> allConstants = EnumSet.allOf(MethodOrder.class); List<JavaMethod> allMethods = new ArrayList<JavaMethod>(methods); - int[] scopes = new int[]{Modifier.STATIC, Modifier.PUBLIC, Modifier.PROTECTED, Modifier.PRIVATE}; + int[] scopes = new int[]{Modifier.STATIC, + Modifier.PUBLIC, + Modifier.PROTECTED, + Modifier.PRIVATE + }; for (int scope : scopes) { - EnumSet<MethodOrder> constants = getMethodOrderScope(allConstants, scope); + EnumSet<MethodOrder> constants = + getMethodOrderScope(allConstants, scope); Iterator<JavaMethod> itMethods = allMethods.iterator(); while (itMethods.hasNext()) { @@ -294,7 +313,9 @@ } if (!allMethods.isEmpty()) { - throw new IllegalArgumentException("could not find a " + MethodOrder.class + " for method " + allMethods); + throw new IllegalArgumentException( + "could not find a " + MethodOrder.class + + " for method " + allMethods); } for (MethodOrder methodOrder : MethodOrder.values()) {

1 0

r2175 - trunk/jaxx-compiler/src/main/java/jaxx/compiler
by tchemit＠users.nuiton.org 26 Jan '11

26 Jan '11

Author: tchemit Date: 2011-01-26 15:23:12 +0100 (Wed, 26 Jan 2011) New Revision: 2175 Url: http://nuiton.org/repositories/revision/jaxx/2175 Log: let have since the beginning full informations of the javaFile to generate Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java 2011-01-26 14:22:12 UTC (rev 2174) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java 2011-01-26 14:23:12 UTC (rev 2175) @@ -1475,7 +1475,17 @@ public JavaFile getJavaFile() { if (javaFile == null) { - javaFile = new JavaFile(); + String outputClassName = getOutputClassName(); + if (outputClassName == null) { + javaFile = new JavaFile(); + } else { + int dotPos = outputClassName.lastIndexOf("."); + String packageName = dotPos != -1 ? + outputClassName.substring(0, dotPos) : null; + String simpleClassName = outputClassName.substring(dotPos + 1); + + javaFile = new JavaFile(0, packageName + "." + simpleClassName); + } } return javaFile; }

1 0

r2174 - trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing
by tchemit＠users.nuiton.org 26 Jan '11

26 Jan '11

Author: tchemit Date: 2011-01-26 15:22:12 +0100 (Wed, 26 Jan 2011) New Revision: 2174 Url: http://nuiton.org/repositories/revision/jaxx/2174 Log: reformat code Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/TableHandler.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/TableHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/TableHandler.java 2011-01-26 14:14:52 UTC (rev 2173) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/TableHandler.java 2011-01-26 14:22:12 UTC (rev 2174) @@ -50,15 +50,32 @@ } @Override - public void setAttribute(CompiledObject object, String propertyName, String stringValue, boolean inline, JAXXCompiler compiler) throws CompilerException { + public void setAttribute(CompiledObject object, + String propertyName, + String stringValue, + boolean inline, + JAXXCompiler compiler) throws CompilerException { try { if (object instanceof CompiledTable) { - CellHandler.setAttribute(((CompiledTable) object).getTableConstraints(), propertyName, stringValue); + CellHandler.setAttribute( + ((CompiledTable) object).getTableConstraints(), + propertyName, + stringValue + ); } else { - super.setAttribute(object, propertyName, stringValue, inline, compiler); + super.setAttribute(object, + propertyName, + stringValue, + inline, + compiler); } } catch (UnsupportedAttributeException e) { - super.setAttribute(object, propertyName, stringValue, inline, compiler); + super.setAttribute(object, + propertyName, + stringValue, + inline, + compiler + ); } } @@ -70,7 +87,9 @@ private GridBagConstraints cellConstraints; private boolean emptyCell; - public CompiledTable(String id, ClassDescriptor objectClass, JAXXCompiler compiler) throws CompilerException { + public CompiledTable(String id, + ClassDescriptor objectClass, + JAXXCompiler compiler) throws CompilerException { super(id, objectClass, compiler); tableConstraints = new GridBagConstraints(); tableConstraints.gridx = -1; @@ -79,7 +98,9 @@ } @Override - public void addChild(CompiledObject child, String constraints, JAXXCompiler compiler) throws CompilerException { + public void addChild(CompiledObject child, + String constraints, + JAXXCompiler compiler) throws CompilerException { if (constraints != null) { compiler.reportError("Table does not accept constraints"); } @@ -89,7 +110,8 @@ return; } if (!emptyCell) { - compiler.reportError("Table cells may only have one child component"); + compiler.reportError( + "Table cells may only have one child component"); } while (rowSpans.size() < c.gridx + c.gridwidth) { rowSpans.add(null); @@ -131,7 +153,8 @@ public void newCell() { emptyCell = true; rowConstraints.gridx++; - while (rowConstraints.gridx < rowSpans.size() && rowSpans.get(rowConstraints.gridx) > 0) { + while (rowConstraints.gridx < rowSpans.size() && + rowSpans.get(rowConstraints.gridx) > 0) { rowConstraints.gridx++; } cellConstraints = (GridBagConstraints) rowConstraints.clone(); @@ -139,7 +162,8 @@ } @Override - public CompiledObject createCompiledObject(String id, JAXXCompiler compiler) throws CompilerException { + public CompiledObject createCompiledObject(String id, + JAXXCompiler compiler) throws CompilerException { return new CompiledTable(id, getBeanClass(), compiler); } }

1 0

r2173 - in trunk: jaxx-compiler/src/main/java/jaxx/compiler maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin
by tchemit＠users.nuiton.org 26 Jan '11

26 Jan '11

Author: tchemit Date: 2011-01-26 15:14:52 +0100 (Wed, 26 Jan 2011) New Revision: 2173 Url: http://nuiton.org/repositories/revision/jaxx/2173 Log: Evolution #1250: Deprecate the validatorFQN in mojo Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompilerConfiguration.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/DefaultCompilerConfiguration.java trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompilerConfiguration.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompilerConfiguration.java 2011-01-26 14:12:03 UTC (rev 2172) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompilerConfiguration.java 2011-01-26 14:14:52 UTC (rev 2173) @@ -98,7 +98,9 @@ */ File getTargetDirectory(); - /** @return the type of validator to use */ + /** @return the type of validator to use. + * @deprecated since 2.3, will not be replaced since new validator api does not support it.*/ + @Deprecated Class<?> getValidatorClass(); /** @return {@code true} if a logger must add on each generated jaxx object */ Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/DefaultCompilerConfiguration.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/DefaultCompilerConfiguration.java 2011-01-26 14:12:03 UTC (rev 2172) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/DefaultCompilerConfiguration.java 2011-01-26 14:14:52 UTC (rev 2173) @@ -90,7 +90,10 @@ * the validator class to use. * * @since 1.6.0 + * @deprecated since 2.3, will not be replaced, since new validator api + * does not support it. */ + @Deprecated private Class<?> validatorClass; /** Modified: trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java =================================================================== --- trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java 2011-01-26 14:12:03 UTC (rev 2172) +++ trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java 2011-01-26 14:14:52 UTC (rev 2173) @@ -39,6 +39,7 @@ import jaxx.runtime.JAXXContext; import jaxx.runtime.JAXXObject; import jaxx.runtime.swing.help.JAXXHelpBroker; +import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; import org.apache.maven.plugin.MojoExecutionException; @@ -105,10 +106,16 @@ protected String compilerFQN; /** - * Le compilateur à utiliser (par défaut celui de Swing) + * Le compilateur à utiliser (par défaut celui de Swing). + * <p/> + * Ce paramètre n'est plus utilisable et ne sera pas pris en compte + * par le compilateur JAXX. * - * @parameter expression="${jaxx.validatorFQN}" default-value="jaxx.runtime.validator.swing.SwingValidator" + * @parameter expression="${jaxx.validatorFQN}" + * @deprecated since 2.3, will not be replaced, using the new api of validator + * does not support it */ + @Deprecated protected String validatorFQN; /** @@ -322,7 +329,7 @@ private Class<?> defaultErrorUIClass; /** type of validator to use */ - private Class<?> validatorClass; + private final Class<?> validatorClass = SwingValidator.class; /** type of {@link CompiledObjectDecorator} to use */ private Class<? extends CompiledObjectDecorator> defaultDecoratorClass; @@ -454,7 +461,7 @@ "jaxxContextFQN must be an implementation of " + JAXXContext.class + " but was : " + jaxxContextClass); } - validatorClass = Class.forName(validatorFQN, false, cl); +// validatorClass = Class.forName(validatorFQN, false, cl); if (defaultErrorUIFQN != null && !defaultErrorUIFQN.trim().isEmpty()) { defaultErrorUIClass = Class.forName(defaultErrorUIFQN, false, cl);

1 0

r2172 - in trunk: jaxx-compiler/src/license jaxx-demo/src/license jaxx-runtime/src/license jaxx-tutorial-config/src/license jaxx-tutorial-validation/src/license jaxx-validator/src/license maven-jaxx-plugin/src/license
by tchemit＠users.nuiton.org 26 Jan '11

26 Jan '11

Author: tchemit Date: 2011-01-26 15:12:03 +0100 (Wed, 26 Jan 2011) New Revision: 2172 Url: http://nuiton.org/repositories/revision/jaxx/2172 Log: optimize licenses Modified: trunk/jaxx-compiler/src/license/THIRD-PARTY.properties trunk/jaxx-demo/src/license/THIRD-PARTY.properties trunk/jaxx-runtime/src/license/THIRD-PARTY.properties trunk/jaxx-tutorial-config/src/license/THIRD-PARTY.properties trunk/jaxx-tutorial-validation/src/license/THIRD-PARTY.properties trunk/jaxx-validator/src/license/THIRD-PARTY.properties trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties Modified: trunk/jaxx-compiler/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-compiler/src/license/THIRD-PARTY.properties 2011-01-26 14:08:32 UTC (rev 2171) +++ trunk/jaxx-compiler/src/license/THIRD-PARTY.properties 2011-01-26 14:12:03 UTC (rev 2172) @@ -7,12 +7,12 @@ # - Lesser General Public License (LGPL) v 3.0 # - Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 # - The Apache Software License, Version 2.0 -# - The OpenSymphony Software License 1.1 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Nov 19 08:51:16 CET 2010 +#Wed Jan 26 14:10:41 CET 2011 commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 javax.help--javahelp--2.0.02--jar=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 -opensymphony--ognl--2.6.11--jar=The OpenSymphony Software License 1.1 +javassist--javassist--3.8.0.GA--jar=Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) +ognl--ognl--3.0--jar=The OpenSymphony Software License 1.1 \ No newline at end of file Modified: trunk/jaxx-demo/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-demo/src/license/THIRD-PARTY.properties 2011-01-26 14:08:32 UTC (rev 2171) +++ trunk/jaxx-demo/src/license/THIRD-PARTY.properties 2011-01-26 14:12:03 UTC (rev 2172) @@ -7,13 +7,13 @@ # - Lesser General Public License (LGPL) v 3.0 # - Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 # - The Apache Software License, Version 2.0 -# - The OpenSymphony Software License 1.1 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Wed Dec 01 14:20:51 CET 2010 +#Wed Jan 26 15:09:36 CET 2011 commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 javax.help--javahelp--2.0.02--jar=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 -opensymphony--ognl--2.6.11--jar=The OpenSymphony Software License 1.1 org.nuiton.thirdparty--rsyntaxtextarea--1.4.1--jar=Lesser General Public License (LGPL) v 3.0 +javassist--javassist--3.8.0.GA--jar=Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) +ognl--ognl--3.0--jar=The OpenSymphony Software License 1.1 \ No newline at end of file Modified: trunk/jaxx-runtime/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-runtime/src/license/THIRD-PARTY.properties 2011-01-26 14:08:32 UTC (rev 2171) +++ trunk/jaxx-runtime/src/license/THIRD-PARTY.properties 2011-01-26 14:12:03 UTC (rev 2172) @@ -11,7 +11,6 @@ # Please fill the missing licenses for dependencies : # # -#Thu Dec 30 09:12:03 CET 2010 +#Wed Jan 26 14:08:30 CET 2011 commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 javax.help--javahelp--2.0.02--jar=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 -opensymphony--ognl--2.6.11--jar=The OpenSymphony Software License 1.1 Modified: trunk/jaxx-tutorial-config/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-tutorial-config/src/license/THIRD-PARTY.properties 2011-01-26 14:08:32 UTC (rev 2171) +++ trunk/jaxx-tutorial-config/src/license/THIRD-PARTY.properties 2011-01-26 14:12:03 UTC (rev 2172) @@ -6,12 +6,10 @@ # - Lesser General Public License (LGPL) v 3.0 # - Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 # - The Apache Software License, Version 2.0 -# - The OpenSymphony Software License 1.1 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Dec 30 09:35:11 CET 2010 +#Wed Jan 26 14:12:47 CET 2011 commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 javax.help--javahelp--2.0.02--jar=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 -opensymphony--ognl--2.6.11--jar=The OpenSymphony Software License 1.1 Modified: trunk/jaxx-tutorial-validation/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-tutorial-validation/src/license/THIRD-PARTY.properties 2011-01-26 14:08:32 UTC (rev 2171) +++ trunk/jaxx-tutorial-validation/src/license/THIRD-PARTY.properties 2011-01-26 14:12:03 UTC (rev 2172) @@ -6,12 +6,12 @@ # - Lesser General Public License (LGPL) v 3.0 # - Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 # - The Apache Software License, Version 2.0 -# - The OpenSymphony Software License 1.1 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Dec 30 09:35:11 CET 2010 +#Wed Jan 26 14:12:49 CET 2011 commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 javax.help--javahelp--2.0.02--jar=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 -opensymphony--ognl--2.6.11--jar=The OpenSymphony Software License 1.1 +javassist--javassist--3.8.0.GA--jar=Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) +ognl--ognl--3.0--jar=The OpenSymphony Software License 1.1 \ No newline at end of file Modified: trunk/jaxx-validator/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-validator/src/license/THIRD-PARTY.properties 2011-01-26 14:08:32 UTC (rev 2171) +++ trunk/jaxx-validator/src/license/THIRD-PARTY.properties 2011-01-26 14:12:03 UTC (rev 2172) @@ -6,11 +6,11 @@ # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 # - The Apache Software License, Version 2.0 -# - The OpenSymphony Software License 1.1 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Dec 30 09:17:22 CET 2010 +#Wed Jan 26 14:09:48 CET 2011 commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -opensymphony--ognl--2.6.11--jar=The OpenSymphony Software License 1.1 +javassist--javassist--3.8.0.GA--jar=Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) +ognl--ognl--3.0--jar=The OpenSymphony Software License 1.1 Modified: trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties =================================================================== --- trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties 2011-01-26 14:08:32 UTC (rev 2171) +++ trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties 2011-01-26 14:12:03 UTC (rev 2172) @@ -8,18 +8,18 @@ # - Public Domain # - Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 # - The Apache Software License, Version 2.0 -# - The OpenSymphony Software License 1.1 # - http://classworlds.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Nov 19 08:51:42 CET 2010 +#Wed Jan 26 14:11:32 CET 2011 classworlds--classworlds--1.1-alpha-2--jar=http\://classworlds.codehaus.org… commons-cli--commons-cli--1.0--jar=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 javax.help--javahelp--2.0.02--jar=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 -opensymphony--ognl--2.6.11--jar=The OpenSymphony Software License 1.1 org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1--jar=The Apache Software License, Version 2.0 org.codehaus.plexus--plexus-interactivity-api--1.0-alpha-4--jar=The Apache Software License, Version 2.0 oro--oro--2.0.8--jar=The Apache Software License, Version 2.0 +javassist--javassist--3.8.0.GA--jar=Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) +ognl--ognl--3.0--jar=The OpenSymphony Software License 1.1 \ No newline at end of file

1 0

r2171 - in trunk/jaxx-validator/src/test: java/jaxx resources
by tchemit＠users.nuiton.org 26 Jan '11

26 Jan '11

Author: tchemit Date: 2011-01-26 15:08:32 +0100 (Wed, 26 Jan 2011) New Revision: 2171 Url: http://nuiton.org/repositories/revision/jaxx/2171 Log: delete tests of validators Removed: trunk/jaxx-validator/src/test/java/jaxx/runtime/ Modified: trunk/jaxx-validator/src/test/resources/validators.xml Modified: trunk/jaxx-validator/src/test/resources/validators.xml =================================================================== --- trunk/jaxx-validator/src/test/resources/validators.xml 2011-01-26 14:07:26 UTC (rev 2170) +++ trunk/jaxx-validator/src/test/resources/validators.xml 2011-01-26 14:08:32 UTC (rev 2171) @@ -50,13 +50,13 @@  <validator name="collectionFieldExpression" - class="jaxx.runtime.validator.field.CollectionFieldExpressionValidator"/> - <validator name="collectionUniqueKey" class="jaxx.runtime.validator.field.CollectionUniqueKeyValidator"/> - <validator name="requiredFile" class="jaxx.runtime.validator.field.RequiredFileFieldValidator"/> - <validator name="existingFile" class="jaxx.runtime.validator.field.ExistingFileFieldValidator"/> - <validator name="notExistingFile" class="jaxx.runtime.validator.field.NotExistingFileFieldValidator"/> - <validator name="existingDirectory" class="jaxx.runtime.validator.field.ExistingDirectoryFieldValidator"/> - <validator name="notExistingDirectory" class="jaxx.runtime.validator.field.NotExistingDirectoryFieldValidator"/> - <validator name="fieldexpressionwithparams" class="jaxx.runtime.validator.field.FieldExpressionWithParamsValidator"/> + class="org.nuiton.validator.xwork2.field.CollectionFieldExpressionValidator"/> + <validator name="collectionUniqueKey" class="org.nuiton.validator.xwork2.field.CollectionUniqueKeyValidator"/> + <validator name="requiredFile" class="org.nuiton.validator.xwork2.field.RequiredFileFieldValidator"/> + <validator name="existingFile" class="org.nuiton.validator.xwork2.field.ExistingFileFieldValidator"/> + <validator name="notExistingFile" class="org.nuiton.validator.xwork2.field.NotExistingFileFieldValidator"/> + <validator name="existingDirectory" class="org.nuiton.validator.xwork2.field.ExistingDirectoryFieldValidator"/> + <validator name="notExistingDirectory" class="org.nuiton.validator.xwork2.field.NotExistingDirectoryFieldValidator"/> + <validator name="fieldexpressionwithparams" class="org.nuiton.validator.xwork2.field.FieldExpressionWithParamsValidator"/> </validators> \ No newline at end of file

1 0

r2170 - in trunk: . jaxx-demo jaxx-tutorial jaxx-tutorial-css jaxx-tutorial-databinding jaxx-tutorial-helloworld jaxx-tutorial-helloworld2 jaxx-validator jaxx-widgets maven-jaxx-plugin
by tchemit＠users.nuiton.org 26 Jan '11

26 Jan '11

Author: tchemit Date: 2011-01-26 15:07:26 +0100 (Wed, 26 Jan 2011) New Revision: 2170 Url: http://nuiton.org/repositories/revision/jaxx/2170 Log: clean poms : optimize dependencies + pass to level 1.6 all tutorials Modified: trunk/jaxx-demo/pom.xml trunk/jaxx-tutorial-css/pom.xml trunk/jaxx-tutorial-databinding/pom.xml trunk/jaxx-tutorial-helloworld/pom.xml trunk/jaxx-tutorial-helloworld2/pom.xml trunk/jaxx-tutorial/pom.xml trunk/jaxx-validator/pom.xml trunk/jaxx-widgets/pom.xml trunk/maven-jaxx-plugin/pom.xml trunk/pom.xml Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2011-01-26 14:05:44 UTC (rev 2169) +++ trunk/jaxx-demo/pom.xml 2011-01-26 14:07:26 UTC (rev 2170) @@ -183,7 +183,6 @@ <configuration> <archive> <manifest> -  <useUniqueVersions>false</useUniqueVersions> <addClasspath>true</addClasspath> <classpathPrefix>./lib/</classpathPrefix> Modified: trunk/jaxx-tutorial/pom.xml =================================================================== --- trunk/jaxx-tutorial/pom.xml 2011-01-26 14:05:44 UTC (rev 2169) +++ trunk/jaxx-tutorial/pom.xml 2011-01-26 14:07:26 UTC (rev 2170) @@ -112,7 +112,7 @@ <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> - <version>2.1</version> + <version>2.2</version> </plugin> </plugins> Modified: trunk/jaxx-tutorial-css/pom.xml =================================================================== --- trunk/jaxx-tutorial-css/pom.xml 2011-01-26 14:05:44 UTC (rev 2169) +++ trunk/jaxx-tutorial-css/pom.xml 2011-01-26 14:07:26 UTC (rev 2170) @@ -56,8 +56,8 @@  - <maven.compiler.source>1.5</maven.compiler.source> - <maven.compiler.source>1.5</maven.compiler.source> + <maven.compiler.source>1.6</maven.compiler.source> + <maven.compiler.source>1.6</maven.compiler.source>  Modified: trunk/jaxx-tutorial-databinding/pom.xml =================================================================== --- trunk/jaxx-tutorial-databinding/pom.xml 2011-01-26 14:05:44 UTC (rev 2169) +++ trunk/jaxx-tutorial-databinding/pom.xml 2011-01-26 14:07:26 UTC (rev 2170) @@ -61,8 +61,8 @@  - <maven.compiler.source>1.5</maven.compiler.source> - <maven.compiler.source>1.5</maven.compiler.source> + <maven.compiler.source>1.6</maven.compiler.source> + <maven.compiler.source>1.6</maven.compiler.source>  Modified: trunk/jaxx-tutorial-helloworld/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld/pom.xml 2011-01-26 14:05:44 UTC (rev 2169) +++ trunk/jaxx-tutorial-helloworld/pom.xml 2011-01-26 14:07:26 UTC (rev 2170) @@ -68,8 +68,8 @@  - <maven.compiler.source>1.5</maven.compiler.source> - <maven.compiler.source>1.5</maven.compiler.source> + <maven.compiler.source>1.6</maven.compiler.source> + <maven.compiler.source>1.6</maven.compiler.source>  Modified: trunk/jaxx-tutorial-helloworld2/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld2/pom.xml 2011-01-26 14:05:44 UTC (rev 2169) +++ trunk/jaxx-tutorial-helloworld2/pom.xml 2011-01-26 14:07:26 UTC (rev 2170) @@ -67,8 +67,8 @@  - <maven.compiler.source>1.5</maven.compiler.source> - <maven.compiler.source>1.5</maven.compiler.source> + <maven.compiler.source>1.6</maven.compiler.source> + <maven.compiler.source>1.6</maven.compiler.source>  Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2011-01-26 14:05:44 UTC (rev 2169) +++ trunk/jaxx-validator/pom.xml 2011-01-26 14:07:26 UTC (rev 2170) @@ -72,11 +72,6 @@ </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> @@ -86,14 +81,7 @@ <artifactId>jxlayer</artifactId> </dependency> -  - <dependency> - <groupId>com.opensymphony</groupId> - <artifactId>xwork</artifactId> - </dependency> - - <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <scope>test</scope> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2011-01-26 14:05:44 UTC (rev 2169) +++ trunk/jaxx-widgets/pom.xml 2011-01-26 14:07:26 UTC (rev 2170) @@ -126,13 +126,6 @@ <build> <resources> -  -  <resource> <directory>src/main/resources</directory> <includes> Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2011-01-26 14:05:44 UTC (rev 2169) +++ trunk/maven-jaxx-plugin/pom.xml 2011-01-26 14:07:26 UTC (rev 2170) @@ -63,12 +63,6 @@ <version>${project.version}</version> </dependency> -  -  <dependency> @@ -112,7 +106,6 @@ <dependency> <groupId>com.sun</groupId> <artifactId>dt</artifactId> -  <scope>system</scope> <systemPath>/${java.home}/../lib/dt.jar</systemPath> </dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-26 14:05:44 UTC (rev 2169) +++ trunk/pom.xml 2011-01-26 14:07:26 UTC (rev 2170) @@ -263,20 +263,6 @@ <scope>provided</scope> </dependency> -  - - <dependency> - <groupId>com.opensymphony</groupId> - <artifactId>xwork</artifactId> - <version>2.1.3</version> - <exclusions> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - </exclusion> - </exclusions> - </dependency> -  <dependency> <groupId>org.nuiton.thirdparty</groupId> @@ -299,17 +285,6 @@ <scope>compile</scope> </dependency> -  - -  - <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-velocity</artifactId> @@ -330,12 +305,6 @@ </exclusions> </dependency> -  - <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-verifier</artifactId> @@ -375,12 +344,6 @@ <artifactId>maven-reporting-api</artifactId> </exclusion> -  - </exclusions> </dependency> @@ -423,12 +386,10 @@  <projectId>jaxx</projectId> - <nuitonUtilsVersion>2.0-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>2.0</nuitonUtilsVersion> <nuitonI18nVersion>2.2</nuitonI18nVersion> - - + <xworkVersion>2.2.1.1</xworkVersion> <jxLayerVersion>3.0.3</jxLayerVersion> - <javaHelpVersion>2.0.02</javaHelpVersion> </properties>

1 0

r2169 - in trunk/jaxx-validator/src: main/java/jaxx/runtime/validator test/resources/jaxx/runtime
by tchemit＠users.nuiton.org 26 Jan '11

26 Jan '11

Author: tchemit Date: 2011-01-26 15:05:44 +0100 (Wed, 26 Jan 2011) New Revision: 2169 Url: http://nuiton.org/repositories/revision/jaxx/2169 Log: remove xwork2 extra validators (they are now in nuiton-validator) + their tests Removed: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/field/ trunk/jaxx-validator/src/test/resources/jaxx/runtime/validator/

1 0

r2168 - in trunk: jaxx-tutorial-validation jaxx-validator
by tchemit＠users.nuiton.org 25 Jan '11

25 Jan '11

Author: tchemit Date: 2011-01-25 15:45:38 +0100 (Tue, 25 Jan 2011) New Revision: 2168 Url: http://nuiton.org/repositories/revision/jaxx/2168 Log: optimize dependencies Modified: trunk/jaxx-tutorial-validation/pom.xml trunk/jaxx-validator/pom.xml Modified: trunk/jaxx-tutorial-validation/pom.xml =================================================================== --- trunk/jaxx-tutorial-validation/pom.xml 2011-01-25 14:08:37 UTC (rev 2167) +++ trunk/jaxx-tutorial-validation/pom.xml 2011-01-25 14:45:38 UTC (rev 2168) @@ -70,6 +70,11 @@ </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-validator</artifactId> + </dependency> + + <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> @@ -80,6 +85,16 @@ </dependency> <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + + <dependency> + <groupId>org.swinglabs</groupId> + <artifactId>jxlayer</artifactId> + </dependency> + + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <scope>runtime</scope> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2011-01-25 14:08:37 UTC (rev 2167) +++ trunk/jaxx-validator/pom.xml 2011-01-25 14:45:38 UTC (rev 2168) @@ -82,11 +82,6 @@ </dependency> <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> - - <dependency> <groupId>org.swinglabs</groupId> <artifactId>jxlayer</artifactId> </dependency>

1 0