[Jaxx-commits] r1607 - in branches/jaxx-2.X/maven-jaxx-plugin: . src/test/java/org/nuiton/jaxx/plugin src/test/java/org/nuiton/jaxx/plugin/DataBinding src/test/resources src/test/resources/org/nuiton/jaxx/plugin src/test/resources/org/nuiton/jaxx/plugin/Bug1722Test src/test/resources/org/nuiton/jaxx/plugin/Bug1750Test src/test/resources/org/nuiton/jaxx/plugin/Bug1751Test src/test/resources/org/nuiton/jaxx/plugin/CompilerTest src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest src/test/resources/

Author: tchemit Date: 2009-10-28 08:20:17 +0100 (Wed, 28 Oct 2009) New Revision: 1607 Added: branches/jaxx-2.X/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/DataBinding/ branches/jaxx-2.X/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/DataBinding/Bean.java branches/jaxx-2.X/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/DataBinding/BeanImpl.java branches/jaxx-2.X/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/DataBindingTest.java branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/log4j.properties branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/DataBindingTest/ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/DataBindingTest/First.jaxx branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/DataBindingTest/simpleBinding.xml Modified: branches/jaxx-2.X/maven-jaxx-plugin/pom.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Bug1722Test/Bug_1722.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Bug1750Test/Bug_1750.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Bug1751Test/Bug_1751.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/CSSTests.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/ClassReferences.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/ClientProperty.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/ErrorJaxxContextImplementorClass.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Errors.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Force.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Icon.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Initializers.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/InnerClasses.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/NoLog.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/OverridingDataBindings.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Script.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/SpecialSubclassing.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/WithLog.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/ValidatorErrors.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/ValidatorOk.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/DecoratorTest/Decorator.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/error.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/ok.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/I18nTest/I18nText.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/I18nTest/I18nTitle.xml branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/I18nTest/I18nToolTipText.xml Log: - ajout test sur bindings - les fichiers generes sont dans target/generated-sources Modified: branches/jaxx-2.X/maven-jaxx-plugin/pom.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/pom.xml 2009-10-28 07:19:17 UTC (rev 1606) +++ branches/jaxx-2.X/maven-jaxx-plugin/pom.xml 2009-10-28 07:20:17 UTC (rev 1607) @@ -129,7 +129,7 @@ </execution> </executions> </plugin> - + </plugins> <pluginManagement> @@ -491,5 +491,5 @@ </plugin> </plugins> </reporting> - -</project> \ No newline at end of file + +</project> Added: branches/jaxx-2.X/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/DataBinding/Bean.java =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/DataBinding/Bean.java (rev 0) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/DataBinding/Bean.java 2009-10-28 07:20:17 UTC (rev 1607) @@ -0,0 +1,16 @@ +package org.nuiton.jaxx.plugin.DataBinding; + +import java.beans.PropertyChangeListener; + +public interface Bean { + + void addPropertyChangeListener(PropertyChangeListener listener); + + void addPropertyChangeListener(String propertyName, PropertyChangeListener listener); + + void removePropertyChangeListener(PropertyChangeListener listener); + + void removePropertyChangeListener(String propertyName, PropertyChangeListener listener); + + String getText(); +} Property changes on: branches/jaxx-2.X/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/DataBinding/Bean.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Added: branches/jaxx-2.X/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/DataBinding/BeanImpl.java =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/DataBinding/BeanImpl.java (rev 0) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/DataBinding/BeanImpl.java 2009-10-28 07:20:17 UTC (rev 1607) @@ -0,0 +1,38 @@ +package org.nuiton.jaxx.plugin.DataBinding; + +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; + +public class BeanImpl { + + protected String text; + PropertyChangeSupport p; + + public BeanImpl() { + p = new PropertyChangeSupport(this); + } + + public void addPropertyChangeListener(PropertyChangeListener listener) { + p.addPropertyChangeListener(listener); + } + + public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { + p.addPropertyChangeListener(propertyName, listener); + } + + public void removePropertyChangeListener(PropertyChangeListener listener) { + p.removePropertyChangeListener(listener); + } + + public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { + p.removePropertyChangeListener(propertyName, listener); + } + + public String getText() { + return text; + } + + public void setText(String text) { + this.text = text; + } +} Property changes on: branches/jaxx-2.X/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/DataBinding/BeanImpl.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Added: branches/jaxx-2.X/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/DataBindingTest.java =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/DataBindingTest.java (rev 0) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/DataBindingTest.java 2009-10-28 07:20:17 UTC (rev 1607) @@ -0,0 +1,33 @@ +package org.nuiton.jaxx.plugin; + +import java.io.IOException; +import org.junit.Test; + +/** + * + * @author chemit + * @since 2.0.0 + */ +public class DataBindingTest extends JaxxBaseTest { + + @Test + public void simpleBinding() throws Exception { + + GenerateMojo mojo = getMojo(); + mojo.execute(); + assertNumberJaxxFiles(1); + + // no bindings + checkPattern(mojo, "new jaxx.runtime.DataBindingListener(this, \"nobinding1.text\");", false); + checkPattern(mojo, "new jaxx.runtime.DataBindingListener(this, \"nobinding2.text\");", false); + + // with bindings + checkBinding(mojo, "binding8.text"); + } + + protected void checkBinding(GenerateMojo mojo, String... bindings) throws IOException { + for (String b : bindings) { + checkPattern(mojo, "new jaxx.runtime.DataBindingListener(this, \"" + b + "\");", true); + } + } +} Property changes on: branches/jaxx-2.X/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/DataBindingTest.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Added: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/log4j.properties =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/log4j.properties (rev 0) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/log4j.properties 2009-10-28 07:20:17 UTC (rev 1607) @@ -0,0 +1,9 @@ +# Global logging configuration +log4j.rootLogger=ERROR, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n + +log4j.logger.jaxx.compiler=INFO +log4j.logger.jaxx.compiler.binding=DEBUG Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Bug1722Test/Bug_1722.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Bug1722Test/Bug_1722.xml 2009-10-28 07:19:17 UTC (rev 1606) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Bug1722Test/Bug_1722.xml 2009-10-28 07:20:17 UTC (rev 1607) @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <!--<verbose>true</verbose>--> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Bug1750Test/Bug_1750.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Bug1750Test/Bug_1750.xml 2009-10-28 07:19:17 UTC (rev 1606) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Bug1750Test/Bug_1750.xml 2009-10-28 07:20:17 UTC (rev 1607) @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <!--<verbose>true</verbose>--> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Bug1751Test/Bug_1751.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Bug1751Test/Bug_1751.xml 2009-10-28 07:19:17 UTC (rev 1606) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Bug1751Test/Bug_1751.xml 2009-10-28 07:20:17 UTC (rev 1607) @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <i18nable>true</i18nable> <force>true</force> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/CSSTests.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/CSSTests.xml 2009-10-28 07:19:17 UTC (rev 1606) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/CSSTests.xml 2009-10-28 07:20:17 UTC (rev 1607) @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <i18nable>false</i18nable> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/ClassReferences.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/ClassReferences.xml 2009-10-28 07:19:17 UTC (rev 1606) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/ClassReferences.xml 2009-10-28 07:20:17 UTC (rev 1607) @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <includes> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/ClientProperty.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/ClientProperty.xml 2009-10-28 07:19:17 UTC (rev 1606) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/ClientProperty.xml 2009-10-28 07:20:17 UTC (rev 1607) @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <addLogger>false</addLogger> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/ErrorJaxxContextImplementorClass.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/ErrorJaxxContextImplementorClass.xml 2009-10-28 07:19:17 UTC (rev 1606) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/ErrorJaxxContextImplementorClass.xml 2009-10-28 07:20:17 UTC (rev 1607) @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <jaxxContextFQN>java.lang.String</jaxxContextFQN> <force>true</force> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Errors.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Errors.xml 2009-10-28 07:19:17 UTC (rev 1606) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Errors.xml 2009-10-28 07:20:17 UTC (rev 1607) @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <includes> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Force.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Force.xml 2009-10-28 07:19:17 UTC (rev 1606) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Force.xml 2009-10-28 07:20:17 UTC (rev 1607) @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <includes> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Icon.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Icon.xml 2009-10-28 07:19:17 UTC (rev 1606) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Icon.xml 2009-10-28 07:20:17 UTC (rev 1607) @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <i18nable>false</i18nable> <force>true</force> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Initializers.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Initializers.xml 2009-10-28 07:19:17 UTC (rev 1606) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Initializers.xml 2009-10-28 07:20:17 UTC (rev 1607) @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <includes> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/InnerClasses.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/InnerClasses.xml 2009-10-28 07:19:17 UTC (rev 1606) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/InnerClasses.xml 2009-10-28 07:20:17 UTC (rev 1607) @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <includes> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/NoLog.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/NoLog.xml 2009-10-28 07:19:17 UTC (rev 1606) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/NoLog.xml 2009-10-28 07:20:17 UTC (rev 1607) @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <addLogger>false</addLogger> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/OverridingDataBindings.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/OverridingDataBindings.xml 2009-10-28 07:19:17 UTC (rev 1606) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/OverridingDataBindings.xml 2009-10-28 07:20:17 UTC (rev 1607) @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <includes> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Script.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Script.xml 2009-10-28 07:19:17 UTC (rev 1606) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Script.xml 2009-10-28 07:20:17 UTC (rev 1607) @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <includes> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/SpecialSubclassing.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/SpecialSubclassing.xml 2009-10-28 07:19:17 UTC (rev 1606) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/SpecialSubclassing.xml 2009-10-28 07:20:17 UTC (rev 1607) @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <includes> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/WithLog.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/WithLog.xml 2009-10-28 07:19:17 UTC (rev 1606) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/WithLog.xml 2009-10-28 07:20:17 UTC (rev 1607) @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <addLogger>true</addLogger> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/ValidatorErrors.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/ValidatorErrors.xml 2009-10-28 07:19:17 UTC (rev 1606) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/ValidatorErrors.xml 2009-10-28 07:20:17 UTC (rev 1607) @@ -14,7 +14,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <!--<verbose>true</verbose>--> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/ValidatorOk.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/ValidatorOk.xml 2009-10-28 07:19:17 UTC (rev 1606) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/ValidatorOk.xml 2009-10-28 07:20:17 UTC (rev 1607) @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <!--<verbose>true</verbose>--> Added: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/DataBindingTest/First.jaxx =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/DataBindingTest/First.jaxx (rev 0) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/DataBindingTest/First.jaxx 2009-10-28 07:20:17 UTC (rev 1607) @@ -0,0 +1,24 @@ + +<JPanel> + + <java.io.File id='file' constructorParams='""'/> + <java.io.File id='file2' javaBean='new File("")'/> + + <org.nuiton.jaxx.plugin.DataBinding.Bean id='bean' javaBean='new BeanImpl()'/> + <org.nuiton.jaxx.plugin.DataBinding.BeanImpl id='beanImpl' javaBean='new BeanImpl()'/> + + <JLabel id='nobinding1' text='{file.getAbsolutePath()}'/> + <JLabel id='nobinding2' text='{getFile().getAbsolutePath()}'/> + + <JLabel id='binding0' text='{file2.getAbsolutePath()}' javaBean='new JLabel()'/> + <JLabel id='binding1' text='{this.getFile2().getAbsolutePath()}'/> + <JLabel id='binding2' text='{getFile2().getAbsolutePath()}'/> + <JLabel id='binding3' text='{bean.getText()}'/> + <JLabel id='binding4' text='{getBean().getText()}'/> + <JLabel id='binding5' text='{beanImpl.getText()}'/> + <JLabel id='binding6' text='{getBeanImpl().getText()}'/> + <JLabel id='binding7' text='{binding0.getText()}'/> + <JLabel id='binding8' text='{getBinding0().getText()}'/> + <JLabel id='binding9' text='{binding0.getText() + binding1.getText()}'/> + +</JPanel> Added: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/DataBindingTest/simpleBinding.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/DataBindingTest/simpleBinding.xml (rev 0) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/DataBindingTest/simpleBinding.xml 2009-10-28 07:20:17 UTC (rev 1607) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.nuiton.jaxx.test</groupId> + <artifactId>test</artifactId> + <version>0</version> + <build> + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <configuration> + <src>${basedir}/target/test-classes</src> + <outJava>${basedir}/target/generated-sources/test-java</outJava> + <force>true</force> + <!--<verbose>true</verbose>--> + <includes> + <value>**/DataBindingTest/*.jaxx</value> + </includes> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/DecoratorTest/Decorator.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/DecoratorTest/Decorator.xml 2009-10-28 07:19:17 UTC (rev 1606) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/DecoratorTest/Decorator.xml 2009-10-28 07:20:17 UTC (rev 1607) @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <addLogger>false</addLogger> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/error.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/error.xml 2009-10-28 07:19:17 UTC (rev 1606) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/error.xml 2009-10-28 07:20:17 UTC (rev 1607) @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <!--<verbose>true</verbose>--> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/ok.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/ok.xml 2009-10-28 07:19:17 UTC (rev 1606) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/ok.xml 2009-10-28 07:20:17 UTC (rev 1607) @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <includes> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/I18nTest/I18nText.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/I18nTest/I18nText.xml 2009-10-28 07:19:17 UTC (rev 1606) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/I18nTest/I18nText.xml 2009-10-28 07:20:17 UTC (rev 1607) @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <i18nable>true</i18nable> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/I18nTest/I18nTitle.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/I18nTest/I18nTitle.xml 2009-10-28 07:19:17 UTC (rev 1606) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/I18nTest/I18nTitle.xml 2009-10-28 07:20:17 UTC (rev 1607) @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <i18nable>true</i18nable> Modified: branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/I18nTest/I18nToolTipText.xml =================================================================== --- branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/I18nTest/I18nToolTipText.xml 2009-10-28 07:19:17 UTC (rev 1606) +++ branches/jaxx-2.X/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/I18nTest/I18nToolTipText.xml 2009-10-28 07:20:17 UTC (rev 1607) @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <i18nable>true</i18nable>