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

r2286 - in trunk: . jaxx-compiler jaxx-demo jaxx-runtime jaxx-tutorial jaxx-tutorial-config jaxx-tutorial-css jaxx-tutorial-databinding jaxx-tutorial-helloworld jaxx-tutorial-helloworld2 jaxx-tutorial-validation jaxx-validator jaxx-widgets maven-jaxx-plugin
by hudson＠users.nuiton.org May 15, 2011

May 15, 2011

Author: hudson Date: 2011-05-15 22:31:01 +0200 (Sun, 15 May 2011) New Revision: 2286 Url: http://nuiton.org/repositories/revision/jaxx/2286 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-demo/pom.xml trunk/jaxx-runtime/pom.xml trunk/jaxx-tutorial-config/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-validation/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-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2011-05-15 20:30:58 UTC (rev 2285) +++ trunk/jaxx-compiler/pom.xml 2011-05-15 20:31:01 UTC (rev 2286) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4.2</version> + <version>2.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2011-05-15 20:30:58 UTC (rev 2285) +++ trunk/jaxx-demo/pom.xml 2011-05-15 20:31:01 UTC (rev 2286) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4.2</version> + <version>2.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2011-05-15 20:30:58 UTC (rev 2285) +++ trunk/jaxx-runtime/pom.xml 2011-05-15 20:31:01 UTC (rev 2286) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4.2</version> + <version>2.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-tutorial/pom.xml =================================================================== --- trunk/jaxx-tutorial/pom.xml 2011-05-15 20:30:58 UTC (rev 2285) +++ trunk/jaxx-tutorial/pom.xml 2011-05-15 20:31:01 UTC (rev 2286) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4.2</version> + <version>2.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-tutorial-config/pom.xml =================================================================== --- trunk/jaxx-tutorial-config/pom.xml 2011-05-15 20:30:58 UTC (rev 2285) +++ trunk/jaxx-tutorial-config/pom.xml 2011-05-15 20:31:01 UTC (rev 2286) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4.2</version> + <version>2.5-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-css/pom.xml =================================================================== --- trunk/jaxx-tutorial-css/pom.xml 2011-05-15 20:30:58 UTC (rev 2285) +++ trunk/jaxx-tutorial-css/pom.xml 2011-05-15 20:31:01 UTC (rev 2286) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4.2</version> + <version>2.5-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-databinding/pom.xml =================================================================== --- trunk/jaxx-tutorial-databinding/pom.xml 2011-05-15 20:30:58 UTC (rev 2285) +++ trunk/jaxx-tutorial-databinding/pom.xml 2011-05-15 20:31:01 UTC (rev 2286) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4.2</version> + <version>2.5-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-helloworld/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld/pom.xml 2011-05-15 20:30:58 UTC (rev 2285) +++ trunk/jaxx-tutorial-helloworld/pom.xml 2011-05-15 20:31:01 UTC (rev 2286) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4.2</version> + <version>2.5-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-helloworld2/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld2/pom.xml 2011-05-15 20:30:58 UTC (rev 2285) +++ trunk/jaxx-tutorial-helloworld2/pom.xml 2011-05-15 20:31:01 UTC (rev 2286) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4.2</version> + <version>2.5-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-validation/pom.xml =================================================================== --- trunk/jaxx-tutorial-validation/pom.xml 2011-05-15 20:30:58 UTC (rev 2285) +++ trunk/jaxx-tutorial-validation/pom.xml 2011-05-15 20:31:01 UTC (rev 2286) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4.2</version> + <version>2.5-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2011-05-15 20:30:58 UTC (rev 2285) +++ trunk/jaxx-validator/pom.xml 2011-05-15 20:31:01 UTC (rev 2286) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4.2</version> + <version>2.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2011-05-15 20:30:58 UTC (rev 2285) +++ trunk/jaxx-widgets/pom.xml 2011-05-15 20:31:01 UTC (rev 2286) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4.2</version> + <version>2.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2011-05-15 20:30:58 UTC (rev 2285) +++ trunk/maven-jaxx-plugin/pom.xml 2011-05-15 20:31:01 UTC (rev 2286) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4.2</version> + <version>2.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-15 20:30:58 UTC (rev 2285) +++ trunk/pom.xml 2011-05-15 20:31:01 UTC (rev 2286) @@ -38,7 +38,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.4.2</version> + <version>2.5-SNAPSHOT</version> <modules> <module>jaxx-runtime</module> @@ -112,9 +112,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.4.2</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.4.2</developerConnection> - <url>http://www.nuiton.org/repositories/browse/jaxx/tags/jaxx-2.4.2</url> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/jaxx/trunk</url> </scm> <dependencyManagement>

1 0

r2285 - tags
by hudson＠users.nuiton.org May 15, 2011

May 15, 2011

Author: hudson Date: 2011-05-15 22:30:58 +0200 (Sun, 15 May 2011) New Revision: 2285 Url: http://nuiton.org/repositories/revision/jaxx/2285 Log: [maven-release-plugin] copy for tag jaxx-2.4.2 Added: tags/jaxx-2.4.2/

1 0

r2284 - in trunk: . jaxx-compiler jaxx-demo jaxx-runtime jaxx-tutorial jaxx-tutorial-config jaxx-tutorial-css jaxx-tutorial-databinding jaxx-tutorial-helloworld jaxx-tutorial-helloworld2 jaxx-tutorial-validation jaxx-validator jaxx-widgets maven-jaxx-plugin
by hudson＠users.nuiton.org May 15, 2011

May 15, 2011

Author: hudson Date: 2011-05-15 22:30:56 +0200 (Sun, 15 May 2011) New Revision: 2284 Url: http://nuiton.org/repositories/revision/jaxx/2284 Log: [maven-release-plugin] prepare release jaxx-2.4.2 Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-demo/pom.xml trunk/jaxx-runtime/pom.xml trunk/jaxx-tutorial-config/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-validation/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-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2011-05-15 13:20:25 UTC (rev 2283) +++ trunk/jaxx-compiler/pom.xml 2011-05-15 20:30:56 UTC (rev 2284) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.2</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2011-05-15 13:20:25 UTC (rev 2283) +++ trunk/jaxx-demo/pom.xml 2011-05-15 20:30:56 UTC (rev 2284) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.2</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2011-05-15 13:20:25 UTC (rev 2283) +++ trunk/jaxx-runtime/pom.xml 2011-05-15 20:30:56 UTC (rev 2284) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.2</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-tutorial/pom.xml =================================================================== --- trunk/jaxx-tutorial/pom.xml 2011-05-15 13:20:25 UTC (rev 2283) +++ trunk/jaxx-tutorial/pom.xml 2011-05-15 20:30:56 UTC (rev 2284) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.2</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-tutorial-config/pom.xml =================================================================== --- trunk/jaxx-tutorial-config/pom.xml 2011-05-15 13:20:25 UTC (rev 2283) +++ trunk/jaxx-tutorial-config/pom.xml 2011-05-15 20:30:56 UTC (rev 2284) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.2</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-css/pom.xml =================================================================== --- trunk/jaxx-tutorial-css/pom.xml 2011-05-15 13:20:25 UTC (rev 2283) +++ trunk/jaxx-tutorial-css/pom.xml 2011-05-15 20:30:56 UTC (rev 2284) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.2</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-databinding/pom.xml =================================================================== --- trunk/jaxx-tutorial-databinding/pom.xml 2011-05-15 13:20:25 UTC (rev 2283) +++ trunk/jaxx-tutorial-databinding/pom.xml 2011-05-15 20:30:56 UTC (rev 2284) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.2</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-helloworld/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld/pom.xml 2011-05-15 13:20:25 UTC (rev 2283) +++ trunk/jaxx-tutorial-helloworld/pom.xml 2011-05-15 20:30:56 UTC (rev 2284) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.2</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-helloworld2/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld2/pom.xml 2011-05-15 13:20:25 UTC (rev 2283) +++ trunk/jaxx-tutorial-helloworld2/pom.xml 2011-05-15 20:30:56 UTC (rev 2284) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.2</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-validation/pom.xml =================================================================== --- trunk/jaxx-tutorial-validation/pom.xml 2011-05-15 13:20:25 UTC (rev 2283) +++ trunk/jaxx-tutorial-validation/pom.xml 2011-05-15 20:30:56 UTC (rev 2284) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.2</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2011-05-15 13:20:25 UTC (rev 2283) +++ trunk/jaxx-validator/pom.xml 2011-05-15 20:30:56 UTC (rev 2284) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.2</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2011-05-15 13:20:25 UTC (rev 2283) +++ trunk/jaxx-widgets/pom.xml 2011-05-15 20:30:56 UTC (rev 2284) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.2</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2011-05-15 13:20:25 UTC (rev 2283) +++ trunk/maven-jaxx-plugin/pom.xml 2011-05-15 20:30:56 UTC (rev 2284) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.2</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-15 13:20:25 UTC (rev 2283) +++ trunk/pom.xml 2011-05-15 20:30:56 UTC (rev 2284) @@ -38,7 +38,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.2</version> <modules> <module>jaxx-runtime</module> @@ -112,9 +112,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/jaxx/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.4.2</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.4.2</developerConnection> + <url>http://www.nuiton.org/repositories/browse/jaxx/tags/jaxx-2.4.2</url> </scm> <dependencyManagement>

1 0

r2283 - in trunk/jaxx-compiler/src: main/java/jaxx/compiler/reflect/resolvers test/java/jaxx/compiler/reflect test/java/jaxx/compiler/reflect/resolvers
by tchemit＠users.nuiton.org May 15, 2011

May 15, 2011

Author: tchemit Date: 2011-05-15 15:20:25 +0200 (Sun, 15 May 2011) New Revision: 2283 Url: http://nuiton.org/repositories/revision/jaxx/2283 Log: Anomalie #1442: Non public classes make generation fails Added: trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyChildClass2.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyChildClass.java trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFileTest.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java 2011-05-15 12:43:38 UTC (rev 2282) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java 2011-05-15 13:20:25 UTC (rev 2283) @@ -211,6 +211,16 @@ public static final String[] EMPTY_STRING_ARRAY = new String[0]; + + /** + * To test if a compilation unit was already parsed. If so, then stop + * parsing the java file : one parsing can only give one class + * descriptor. + * + * @since 2.4.2 + */ + private boolean firstTypeScanned; + protected JavaFileParser(ClassLoader classLoader) { //FIXME-TC-20100504 : shoudl remove this to make the parser free of jaxx :) // We could imagine just to offers to the parser a list of namespaces @@ -227,6 +237,10 @@ public void doParse(String className, Reader src) throws ClassNotFoundException { + + // reset this internal state + firstTypeScanned = false; + try { JavaParser p = new JavaParser(src); p.CompilationUnit(); @@ -281,6 +295,15 @@ } private void scanCompilationUnitChild(SimpleNode child) { + if (firstTypeScanned) { + + // already scan the first class of the java file + // for the moment, can not do anything else... + if (log.isWarnEnabled()) { + log.warn("There is more than one type in current file, skip next type..."); + } + return; + } int nodeType = child.getId(); switch (nodeType) { case JavaParserTreeConstants.JJTPACKAGEDECLARATION: @@ -321,6 +344,7 @@ // scans the main ClassOrInterfaceDeclaration private void scanClass(SimpleNode node) { + firstTypeScanned = true; // boolean isInterface = node.firstToken.image.equals("interface"); className = node.firstToken.next.image; if (packageName != null) { Modified: trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyChildClass.java =================================================================== --- trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyChildClass.java 2011-05-15 12:43:38 UTC (rev 2282) +++ trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyChildClass.java 2011-05-15 13:20:25 UTC (rev 2283) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2011 CodeLutin + * Copyright (C) 2008 - 2011 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as Added: trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyChildClass2.java =================================================================== --- trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyChildClass2.java (rev 0) +++ trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyChildClass2.java 2011-05-15 13:20:25 UTC (rev 2283) @@ -0,0 +1,40 @@ +/* + * #%L + * JAXX :: Compiler + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2011 CodeLutin, Tony Chemit + * %% + * 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.compiler.reflect; + +/** + * To test the bug : http://nuiton.org/issues/show/1442 + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.4.2 + */ +public class MyChildClass2 extends MyClass { + private static final long serialVersionUID = 1L; +} + +// This class will not be scanned! +class MyPackageClass { + +} Property changes on: trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyChildClass2.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFileTest.java =================================================================== --- trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFileTest.java 2011-05-15 12:43:38 UTC (rev 2282) +++ trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFileTest.java 2011-05-15 13:20:25 UTC (rev 2283) @@ -29,6 +29,7 @@ import jaxx.compiler.reflect.FieldDescriptor; import jaxx.compiler.reflect.MyAbstractClass; import jaxx.compiler.reflect.MyChildClass; +import jaxx.compiler.reflect.MyChildClass2; import jaxx.compiler.reflect.MyClass; import jaxx.compiler.reflect.MyEnum; import jaxx.compiler.reflect.MyInterface; @@ -215,7 +216,6 @@ String.class, Modifier.PUBLIC ); - } @Test @@ -270,6 +270,50 @@ } + @Test + public void parseMyChildClass2() throws Exception { + + ClassDescriptor descriptor = getDescriptor(MyChildClass2.class); + + assertInterfaces(descriptor, MyChildClass2.class.getInterfaces()); + assertSuperClass(descriptor, MyClass.class); + assertIsAssignableFrom(descriptor, + Serializable.class, + MyInterface.class, + MyAbstractClass.class, + MyClass.class + ); + + assertDeclaredField( + descriptor, + "serialVersionUID", + long.class, + Modifier.PRIVATE | Modifier.FINAL | Modifier.STATIC + ); + + assertDeclaredField( + descriptor, + "myPrivateStringField", + String.class, + Modifier.PRIVATE | Modifier.FINAL + ); + + assertDeclaredField( + descriptor, + "myProtectedStringField", + String.class, + Modifier.PROTECTED + ); + + assertField( + descriptor, + "myPublicStringField", + String.class, + Modifier.PUBLIC + ); + + } + public static void assertField(ClassDescriptor descriptor, String fieldName, Class<?> fieldType,

1 0

r2282 - trunk
by tchemit＠users.nuiton.org May 15, 2011

May 15, 2011

Author: tchemit Date: 2011-05-15 14:43:38 +0200 (Sun, 15 May 2011) New Revision: 2282 Url: http://nuiton.org/repositories/revision/jaxx/2282 Log: Evolution #1396: Update to rSyntaxTextArea 1.5.0 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-15 12:21:02 UTC (rev 2281) +++ trunk/pom.xml 2011-05-15 12:43:38 UTC (rev 2282) @@ -334,7 +334,7 @@ <dependency> <groupId>com.fifesoft</groupId> <artifactId>rsyntaxtextarea</artifactId> - <version>r239</version> + <version>1.5.0</version> </dependency>  @@ -423,12 +423,12 @@ </dependency> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-validator</artifactId> - <version>${nuitonUtilsVersion}</version> - <scope>test</scope> - <classifier>tests</classifier> - </dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-validator</artifactId> + <version>${nuitonUtilsVersion}</version> + <scope>test</scope> + <classifier>tests</classifier> + </dependency> </dependencies> </dependencyManagement>

1 0

r2281 - trunk
by tchemit＠users.nuiton.org May 15, 2011

May 15, 2011

Author: tchemit Date: 2011-05-15 14:21:02 +0200 (Sun, 15 May 2011) New Revision: 2281 Url: http://nuiton.org/repositories/revision/jaxx/2281 Log: Evolution #1490: Updates to nuiton-utils 2.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-15 12:13:29 UTC (rev 2280) +++ trunk/pom.xml 2011-05-15 12:21:02 UTC (rev 2281) @@ -97,7 +97,7 @@  <projectId>jaxx</projectId> - <nuitonUtilsVersion>2.2-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>2.2</nuitonUtilsVersion> <nuitonI18nVersion>2.4</nuitonI18nVersion> <eugeneVersion>2.3.2</eugeneVersion> <xworkVersion>2.2.1.1</xworkVersion>

1 0

r2280 - in trunk/jaxx-compiler/src: main/java/jaxx/compiler/reflect main/java/jaxx/compiler/reflect/resolvers test/java/jaxx/compiler/reflect test/java/jaxx/compiler/reflect/resolvers
by tchemit＠users.nuiton.org May 15, 2011

May 15, 2011

Author: tchemit Date: 2011-05-15 14:13:29 +0200 (Sun, 15 May 2011) New Revision: 2280 Url: http://nuiton.org/repositories/revision/jaxx/2280 Log: Anomalie #1470: Loading java source file does not take account of super classes Added: trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyChildClass.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/ClassDescriptor.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaClass.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/ClassDescriptorTest.java trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFileTest.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/ClassDescriptor.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/ClassDescriptor.java 2011-05-15 12:10:27 UTC (rev 2279) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/ClassDescriptor.java 2011-05-15 12:13:29 UTC (rev 2280) @@ -26,6 +26,8 @@ package jaxx.compiler.reflect; import jaxx.runtime.JAXXObjectDescriptor; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import java.util.Arrays; @@ -37,6 +39,12 @@ */ public abstract class ClassDescriptor { + /** Logger. */ + private static final Log log = LogFactory.getLog(ClassDescriptor.class); + + public static final FieldDescriptor[] EMPTY_FIELD_DESCRIPTORS_ARRAY = + new FieldDescriptor[0]; + private String name; private String packageName; @@ -69,9 +77,22 @@ String name, ClassDescriptor... parameterTypes) throws NoSuchMethodException; - public abstract FieldDescriptor getDeclaredFieldDescriptor( - String name) throws NoSuchFieldException; +// public abstract FieldDescriptor getDeclaredFieldDescriptor( +// String name) throws NoSuchFieldException; + public FieldDescriptor getDeclaredFieldDescriptor(String name) throws NoSuchFieldException { + for (FieldDescriptor descriptor : declaredFieldDescriptors) { + if (name.equals(descriptor.getName())) { + if (log.isDebugEnabled()) { + log.debug("Using a declared field descriptor [" + name + + "] for " + getName()); + } + return descriptor; + } + } + throw new NoSuchFieldException(name); + } + protected ClassDescriptor(ClassDescriptorHelper.ResolverType resolverType, String name, String packageName, @@ -206,6 +227,10 @@ return fieldDescriptors; } + public FieldDescriptor[] getDeclaredFieldDescriptors() { + return declaredFieldDescriptors==null? EMPTY_FIELD_DESCRIPTORS_ARRAY : declaredFieldDescriptors; + } + public FieldDescriptor getFieldDescriptor(String name) throws NoSuchFieldException { for (FieldDescriptor fieldDescriptor : fieldDescriptors) { if (fieldDescriptor.getName().equals(name)) { Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaClass.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaClass.java 2011-05-15 12:10:27 UTC (rev 2279) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaClass.java 2011-05-15 12:13:29 UTC (rev 2280) @@ -105,6 +105,16 @@ ); } + Field[] javaDeclaredFields = javaClass.getDeclaredFields(); + FieldDescriptor[] declaredFields = + new FieldDescriptor[javaDeclaredFields.length]; + for (int i = 0; i < declaredFields .length; i++) { + declaredFields[i] = ClassDescriptorHelper.createFieldDescriptor( + javaDeclaredFields[i], + javaClass.getClassLoader() + ); + } + JAXXObjectDescriptor jaxxObjectDescriptor = ClassDescriptorHelper.getJAXXObjectDescriptor(javaClass); @@ -121,7 +131,8 @@ classLoader, constructors, methods, - fields + fields, + declaredFields ); } @@ -143,7 +154,9 @@ ClassLoader classLoader, MethodDescriptor[] constructors, MethodDescriptor[] methods, - FieldDescriptor[] fields) { + FieldDescriptor[] fields, + FieldDescriptor[] declaredFields + ) { super( ClassDescriptorResolverFromJavaClass.this.getResolverType(), name, @@ -157,17 +170,18 @@ classLoader, constructors, methods, - fields + fields, + declaredFields ); this.javaClass = javaClass; } - @Override - public FieldDescriptor getDeclaredFieldDescriptor(String name) throws NoSuchFieldException { - return ClassDescriptorHelper.createFieldDescriptor(javaClass.getDeclaredField(name), - javaClass.getClassLoader() - ); - } +// @Override +// public FieldDescriptor getDeclaredFieldDescriptor(String name) throws NoSuchFieldException { +// return ClassDescriptorHelper.createFieldDescriptor(javaClass.getDeclaredField(name), +// javaClass.getClassLoader() +// ); +// } @Override public MethodDescriptor getDeclaredMethodDescriptor(String name, Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java 2011-05-15 12:10:27 UTC (rev 2279) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java 2011-05-15 12:13:29 UTC (rev 2280) @@ -92,7 +92,7 @@ try { parser.doParse(displayName, reader); } catch (Exception e) { - log.error(e.getMessage()); +// log.error(e.getMessage()); throw new RuntimeException(e); } result = new JavaFileClassDescriptor(parser, classLoader); @@ -132,18 +132,18 @@ } - @Override - public FieldDescriptor getDeclaredFieldDescriptor(String name) throws NoSuchFieldException { - for (FieldDescriptor descriptor : declaredFieldDescriptors) { - if (name.equals(descriptor.getName())) { - if (log.isDebugEnabled()) { - log.debug("Using a declared field descriptor [" + name + "] for " + getName()); - } - return descriptor; - } - } - throw new NoSuchFieldException(name); - } +// @Override +// public FieldDescriptor getDeclaredFieldDescriptor(String name) throws NoSuchFieldException { +// for (FieldDescriptor descriptor : declaredFieldDescriptors) { +// if (name.equals(descriptor.getName())) { +// if (log.isDebugEnabled()) { +// log.debug("Using a declared field descriptor [" + name + "] for " + getName()); +// } +// return descriptor; +// } +// } +// throw new NoSuchFieldException(name); +// } @Override public MethodDescriptor getDeclaredMethodDescriptor(String name, ClassDescriptor... parameterTypes) throws NoSuchMethodException { @@ -262,6 +262,7 @@ ClassDescriptor superclassDescriptor = ClassDescriptorHelper.getClassDescriptor(superclass, compiler.getClassLoader()); methods.addAll(Arrays.asList(superclassDescriptor.getMethodDescriptors())); fields.addAll(Arrays.asList(superclassDescriptor.getFieldDescriptors())); + declaredFields.addAll(Arrays.asList(superclassDescriptor.getDeclaredFieldDescriptors())); } return; Modified: trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/ClassDescriptorTest.java =================================================================== --- trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/ClassDescriptorTest.java 2011-05-15 12:10:27 UTC (rev 2279) +++ trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/ClassDescriptorTest.java 2011-05-15 12:13:29 UTC (rev 2280) @@ -98,7 +98,6 @@ public void testConstructorFromClass() throws ClassNotFoundException, MalformedURLException { String className = MyClass.class.getName(); ClassDescriptor descriptor = ClassDescriptorHelper.getClassDescriptor(className); - ClassLoader classLoader = getClass().getClassLoader(); assertNotNull(descriptor); assertEquals(ClassDescriptorHelper.ResolverType.JAVA_CLASS, descriptor.getResolverType()); MethodDescriptor[] constructorDescriptors = descriptor.getConstructorDescriptors(); Added: trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyChildClass.java =================================================================== --- trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyChildClass.java (rev 0) +++ trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyChildClass.java 2011-05-15 12:13:29 UTC (rev 2280) @@ -0,0 +1,48 @@ +/* + * #%L + * JAXX :: Compiler + * + * $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.compiler.reflect; + +/** + * A child class to test the bug http://nuiton.org/issues/show/1470 + * <p/> + * To test if a child class obtains properties from his super class. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.4.2 + */ +public class MyChildClass extends MyClass implements Cloneable{ + + private static final long serialVersionUID = 2L; + + protected String childProperty; + + public String getChildProperty() { + return childProperty; + } + + public void setChildProperty(String childProperty) { + this.childProperty = childProperty; + } +} Property changes on: trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyChildClass.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFileTest.java =================================================================== --- trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFileTest.java 2011-05-15 12:10:27 UTC (rev 2279) +++ trunk/jaxx-compiler/src/test/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFileTest.java 2011-05-15 12:13:29 UTC (rev 2280) @@ -28,6 +28,7 @@ import jaxx.compiler.reflect.ClassDescriptorHelper; import jaxx.compiler.reflect.FieldDescriptor; import jaxx.compiler.reflect.MyAbstractClass; +import jaxx.compiler.reflect.MyChildClass; import jaxx.compiler.reflect.MyClass; import jaxx.compiler.reflect.MyEnum; import jaxx.compiler.reflect.MyInterface; @@ -39,6 +40,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.nuiton.util.ApplicationConfig; +import org.nuiton.util.FileUtil; import java.io.File; import java.io.Serializable; @@ -71,9 +73,10 @@ // says basedir is where we start tests. basedir = new File("").getAbsolutePath(); } - testSourceRoot = new File(new File(basedir), - "src" + File.separator + - "test" + File.separator + "java"); + testSourceRoot = FileUtil.getFileFromPaths(new File(basedir), + "src", + "test", + "java"); } protected ClassDescriptor getDescriptor(Class<?> klass) throws Exception { @@ -215,6 +218,58 @@ } + @Test + public void parseMyChildClass() throws Exception { + + ClassDescriptor descriptor = getDescriptor(MyChildClass.class); + + assertInterfaces(descriptor, MyChildClass.class.getInterfaces()); + assertInterfaces(descriptor, Cloneable.class); + assertSuperClass(descriptor, MyClass.class); + assertIsAssignableFrom(descriptor, + Serializable.class, + MyInterface.class, + MyAbstractClass.class, + MyClass.class + ); + + assertDeclaredField( + descriptor, + "serialVersionUID", + long.class, + Modifier.PRIVATE | Modifier.FINAL | Modifier.STATIC + ); + + assertDeclaredField( + descriptor, + "myPrivateStringField", + String.class, + Modifier.PRIVATE | Modifier.FINAL + ); + + assertDeclaredField( + descriptor, + "myProtectedStringField", + String.class, + Modifier.PROTECTED + ); + + assertDeclaredField( + descriptor, + "childProperty", + String.class, + Modifier.PROTECTED + ); + + assertField( + descriptor, + "myPublicStringField", + String.class, + Modifier.PUBLIC + ); + + } + public static void assertField(ClassDescriptor descriptor, String fieldName, Class<?> fieldType,

1 0

r2279 - trunk/jaxx-demo
by tchemit＠users.nuiton.org May 15, 2011

May 15, 2011

Author: tchemit Date: 2011-05-15 14:10:27 +0200 (Sun, 15 May 2011) New Revision: 2279 Url: http://nuiton.org/repositories/revision/jaxx/2279 Log: fix when using snapshot and test jaxx-demo Modified: trunk/jaxx-demo/pom.xml Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2011-05-14 11:44:39 UTC (rev 2278) +++ trunk/jaxx-demo/pom.xml 2011-05-15 12:10:27 UTC (rev 2279) @@ -193,7 +193,7 @@ <configuration> <archive> <manifest> - <useUniqueVersions>false</useUniqueVersions> + <useUniqueVersions>true</useUniqueVersions> <addClasspath>true</addClasspath> <classpathPrefix>./lib/</classpathPrefix> </manifest>

1 0

r2278 - trunk
by tchemit＠users.nuiton.org May 14, 2011

May 14, 2011

Author: tchemit Date: 2011-05-14 13:44:39 +0200 (Sat, 14 May 2011) New Revision: 2278 Url: http://nuiton.org/repositories/revision/jaxx/2278 Log: Update mavenpom4redmineAndCentral to 2.5.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-13 14:21:33 UTC (rev 2277) +++ trunk/pom.xml 2011-05-14 11:44:39 UTC (rev 2278) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.5.3</version> + <version>2.5.4</version> </parent> <artifactId>jaxx</artifactId>

1 0

r2277 - trunk
by tchemit＠users.nuiton.org May 13, 2011

May 13, 2011

Author: tchemit Date: 2011-05-13 16:21:33 +0200 (Fri, 13 May 2011) New Revision: 2277 Url: http://nuiton.org/repositories/revision/jaxx/2277 Log: Evolution #1526: Updates to i18n 2.4 (using utf-8 i18n files) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-12 21:33:15 UTC (rev 2276) +++ trunk/pom.xml 2011-05-13 14:21:33 UTC (rev 2277) @@ -98,7 +98,7 @@ <projectId>jaxx</projectId> <nuitonUtilsVersion>2.2-SNAPSHOT</nuitonUtilsVersion> - <nuitonI18nVersion>2.4-SNAPSHOT</nuitonI18nVersion> + <nuitonI18nVersion>2.4</nuitonI18nVersion> <eugeneVersion>2.3.2</eugeneVersion> <xworkVersion>2.2.1.1</xworkVersion> <jxLayerVersion>3.0.4</jxLayerVersion>

1 0