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

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

r2167 - trunk
by tchemit＠users.nuiton.org 25 Jan '11

25 Jan '11

Author: tchemit Date: 2011-01-25 15:08:37 +0100 (Tue, 25 Jan 2011) New Revision: 2167 Url: http://nuiton.org/repositories/revision/jaxx/2167 Log: Evolution #1233: Updates nuiton-i18n to 2.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-25 13:26:57 UTC (rev 2166) +++ trunk/pom.xml 2011-01-25 14:08:37 UTC (rev 2167) @@ -424,7 +424,7 @@ <projectId>jaxx</projectId> <nuitonUtilsVersion>2.0-SNAPSHOT</nuitonUtilsVersion> - <nuitonI18nVersion>2.1</nuitonI18nVersion> + <nuitonI18nVersion>2.2</nuitonI18nVersion> <jxLayerVersion>3.0.3</jxLayerVersion>

1 0

r2166 - in trunk: jaxx-tutorial-validation/src/main/resources/jaxx/demo/validation/model jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui
by tchemit＠users.nuiton.org 25 Jan '11

25 Jan '11

Author: tchemit Date: 2011-01-25 14:26:57 +0100 (Tue, 25 Jan 2011) New Revision: 2166 Url: http://nuiton.org/repositories/revision/jaxx/2166 Log: clean code + improve tutorial rules Modified: trunk/jaxx-tutorial-validation/src/main/resources/jaxx/demo/validation/model/Movie-update-info-validation.xml trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/ImageValidationUI.java Modified: trunk/jaxx-tutorial-validation/src/main/resources/jaxx/demo/validation/model/Movie-update-info-validation.xml =================================================================== --- trunk/jaxx-tutorial-validation/src/main/resources/jaxx/demo/validation/model/Movie-update-info-validation.xml 2011-01-25 13:09:59 UTC (rev 2165) +++ trunk/jaxx-tutorial-validation/src/main/resources/jaxx/demo/validation/model/Movie-update-info-validation.xml 2011-01-25 13:26:57 UTC (rev 2166) @@ -1,27 +1,3 @@ - <!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> @@ -29,7 +5,7 @@ <field name="title"> <field-validator type="fieldexpression"> <param name="expression"> - <![CDATA[ title == null]]></param> + <![CDATA[ title == null || title.empty ]]></param> <message>Title is filled.</message> </field-validator> </field> Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/ImageValidationUI.java =================================================================== --- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/ImageValidationUI.java 2011-01-25 13:09:59 UTC (rev 2165) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/ImageValidationUI.java 2011-01-25 13:26:57 UTC (rev 2166) @@ -87,23 +87,6 @@ if (scope != null) { BufferedImage icon = icons.get(scope); g2.drawImage(icon, l.getWidth() - icon.getWidth() - 1, 0, null); -// switch (scope) { -// case FATAL: -// icon = fatalIcon; -// break; -// case ERROR: -// icon = errorIcon; -// break; -// case WARNING: -// icon = warningIcon; -// break; -// case INFO: -// icon = infoIcon; -// break; -// } -// if (icon != null) { -// g2.drawImage(icon, l.getWidth() - icon.getWidth() - 1, 0, null); -// } } } }

1 0

r2165 - in trunk: jaxx-compiler/src/main/java/jaxx/compiler/finalizers jaxx-compiler/src/main/java/jaxx/compiler/tags/validator jaxx-validator/src/main/java/jaxx/runtime/validator/swing
by tchemit＠users.nuiton.org 25 Jan '11

25 Jan '11

Author: tchemit Date: 2011-01-25 14:09:59 +0100 (Tue, 25 Jan 2011) New Revision: 2165 Url: http://nuiton.org/repositories/revision/jaxx/2165 Log: use the BeanValidatorFactory Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/ValidatorFinalizer.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/ValidatorFinalizer.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/ValidatorFinalizer.java 2011-01-25 12:03:38 UTC (rev 2164) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/ValidatorFinalizer.java 2011-01-25 13:09:59 UTC (rev 2165) @@ -126,7 +126,7 @@ for (CompiledBeanValidator validator : validators) { validator.registerValidator(compiler, javaFile); } - + // StringBuilder registerValidatorFieldsMethod = new StringBuilder(); // registerValidatorFieldsMethod.append(SwingValidatorUtil.class.getSimpleName()).append(".installFields(this);"); Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java 2011-01-25 12:03:38 UTC (rev 2164) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java 2011-01-25 13:09:59 UTC (rev 2165) @@ -748,8 +748,13 @@ String beanClassName = beanInfo.getJAXXBeanDescriptor().getClassDescriptor().getName(); // contextName must be in constructor to able to init validator with his correct contextName - setConstructorParams(beanClassName + ".class, " + - TypeManager.getJavaCode(contextName)); + String constructorParams = beanClassName + ".class, " + + TypeManager.getJavaCode(contextName); +// setConstructorParams(constructorParams); + setInitializer( + SwingValidatorUtil.class.getSimpleName() + ".newValidator(" + constructorParams + ")" + ); + // add generic type to validator setGenericTypes(new String[]{beanClassName}); Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java =================================================================== --- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java 2011-01-25 12:03:38 UTC (rev 2164) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java 2011-01-25 13:09:59 UTC (rev 2165) @@ -31,7 +31,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ReflectUtil; +import org.nuiton.validator.NuitonValidatorProvider; import org.nuiton.validator.NuitonValidatorScope; +import org.nuiton.validator.bean.BeanValidator; +import org.nuiton.validator.bean.BeanValidatorFactory; import org.nuiton.validator.bean.BeanValidatorUtil; import javax.swing.ImageIcon; @@ -55,7 +58,7 @@ import static org.nuiton.i18n.I18n.n_; /** - * The helper class for validation module. + * The helper class for swing validation module. * * @author tchemit <chemit(a)codelutin.com> */ @@ -120,6 +123,18 @@ // no instance } + public static <O> SwingValidator<O> newValidator(Class<O> type, String context) { + + if (BeanValidatorFactory.isDefaultCreator()) { + + // set the swing bean validator creator + BeanValidatorFactory.setCreator(new DefaultSwingValidatorCreator()); + } + SwingValidator<O> validator = + (SwingValidator<O>) BeanValidatorFactory.newBeanValidator(type, context); + return validator; + } + public static List<String> initUI(JAXXValidator ui) { List<String> validatorIds = new ArrayList<String>(); Map<Field, Validator> validators = ReflectUtil.getFieldAnnotation( @@ -191,8 +206,6 @@ // reload attached bean (to see validation on uis) validator.reloadBean(); } - - } /** @@ -336,7 +349,10 @@ * @param ui ui to refresh when context name has changed * @since 2.2.1 */ - public static void listenValidatorContextNameAndRefreshFields(SwingValidator<?> validator, final JAXXValidator ui) { + public static void listenValidatorContextNameAndRefreshFields( + SwingValidator<?> validator, + final JAXXValidator ui) { + PropertyChangeListener listener = new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { @@ -353,4 +369,22 @@ listener ); } + + /** + * Default bean validator creator to use in the {@link BeanValidatorFactory}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.1 + */ + public static class DefaultSwingValidatorCreator implements BeanValidatorFactory.BeanValidatorCreator { + @Override + public <O> BeanValidator<O> newBeanValidator(NuitonValidatorProvider provider, Class<O> type, String context, NuitonValidatorScope... scopes) { + BeanValidator<O> beanValidator = new SwingValidator<O>(provider, + type, + context, + scopes + ); + return beanValidator; + } + } }

1 0

r2164 - in trunk: jaxx-tutorial-validation/src/main/resources/jaxx/demo/validation/model jaxx-validator/src/main/java/jaxx/runtime/validator/swing/meta
by tchemit＠users.nuiton.org 25 Jan '11

25 Jan '11

Author: tchemit Date: 2011-01-25 13:03:38 +0100 (Tue, 25 Jan 2011) New Revision: 2164 Url: http://nuiton.org/repositories/revision/jaxx/2164 Log: add license headers Modified: trunk/jaxx-tutorial-validation/src/main/resources/jaxx/demo/validation/model/Movie-create-error-validation.xml trunk/jaxx-tutorial-validation/src/main/resources/jaxx/demo/validation/model/Movie-create-warning-validation.xml trunk/jaxx-tutorial-validation/src/main/resources/jaxx/demo/validation/model/Movie-update-error-validation.xml trunk/jaxx-tutorial-validation/src/main/resources/jaxx/demo/validation/model/Movie-update-info-validation.xml trunk/jaxx-tutorial-validation/src/main/resources/jaxx/demo/validation/model/Movie-update-warning-validation.xml trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/meta/Validator.java trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/meta/ValidatorField.java Modified: trunk/jaxx-tutorial-validation/src/main/resources/jaxx/demo/validation/model/Movie-create-error-validation.xml =================================================================== --- trunk/jaxx-tutorial-validation/src/main/resources/jaxx/demo/validation/model/Movie-create-error-validation.xml 2011-01-25 11:58:22 UTC (rev 2163) +++ trunk/jaxx-tutorial-validation/src/main/resources/jaxx/demo/validation/model/Movie-create-error-validation.xml 2011-01-25 12:03:38 UTC (rev 2164) @@ -1,3 +1,27 @@ + <!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN" Modified: trunk/jaxx-tutorial-validation/src/main/resources/jaxx/demo/validation/model/Movie-create-warning-validation.xml =================================================================== --- trunk/jaxx-tutorial-validation/src/main/resources/jaxx/demo/validation/model/Movie-create-warning-validation.xml 2011-01-25 11:58:22 UTC (rev 2163) +++ trunk/jaxx-tutorial-validation/src/main/resources/jaxx/demo/validation/model/Movie-create-warning-validation.xml 2011-01-25 12:03:38 UTC (rev 2164) @@ -1,3 +1,27 @@ + <!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> Modified: trunk/jaxx-tutorial-validation/src/main/resources/jaxx/demo/validation/model/Movie-update-error-validation.xml =================================================================== --- trunk/jaxx-tutorial-validation/src/main/resources/jaxx/demo/validation/model/Movie-update-error-validation.xml 2011-01-25 11:58:22 UTC (rev 2163) +++ trunk/jaxx-tutorial-validation/src/main/resources/jaxx/demo/validation/model/Movie-update-error-validation.xml 2011-01-25 12:03:38 UTC (rev 2164) @@ -1,3 +1,27 @@ + <!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN" Modified: trunk/jaxx-tutorial-validation/src/main/resources/jaxx/demo/validation/model/Movie-update-info-validation.xml =================================================================== --- trunk/jaxx-tutorial-validation/src/main/resources/jaxx/demo/validation/model/Movie-update-info-validation.xml 2011-01-25 11:58:22 UTC (rev 2163) +++ trunk/jaxx-tutorial-validation/src/main/resources/jaxx/demo/validation/model/Movie-update-info-validation.xml 2011-01-25 12:03:38 UTC (rev 2164) @@ -1,3 +1,27 @@ + <!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> Modified: trunk/jaxx-tutorial-validation/src/main/resources/jaxx/demo/validation/model/Movie-update-warning-validation.xml =================================================================== --- trunk/jaxx-tutorial-validation/src/main/resources/jaxx/demo/validation/model/Movie-update-warning-validation.xml 2011-01-25 11:58:22 UTC (rev 2163) +++ trunk/jaxx-tutorial-validation/src/main/resources/jaxx/demo/validation/model/Movie-update-warning-validation.xml 2011-01-25 12:03:38 UTC (rev 2164) @@ -1,3 +1,27 @@ + <!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/meta/Validator.java =================================================================== --- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/meta/Validator.java 2011-01-25 11:58:22 UTC (rev 2163) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/meta/Validator.java 2011-01-25 12:03:38 UTC (rev 2164) @@ -1,3 +1,27 @@ +/* + * #%L + * JAXX :: Validator + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package jaxx.runtime.validator.swing.meta; import java.lang.annotation.ElementType; Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/meta/ValidatorField.java =================================================================== --- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/meta/ValidatorField.java 2011-01-25 11:58:22 UTC (rev 2163) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/meta/ValidatorField.java 2011-01-25 12:03:38 UTC (rev 2164) @@ -1,3 +1,27 @@ +/* + * #%L + * JAXX :: Validator + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package jaxx.runtime.validator.swing.meta; import java.lang.annotation.ElementType;

1 0