Author: alexsmirnov Date: 2009-07-23 21:32:04 -0400 (Thu, 23 Jul 2009) New Revision: 14996 Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/JavaLogger.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/Logger.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/LoggerFactory.java Removed: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/Logger.java Modified: root/cdk/trunk/plugins/generator/pom.xml root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/config/BuilderConfig.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/config/JsfBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/config/LoaderHolder.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/BlankRendererGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ComponentGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ComponentGenerator2.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ComponentTagGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ComponentTestGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ConverterGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ConverterTagGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/FaceletsTaglibGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/FacesConfigGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/InnerGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ListenerGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ListenerTagGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/RendererCompilationContext.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/RendererGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ResourcesConfigGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ResourcesConfigParser.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ResourcesDependenciesGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/TagHandlerGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/TagTestGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/TaglibGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/TestDataGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/TestDataGenerator2.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ValidatorGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ValidatorTagGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/XMLConfigGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualFileManager.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ProcessorTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/VirtualFileTest.java Log: New logging factory, continue to process annotations. Modified: root/cdk/trunk/plugins/generator/pom.xml =================================================================== --- root/cdk/trunk/plugins/generator/pom.xml 2009-07-23 19:40:10 UTC (rev 14995) +++ root/cdk/trunk/plugins/generator/pom.xml 2009-07-24 01:32:04 UTC (rev 14996) @@ -22,7 +22,7 @@ <target>1.6</target> </configuration> </plugin> - <plugin> + <!--plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>jaxb2-maven-plugin</artifactId> <executions> @@ -33,9 +33,9 @@ </execution> </executions> <configuration> - <packageName>org.richfaces.cdk.model</packageName> <!-- The name of your generated source package --> + <packageName>org.richfaces.cdk.model</packageName> </configuration> - </plugin> + </plugin --> </plugins> </build> <dependencies> Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/config/BuilderConfig.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/config/BuilderConfig.java 2009-07-23 19:40:10 UTC (rev 14995) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/config/BuilderConfig.java 2009-07-24 01:32:04 UTC (rev 14996) @@ -38,7 +38,7 @@ import org.apache.commons.digester.Digester; import org.apache.commons.digester.ExtendedBaseRules; import org.apache.tools.ant.BuildException; -import org.richfaces.builder.generator.Logger; +import org.richfaces.cdk.Logger; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.ext.EntityResolver2; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/config/JsfBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/config/JsfBean.java 2009-07-23 19:40:10 UTC (rev 14995) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/config/JsfBean.java 2009-07-24 01:32:04 UTC (rev 14996) @@ -26,7 +26,7 @@ import java.util.Collections; import java.util.List; -import org.richfaces.builder.generator.Logger; +import org.richfaces.cdk.Logger; /** Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/config/LoaderHolder.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/config/LoaderHolder.java 2009-07-23 19:40:10 UTC (rev 14995) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/config/LoaderHolder.java 2009-07-24 01:32:04 UTC (rev 14996) @@ -21,7 +21,7 @@ package org.richfaces.builder.config; -import org.richfaces.builder.generator.Logger; +import org.richfaces.cdk.Logger; /** * @author asmirnov(a)exadel.com (latest modification by $Author: ishabalov $) Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/BlankRendererGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/BlankRendererGenerator.java 2009-07-23 19:40:10 UTC (rev 14995) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/BlankRendererGenerator.java 2009-07-24 01:32:04 UTC (rev 14996) @@ -33,6 +33,7 @@ import org.apache.velocity.VelocityContext; import org.richfaces.builder.config.BuilderConfig; import org.richfaces.builder.config.ComponentBean; +import org.richfaces.cdk.Logger; /** Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ComponentGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ComponentGenerator.java 2009-07-23 19:40:10 UTC (rev 14995) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ComponentGenerator.java 2009-07-24 01:32:04 UTC (rev 14996) @@ -34,6 +34,7 @@ import org.richfaces.builder.config.BuilderConfig; import org.richfaces.builder.config.ComponentBean; import org.richfaces.builder.config.PropertyBean; +import org.richfaces.cdk.Logger; /** Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ComponentGenerator2.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ComponentGenerator2.java 2009-07-23 19:40:10 UTC (rev 14995) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ComponentGenerator2.java 2009-07-24 01:32:04 UTC (rev 14996) @@ -33,6 +33,7 @@ import org.richfaces.builder.config.ComponentBean; import org.richfaces.builder.model.JavaClass; import org.richfaces.builder.render.JavaClassRenderer; +import org.richfaces.cdk.Logger; /** * @author Maksim Kaszynski Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ComponentTagGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ComponentTagGenerator.java 2009-07-23 19:40:10 UTC (rev 14995) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ComponentTagGenerator.java 2009-07-24 01:32:04 UTC (rev 14996) @@ -35,6 +35,7 @@ import org.richfaces.builder.config.ComponentBean; import org.richfaces.builder.config.PropertyBean; import org.richfaces.builder.config.TagBean; +import org.richfaces.cdk.Logger; /** Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ComponentTestGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ComponentTestGenerator.java 2009-07-23 19:40:10 UTC (rev 14995) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ComponentTestGenerator.java 2009-07-24 01:32:04 UTC (rev 14996) @@ -34,6 +34,7 @@ import org.richfaces.builder.config.BuilderConfig; import org.richfaces.builder.config.ComponentBean; import org.richfaces.builder.config.PropertyBean; +import org.richfaces.cdk.Logger; public class ComponentTestGenerator extends InnerGenerator{ Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ConverterGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ConverterGenerator.java 2009-07-23 19:40:10 UTC (rev 14995) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ConverterGenerator.java 2009-07-24 01:32:04 UTC (rev 14996) @@ -35,6 +35,7 @@ import org.richfaces.builder.config.ConverterBean; import org.richfaces.builder.config.PropertyBean; import org.richfaces.builder.config.ValidatorBean; +import org.richfaces.cdk.Logger; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ConverterTagGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ConverterTagGenerator.java 2009-07-23 19:40:10 UTC (rev 14995) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ConverterTagGenerator.java 2009-07-24 01:32:04 UTC (rev 14996) @@ -36,6 +36,7 @@ import org.richfaces.builder.config.PropertyBean; import org.richfaces.builder.config.TagBean; import org.richfaces.builder.config.ValidatorBean; +import org.richfaces.cdk.Logger; /** Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/FaceletsTaglibGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/FaceletsTaglibGenerator.java 2009-07-23 19:40:10 UTC (rev 14995) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/FaceletsTaglibGenerator.java 2009-07-24 01:32:04 UTC (rev 14996) @@ -38,6 +38,7 @@ import org.richfaces.builder.config.FunctionBean; import org.richfaces.builder.config.ListenerBean; import org.richfaces.builder.config.ValidatorBean; +import org.richfaces.cdk.Logger; /** * @author asmirnov(a)exadel.com (latest modification by $Author: ishabalov $) Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/FacesConfigGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/FacesConfigGenerator.java 2009-07-23 19:40:10 UTC (rev 14995) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/FacesConfigGenerator.java 2009-07-24 01:32:04 UTC (rev 14996) @@ -31,6 +31,7 @@ import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.richfaces.builder.config.BuilderConfig; +import org.richfaces.cdk.Logger; /** * Class implement functionality for generate faces-config file inner element of Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/InnerGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/InnerGenerator.java 2009-07-23 19:40:10 UTC (rev 14995) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/InnerGenerator.java 2009-07-24 01:32:04 UTC (rev 14996) @@ -29,6 +29,7 @@ import org.richfaces.builder.config.ComponentBaseBean; import org.richfaces.builder.config.ComponentBean; import org.richfaces.builder.generator.ClassPatternSet.PatternEntry; +import org.richfaces.cdk.Logger; /** Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ListenerGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ListenerGenerator.java 2009-07-23 19:40:10 UTC (rev 14995) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ListenerGenerator.java 2009-07-24 01:32:04 UTC (rev 14996) @@ -32,6 +32,7 @@ import org.richfaces.builder.config.BuilderConfig; import org.richfaces.builder.config.ListenerBean; import org.richfaces.builder.config.TagHandlerBean; +import org.richfaces.cdk.Logger; /** * @author Nick - mailto:nbelaevski@exadel.com Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ListenerTagGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ListenerTagGenerator.java 2009-07-23 19:40:10 UTC (rev 14995) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ListenerTagGenerator.java 2009-07-24 01:32:04 UTC (rev 14996) @@ -32,6 +32,7 @@ import org.richfaces.builder.config.BuilderConfig; import org.richfaces.builder.config.ListenerBean; import org.richfaces.builder.config.TagBean; +import org.richfaces.cdk.Logger; /** * Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/Logger.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/Logger.java 2009-07-23 19:40:10 UTC (rev 14995) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/Logger.java 2009-07-24 01:32:04 UTC (rev 14996) @@ -1,63 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.richfaces.builder.generator; - -/** - * @author shura - * - */ -public interface Logger { - - boolean isDebugEnabled(); - - void debug( CharSequence content ); - - void debug( CharSequence content, Throwable error ); - - void debug( Throwable error ); - - boolean isInfoEnabled(); - - void info( CharSequence content ); - - void info( CharSequence content, Throwable error ); - - void info( Throwable error ); - - boolean isWarnEnabled(); - - void warn( CharSequence content ); - - void warn( CharSequence content, Throwable error ); - - void warn( Throwable error ); - - boolean isErrorEnabled(); - - void error( CharSequence content ); - - void error( CharSequence content, Throwable error ); - - void error( Throwable error ); - - -} Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/RendererCompilationContext.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/RendererCompilationContext.java 2009-07-23 19:40:10 UTC (rev 14995) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/RendererCompilationContext.java 2009-07-24 01:32:04 UTC (rev 14996) @@ -22,6 +22,7 @@ package org.richfaces.builder.generator; import org.apache.velocity.Template; +import org.richfaces.cdk.Logger; import org.richfaces.templatecompiler.builder.AbstractCompilationContext; import org.richfaces.templatecompiler.builder.CompilationException; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/RendererGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/RendererGenerator.java 2009-07-23 19:40:10 UTC (rev 14995) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/RendererGenerator.java 2009-07-24 01:32:04 UTC (rev 14996) @@ -33,6 +33,7 @@ import org.richfaces.builder.config.ComponentBaseBean; import org.richfaces.builder.config.ComponentBean; import org.richfaces.builder.config.RendererBean; +import org.richfaces.cdk.Logger; import org.richfaces.templatecompiler.builder.CompilationContext; import org.richfaces.templatecompiler.builder.CompilationException; import org.richfaces.templatecompiler.builder.TemplateCompiler; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ResourcesConfigGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ResourcesConfigGenerator.java 2009-07-23 19:40:10 UTC (rev 14995) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ResourcesConfigGenerator.java 2009-07-24 01:32:04 UTC (rev 14996) @@ -41,6 +41,7 @@ import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.richfaces.builder.config.BuilderConfig; +import org.richfaces.cdk.Logger; import org.xml.sax.Attributes; import org.xml.sax.InputSource; import org.xml.sax.SAXException; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ResourcesConfigParser.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ResourcesConfigParser.java 2009-07-23 19:40:10 UTC (rev 14995) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ResourcesConfigParser.java 2009-07-24 01:32:04 UTC (rev 14996) @@ -44,6 +44,7 @@ import org.richfaces.builder.config.RendererBean; import org.richfaces.builder.config.TagBean; import org.richfaces.builder.config.TagHandlerBean; +import org.richfaces.cdk.Logger; import org.richfaces.templatecompiler.builder.CompilationContext; import org.richfaces.templatecompiler.builder.CompilationException; import org.richfaces.templatecompiler.builder.TemplateCompiler; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ResourcesDependenciesGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ResourcesDependenciesGenerator.java 2009-07-23 19:40:10 UTC (rev 14995) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ResourcesDependenciesGenerator.java 2009-07-24 01:32:04 UTC (rev 14996) @@ -36,6 +36,7 @@ import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.richfaces.builder.config.BuilderConfig; +import org.richfaces.cdk.Logger; /** * @author Nick Belaevski Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/TagHandlerGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/TagHandlerGenerator.java 2009-07-23 19:40:10 UTC (rev 14995) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/TagHandlerGenerator.java 2009-07-24 01:32:04 UTC (rev 14996) @@ -35,6 +35,7 @@ import org.richfaces.builder.config.ComponentBean; import org.richfaces.builder.config.PropertyBean; import org.richfaces.builder.config.TagHandlerBean; +import org.richfaces.cdk.Logger; /** Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/TagTestGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/TagTestGenerator.java 2009-07-23 19:40:10 UTC (rev 14995) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/TagTestGenerator.java 2009-07-24 01:32:04 UTC (rev 14996) @@ -35,6 +35,7 @@ import org.richfaces.builder.config.ComponentBean; import org.richfaces.builder.config.PropertyBean; import org.richfaces.builder.config.TagBean; +import org.richfaces.cdk.Logger; public class TagTestGenerator extends InnerGenerator{ Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/TaglibGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/TaglibGenerator.java 2009-07-23 19:40:10 UTC (rev 14995) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/TaglibGenerator.java 2009-07-24 01:32:04 UTC (rev 14996) @@ -37,6 +37,7 @@ import org.richfaces.builder.config.FunctionBean; import org.richfaces.builder.config.ListenerBean; import org.richfaces.builder.config.ValidatorBean; +import org.richfaces.cdk.Logger; /** Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/TestDataGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/TestDataGenerator.java 2009-07-23 19:40:10 UTC (rev 14995) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/TestDataGenerator.java 2009-07-24 01:32:04 UTC (rev 14996) @@ -26,6 +26,7 @@ import java.util.Map; import org.richfaces.builder.config.PropertyBean; +import org.richfaces.cdk.Logger; /** * @author Nick Belaevski - nbelaevski(a)exadel.com Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/TestDataGenerator2.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/TestDataGenerator2.java 2009-07-23 19:40:10 UTC (rev 14995) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/TestDataGenerator2.java 2009-07-24 01:32:04 UTC (rev 14996) @@ -25,6 +25,7 @@ import java.util.Map; import org.richfaces.builder.config.PropertyBean; +import org.richfaces.cdk.Logger; /** * @author Administrator Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ValidatorGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ValidatorGenerator.java 2009-07-23 19:40:10 UTC (rev 14995) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ValidatorGenerator.java 2009-07-24 01:32:04 UTC (rev 14996) @@ -34,6 +34,7 @@ import org.richfaces.builder.config.BuilderConfig; import org.richfaces.builder.config.PropertyBean; import org.richfaces.builder.config.ValidatorBean; +import org.richfaces.cdk.Logger; /** Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ValidatorTagGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ValidatorTagGenerator.java 2009-07-23 19:40:10 UTC (rev 14995) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/ValidatorTagGenerator.java 2009-07-24 01:32:04 UTC (rev 14996) @@ -35,6 +35,7 @@ import org.richfaces.builder.config.PropertyBean; import org.richfaces.builder.config.TagBean; import org.richfaces.builder.config.ValidatorBean; +import org.richfaces.cdk.Logger; /** Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/XMLConfigGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/XMLConfigGenerator.java 2009-07-23 19:40:10 UTC (rev 14995) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/XMLConfigGenerator.java 2009-07-24 01:32:04 UTC (rev 14996) @@ -27,6 +27,7 @@ import org.richfaces.builder.config.ParsingException; import org.richfaces.builder.xml.XMLBody; +import org.richfaces.cdk.Logger; /** * @author shura Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/JavaLogger.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/JavaLogger.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/JavaLogger.java 2009-07-24 01:32:04 UTC (rev 14996) @@ -0,0 +1,168 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk; + +import java.util.logging.Level; + +/** + * <p class="changed_added_4_0">That logger delegates all calls to the JDK {@link java.util.logging.Logger}</p> + * @author asmirnov(a)exadel.com + * + */ +class JavaLogger implements Logger { + + java.util.logging.Logger jdkLogger = java.util.logging.Logger.getLogger(LoggerFactory.CDK_LOG); + + /* (non-Javadoc) + * @see org.richfaces.cdk.Logger#debug(java.lang.CharSequence) + */ + @Override + public void debug(CharSequence content) { + jdkLogger.fine(String.valueOf(content)); + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.Logger#debug(java.lang.CharSequence, java.lang.Throwable) + */ + @Override + public void debug(CharSequence content, Throwable error) { + jdkLogger.log(Level.FINE, String.valueOf(content), error); + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.Logger#debug(java.lang.Throwable) + */ + @Override + public void debug(Throwable error) { + jdkLogger.log(Level.FINE, "", error); + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.Logger#error(java.lang.CharSequence) + */ + @Override + public void error(CharSequence content) { + jdkLogger.severe(String.valueOf(content)); + + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.Logger#error(java.lang.CharSequence, java.lang.Throwable) + */ + @Override + public void error(CharSequence content, Throwable error) { + jdkLogger.log(Level.SEVERE, String.valueOf(content), error); + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.Logger#error(java.lang.Throwable) + */ + @Override + public void error(Throwable error) { + jdkLogger.log(Level.SEVERE, "", error); + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.Logger#info(java.lang.CharSequence) + */ + @Override + public void info(CharSequence content) { + jdkLogger.info(String.valueOf(content)); + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.Logger#info(java.lang.CharSequence, java.lang.Throwable) + */ + @Override + public void info(CharSequence content, Throwable error) { + jdkLogger.log(Level.INFO, String.valueOf(content), error); + + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.Logger#info(java.lang.Throwable) + */ + @Override + public void info(Throwable error) { + jdkLogger.log(Level.INFO, "", error); + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.Logger#isDebugEnabled() + */ + @Override + public boolean isDebugEnabled() { + return jdkLogger.isLoggable(Level.FINE); + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.Logger#isErrorEnabled() + */ + @Override + public boolean isErrorEnabled() { + return jdkLogger.isLoggable(Level.SEVERE); + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.Logger#isInfoEnabled() + */ + @Override + public boolean isInfoEnabled() { + return jdkLogger.isLoggable(Level.INFO); + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.Logger#isWarnEnabled() + */ + @Override + public boolean isWarnEnabled() { + return jdkLogger.isLoggable(Level.WARNING); + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.Logger#warn(java.lang.CharSequence) + */ + @Override + public void warn(CharSequence content) { + jdkLogger.warning(String.valueOf(content)); + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.Logger#warn(java.lang.CharSequence, java.lang.Throwable) + */ + @Override + public void warn(CharSequence content, Throwable error) { + jdkLogger.log(Level.WARNING, String.valueOf(content), error); + + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.Logger#warn(java.lang.Throwable) + */ + @Override + public void warn(Throwable error) { + jdkLogger.log(Level.WARNING, "", error); + } + +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/JavaLogger.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/Logger.java (from rev 14984, root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/generator/Logger.java) =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/Logger.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/Logger.java 2009-07-24 01:32:04 UTC (rev 14996) @@ -0,0 +1,66 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk; + +/** + * That interface hides current logging system from generator classe. + * Concrete tools ( Maven, Ant, JUnit ) should provide appropriate logger instance that delegates + * messages to the current log system. + * @author shura + * + */ +public interface Logger { + + boolean isDebugEnabled(); + + void debug( CharSequence content ); + + void debug( CharSequence content, Throwable error ); + + void debug( Throwable error ); + + boolean isInfoEnabled(); + + void info( CharSequence content ); + + void info( CharSequence content, Throwable error ); + + void info( Throwable error ); + + boolean isWarnEnabled(); + + void warn( CharSequence content ); + + void warn( CharSequence content, Throwable error ); + + void warn( Throwable error ); + + boolean isErrorEnabled(); + + void error( CharSequence content ); + + void error( CharSequence content, Throwable error ); + + void error( Throwable error ); + + +} Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/LoggerFactory.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/LoggerFactory.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/LoggerFactory.java 2009-07-24 01:32:04 UTC (rev 14996) @@ -0,0 +1,143 @@ +/* + * $Id$ + * + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk; + +/** + * <p class="changed_added_4_0"></p> + * @author asmirnov(a)exadel.com + * + */ +public final class LoggerFactory { + + private static final class LoggerWrapper implements Logger { + @Override + public void debug(CharSequence content) { + logger.debug(content); + } + + @Override + public void debug(CharSequence content, Throwable error) { + logger.debug(content, error); + } + + @Override + public void debug(Throwable error) { + logger.debug(error); + } + + @Override + public void error(CharSequence content) { + logger.error(content); + } + + @Override + public void error(CharSequence content, Throwable error) { + logger.error(content, error); + } + + @Override + public void error(Throwable error) { + logger.error(error); + } + + @Override + public void info(CharSequence content) { + logger.info(content); + } + + @Override + public void info(CharSequence content, Throwable error) { + logger.info(content, error); + } + + @Override + public void info(Throwable error) { + logger.info(error); + } + + @Override + public boolean isDebugEnabled() { + return logger.isDebugEnabled(); + } + + @Override + public boolean isErrorEnabled() { + return logger.isErrorEnabled(); + } + + @Override + public boolean isInfoEnabled() { + return logger.isInfoEnabled(); + } + + @Override + public boolean isWarnEnabled() { + return logger.isWarnEnabled(); + } + + @Override + public void warn(CharSequence content) { + logger.warn(content); + } + + @Override + public void warn(CharSequence content, Throwable error) { + logger.warn(content, error); + + } + + @Override + public void warn(Throwable error) { + logger.warn(error); + } + } + + /** + * <p class="changed_added_4_0">Current logger. By default all calls will be sent to system {@link java.util.logging.Logger}</p> + */ + private static Logger logger = new JavaLogger(); + + /** + * <p class="changed_added_4_0"> + * That constant wraps current logger object to allow access to logger at + * the class instantiation time. + * </p> + */ + private static final Logger wrapper = new LoggerWrapper(); + + public static final String CDK_LOG = "org.richfaces.cdk"; + + private LoggerFactory() { + // That class has static methods only. + } + + public static Logger getLogger(){ + return wrapper; + } + + public static void setLogger(Logger newLogger){ + assert(null != newLogger); + logger = newLogger; + } +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/LoggerFactory.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualFileManager.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualFileManager.java 2009-07-23 19:40:10 UTC (rev 14995) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualFileManager.java 2009-07-24 01:32:04 UTC (rev 14996) @@ -28,18 +28,20 @@ import java.net.URISyntaxException; import java.net.URL; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; import javax.tools.FileObject; import javax.tools.ForwardingJavaFileManager; import javax.tools.JavaFileObject; import javax.tools.StandardJavaFileManager; import javax.tools.StandardLocation; -import javax.tools.JavaFileManager.Location; import javax.tools.JavaFileObject.Kind; +import org.richfaces.cdk.Logger; +import org.richfaces.cdk.LoggerFactory; + /** * <p class="changed_added_4_0">That class wraps {@link StandardJavaFileManager} * </p> @@ -49,6 +51,8 @@ */ final class VirtualFileManager extends ForwardingJavaFileManager<StandardJavaFileManager> { + + private static final Logger log = LoggerFactory.getLogger(); private final List<JavaFileObject> sources; @@ -92,6 +96,9 @@ @Override public JavaFileObject getJavaFileForInput(Location location, String className, Kind kind) throws IOException { + if(log.isDebugEnabled()){ + log.debug("VirtualFileManager.getJavaFileForInput("+String.valueOf(location)+","+className+","+String.valueOf(kind)+")"); + } if (StandardLocation.CLASS_PATH.equals(location)) { String fileName = className.replace('.', '/') + kind.extension; URL resource = getClassPathLoader().getResource(fileName); @@ -113,6 +120,9 @@ @Override public ClassLoader getClassLoader(Location location) { + if(log.isDebugEnabled()){ + log.debug("VirtualFileManager.getClassLoader("+String.valueOf(location)+")"); + } if (StandardLocation.CLASS_PATH.equals(location) || StandardLocation.CLASS_OUTPUT.equals(location)) { return getClassPathLoader(); @@ -132,6 +142,9 @@ @Override public JavaFileObject getJavaFileForOutput(Location location, String className, Kind kind, FileObject sibling) throws IOException { + if(log.isDebugEnabled()){ + log.debug("VirtualFileManager.getJavaFileForOutput("+String.valueOf(location)+","+className+","+String.valueOf(kind)+","+String.valueOf(sibling)+")"); + } JavaFileObject fileForOutput = null; if (StandardLocation.CLASS_OUTPUT.equals(location) && null != getOutputDirectory()) { @@ -152,6 +165,9 @@ @Override public boolean hasLocation(Location location) { boolean hasLocation; + if(log.isDebugEnabled()){ + log.debug("VirtualFileManager.hasLocation("+String.valueOf(location)+")"); + } if (StandardLocation.SOURCE_PATH.equals(location)) { hasLocation = null != getJavaSourceDirectory() || !getSources().isEmpty(); } else if (StandardLocation.CLASS_OUTPUT.equals(location)) { @@ -165,11 +181,106 @@ @Override public Iterable<JavaFileObject> list(Location location, String packageName, Set<Kind> kinds, boolean recurse) throws IOException { + if(log.isDebugEnabled()){ + log.debug("VirtualFileManager.list("+String.valueOf(location)+","+packageName+","+String.valueOf(kinds)+","+String.valueOf(recurse)+")"); + } Iterable<JavaFileObject> list = super.list(location, packageName, kinds, recurse); return list; } + + + /* (non-Javadoc) + * @see javax.tools.ForwardingJavaFileManager#close() + */ + @Override + public void close() throws IOException { + if(log.isDebugEnabled()){ + log.debug("VirtualFileManager.close()"); + } + super.close(); + } + + /* (non-Javadoc) + * @see javax.tools.ForwardingJavaFileManager#flush() + */ + @Override + public void flush() throws IOException { + if(log.isDebugEnabled()){ + log.debug("VirtualFileManager.flush()"); + } + super.flush(); + } + + /* (non-Javadoc) + * @see javax.tools.ForwardingJavaFileManager#getFileForInput(javax.tools.JavaFileManager.Location, java.lang.String, java.lang.String) + */ + @Override + public FileObject getFileForInput(Location location, String packageName, + String relativeName) throws IOException { + if(log.isDebugEnabled()){ + log.debug("VirtualFileManager.getFileForInput("+String.valueOf(location)+","+packageName+","+relativeName+")"); + } + return super.getFileForInput(location, packageName, relativeName); + } + + /* (non-Javadoc) + * @see javax.tools.ForwardingJavaFileManager#getFileForOutput(javax.tools.JavaFileManager.Location, java.lang.String, java.lang.String, javax.tools.FileObject) + */ + @Override + public FileObject getFileForOutput(Location location, String packageName, + String relativeName, FileObject sibling) throws IOException { + if(log.isDebugEnabled()){ + log.debug("VirtualFileManager.getFileForOutput("+String.valueOf(location)+","+packageName+","+relativeName+","+String.valueOf(sibling)+")"); + } + return super.getFileForOutput(location, packageName, relativeName, sibling); + } + + /* (non-Javadoc) + * @see javax.tools.ForwardingJavaFileManager#handleOption(java.lang.String, java.util.Iterator) + */ + @Override + public boolean handleOption(String current, Iterator<String> remaining) { + if(log.isDebugEnabled()){ + log.debug("VirtualFileManager.handleOption("+current+",remaining)"); + } + return super.handleOption(current, remaining); + } + + /* (non-Javadoc) + * @see javax.tools.ForwardingJavaFileManager#inferBinaryName(javax.tools.JavaFileManager.Location, javax.tools.JavaFileObject) + */ + @Override + public String inferBinaryName(Location location, JavaFileObject file) { + if(log.isDebugEnabled()){ + log.debug("VirtualFileManager.inferBinaryName("+String.valueOf(location)+","+String.valueOf(file)+")"); + } + return super.inferBinaryName(location, file); + } + + /* (non-Javadoc) + * @see javax.tools.ForwardingJavaFileManager#isSameFile(javax.tools.FileObject, javax.tools.FileObject) + */ + @Override + public boolean isSameFile(FileObject a, FileObject b) { + if(log.isDebugEnabled()){ + log.debug("VirtualFileManager.isSameFile("+String.valueOf(a)+","+String.valueOf(b)+")"); + } + return super.isSameFile(a, b); + } + + /* (non-Javadoc) + * @see javax.tools.ForwardingJavaFileManager#isSupportedOption(java.lang.String) + */ + @Override + public int isSupportedOption(String option) { + if(log.isDebugEnabled()){ + log.debug("VirtualFileManager.isSupportedOption("+option+")"); + } + return super.isSupportedOption(option); + } + /** * <p class="changed_added_4_0"></p> * Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ProcessorTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ProcessorTest.java 2009-07-23 19:40:10 UTC (rev 14995) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ProcessorTest.java 2009-07-24 01:32:04 UTC (rev 14996) @@ -35,6 +35,9 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import java.util.logging.Level; +import java.util.logging.LogManager; +import java.util.logging.Logger; import javax.annotation.processing.RoundEnvironment; import javax.lang.model.element.Element; @@ -50,6 +53,8 @@ import javax.tools.JavaCompiler.CompilationTask; import javax.tools.JavaFileObject.Kind; +import org.richfaces.cdk.LoggerFactory; + import junit.framework.TestCase; /** @@ -75,6 +80,7 @@ */ protected void setUp() throws Exception { super.setUp(); + Logger.getLogger(LoggerFactory.CDK_LOG).setLevel(Level.ALL); } /* Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/VirtualFileTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/VirtualFileTest.java 2009-07-23 19:40:10 UTC (rev 14995) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/VirtualFileTest.java 2009-07-24 01:32:04 UTC (rev 14996) @@ -32,7 +32,6 @@ import javax.tools.JavaFileObject.Kind; -import sun.reflect.ReflectionFactory.GetReflectionFactoryAction; import junit.framework.TestCase;