You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2007/08/27 00:24:07 UTC
svn commit: r569893 [1/6] - in /tapestry/tapestry5/trunk: ./ .settings/
quickstart/src/main/resources/archetype-resources/src/main/java/services/
src/site/ src/site/resources/ src/site/xdoc/ support/ tapestry-core/
tapestry-core/src/main/java/org/apach...
Author: hlship
Date: Sun Aug 26 15:23:55 2007
New Revision: 569893
URL: http://svn.apache.org/viewvc?rev=569893&view=rev
Log:
TAPESTRY-1704: Convert dependencies from commons-logging to SLF4J
Added:
tapestry/tapestry5/trunk/.settings/
tapestry/tapestry5/trunk/.settings/org.eclipse.jdt.core.prefs
tapestry/tapestry5/trunk/.settings/org.eclipse.jdt.ui.prefs
tapestry/tapestry5/trunk/support/new-project
- copied unchanged from r569853, tapestry/tapestry5/trunk/support/new-project.rb
tapestry/tapestry5/trunk/support/sign-and-upload
- copied unchanged from r569853, tapestry/tapestry5/trunk/support/sign-and-upload.rb
tapestry/tapestry5/trunk/support/update-copyrights
- copied unchanged from r569853, tapestry/tapestry5/trunk/support/update-copyrights.rb
tapestry/tapestry5/trunk/support/update-eclipse (with props)
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxFilter.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONArray.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONObject.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONString.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONTokener.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/json/
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/json/JSONObjectTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/logging.apt
Removed:
tapestry/tapestry5/trunk/support/new-project.rb
tapestry/tapestry5/trunk/support/sign-and-upload.rb
tapestry/tapestry5/trunk/support/update-copyrights.rb
Modified:
tapestry/tapestry5/trunk/ (props changed)
tapestry/tapestry5/trunk/.classpath
tapestry/tapestry5/trunk/pom.xml
tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/services/AppModule.java
tapestry/tapestry5/trunk/src/site/resources/tap5devwiki.xml
tapestry/tapestry5/trunk/src/site/site.xml
tapestry/tapestry5/trunk/src/site/xdoc/release-notes.xml
tapestry/tapestry5/trunk/support/tapestry-ioc.launch
tapestry/tapestry5/trunk/tapestry-core/pom.xml
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ComponentResourcesCommon.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/TapestryFilter.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/SyntheticModuleDef.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/model/MutableComponentModelImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AliasManagerImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CommonResourcesInjectionProvider.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassTransformerImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstanceResultProcessor.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultRequestExceptionHandler.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformationImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalModule.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLoaderProcessor.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageMarkupRendererImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PagePoolImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RenderQueueImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TemplateParserImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/ComponentPageElementImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/InternalComponentResourcesImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/Page.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/PageImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableRequestImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/model/ComponentModel.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ClassTransformation.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/Request.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/RequestFilter.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/RequestHandler.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java
tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/services/AppModule.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/services/MusicLibraryParser.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/model/MutableComponentModelImplTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AliasManagerImplTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ApplicationStateWorkerTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentInstanceResultProcessorTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImplTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageLoaderImplTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PagePoolImplTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ParameterWorkerTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/RenderQueueImplTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/RequestImplTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/structure/PageImplTest.java
tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/HibernateSessionSourceImpl.java
tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/apache/tapestry/internal/hibernate/HibernateSessionSourceImplTest.java
tapestry/tapestry5/trunk/tapestry-ioc/pom.xml
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/LogSource.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/RegistryBuilder.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ServiceResources.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/def/ModuleDef.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/AbstractServiceCreator.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ConstructorServiceCreator.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/InternalRegistry.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/LogSourceImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/Module.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ModuleImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/RecursiveServiceCreationCheckWrapper.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/RegistryImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ServiceBuilderMethodInvoker.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ServiceDecoratorImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ServiceResourcesImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ValidatingConfigurationWrapper.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ValidatingMappedConfigurationWrapper.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ValidatingOrderedConfigurationWrapper.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/AbstractFab.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/BridgeBuilder.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/ClassFabImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/ClassFactoryImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/LoggingDecoratorImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/PipelineBuilderImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/RegistryShutdownHubImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/ServiceLogger.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/ThreadCleanupHubImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/DependencyNode.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/Orderer.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/LoggingDecorator.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/PipelineBuilder.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/test/IOCTestCase.java
tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/decorator.apt
tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/module.apt
tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/run.apt
tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/service.apt
tapestry/tapestry5/trunk/tapestry-ioc/src/site/site.xml
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImplTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/LogSourceImplTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ModuleImplTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/RecursiveServiceCreationCheckWrapperTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ServiceBuilderMethodFixture.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ServiceBuilderMethodInvokerTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ServiceDecoratorImplTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ValidatingConfigurationWrapperTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ValidatingMappedConfigurationWrapperTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ValidatingOrderedConfigurationWrapperTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/BridgeBuilderTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ClassFabImplTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/LoggingDecoratorImplTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/PipelineBuilderImplTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/RegistryShutdownHubImplTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ServiceLoggerTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ThreadCleanupHubImplTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/OrdererTest.java
tapestry/tapestry5/trunk/tapestry-spring/pom.xml
tapestry/tapestry5/trunk/tapestry-spring/src/main/java/org/apache/tapestry/internal/spring/SpringModuleDef.java
tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/RandomDataSource.java
tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/services/AppModule.java
Propchange: tapestry/tapestry5/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Aug 26 15:23:55 2007
@@ -1,2 +1,4 @@
bin
target
+bin-test
+temp-testng-customsuite.xml
Modified: tapestry/tapestry5/trunk/.classpath
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/.classpath?rev=569893&r1=569892&r2=569893&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/.classpath (original)
+++ tapestry/tapestry5/trunk/.classpath Sun Aug 26 15:23:55 2007
@@ -1,32 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="tapestry-core/src/test/java"/>
- <classpathentry kind="src" path="tapestry-tutorial1/src/test/java"/>
- <classpathentry kind="src" path="tapestry-hibernate/src/main/java"/>
- <classpathentry kind="src" path="tapestry-hibernate/src/test/java"/>
- <classpathentry kind="src" path="tapestry-core/src/main/java"/>
- <classpathentry kind="src" path="tapestry-test/src/main/java"/>
- <classpathentry kind="src" path="tapestry-component-report/src/main/java"/>
- <classpathentry kind="src" path="tapestry-ioc/src/test/java"/>
- <classpathentry kind="src" path="tapestry-upload/src/main/java"/>
- <classpathentry kind="src" path="tapestry-spring/src/main/java"/>
- <classpathentry kind="src" path="tapestry-ioc/src/main/java"/>
- <classpathentry kind="src" path="tapestry-spring/src/test/java"/>
- <classpathentry kind="src" path="tapestry-tutorial1/src/main/java"/>
- <classpathentry kind="src" path="tapestry-upload/src/test/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="lib" path="tapestry-core/src/main/resources"/>
- <classpathentry kind="lib" path="tapestry-core/src/test/resources"/>
- <classpathentry kind="lib" path="tapestry-hibernate/src/main/resources"/>
- <classpathentry kind="lib" path="tapestry-hibernate/src/test/resources"/>
- <classpathentry kind="lib" path="tapestry-ioc/src/main/resources"/>
- <classpathentry kind="lib" path="tapestry-ioc/src/test/resources"/>
- <classpathentry kind="lib" path="tapestry-spring/src/main/resources"/>
- <classpathentry kind="lib" path="tapestry-spring/src/test/resources"/>
- <classpathentry kind="lib" path="tapestry-test/src/main/resources"/>
- <classpathentry kind="lib" path="tapestry-tutorial1/src/main/resources"/>
- <classpathentry kind="lib" path="tapestry-tutorial1/src/test/resources"/>
- <classpathentry kind="lib" path="tapestry-upload/src/main/resources"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="src" output="bin" path="tapestry-component-report/src/main/java"/>
+ <classpathentry kind="src" output="bin" path="tapestry-core/src/main/java"/>
+ <classpathentry kind="src" output="bin-test" path="tapestry-core/src/test/java"/>
+ <classpathentry kind="src" output="bin" path="tapestry-hibernate/src/main/java"/>
+ <classpathentry kind="src" output="bin-test" path="tapestry-hibernate/src/test/java"/>
+ <classpathentry kind="src" output="bin" path="tapestry-ioc/src/main/java"/>
+ <classpathentry kind="src" output="bin-test" path="tapestry-ioc/src/test/java"/>
+ <classpathentry kind="src" output="bin" path="tapestry-spring/src/main/java"/>
+ <classpathentry kind="src" output="bin-test" path="tapestry-spring/src/test/java"/>
+ <classpathentry kind="src" output="bin" path="tapestry-test/src/main/java"/>
+ <classpathentry kind="src" output="bin" path="tapestry-tutorial1/src/main/java"/>
+ <classpathentry kind="src" output="bin-test" path="tapestry-tutorial1/src/test/java"/>
+ <classpathentry kind="src" output="bin" path="tapestry-upload/src/main/java"/>
+ <classpathentry kind="src" output="bin-test" path="tapestry-upload/src/test/java"/>
+ <classpathentry kind="lib" path="quickstart/src/main/resources"/>
+ <classpathentry kind="lib" path="tapestry-core/src/main/resources"/>
+ <classpathentry kind="lib" path="tapestry-core/src/test/resources"/>
+ <classpathentry kind="lib" path="tapestry-hibernate/src/main/resources"/>
+ <classpathentry kind="lib" path="tapestry-hibernate/src/test/resources"/>
+ <classpathentry kind="lib" path="tapestry-ioc/src/main/resources"/>
+ <classpathentry kind="lib" path="tapestry-ioc/src/test/resources"/>
+ <classpathentry kind="lib" path="tapestry-spring/src/main/resources"/>
+ <classpathentry kind="lib" path="tapestry-spring/src/test/resources"/>
+ <classpathentry kind="lib" path="tapestry-test/src/main/resources"/>
+ <classpathentry kind="lib" path="tapestry-tutorial1/src/main/resources"/>
+ <classpathentry kind="lib" path="tapestry-tutorial1/src/test/resources"/>
+ <classpathentry kind="lib" path="tapestry-upload/src/main/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="bin"/>
</classpath>
Added: tapestry/tapestry5/trunk/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/.settings/org.eclipse.jdt.core.prefs?rev=569893&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/.settings/org.eclipse.jdt.core.prefs (added)
+++ tapestry/tapestry5/trunk/.settings/org.eclipse.jdt.core.prefs Sun Aug 26 15:23:55 2007
@@ -0,0 +1,57 @@
+#Mon Jul 30 09:36:58 PDT 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nullReference=ignore
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.5
Added: tapestry/tapestry5/trunk/.settings/org.eclipse.jdt.ui.prefs
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/.settings/org.eclipse.jdt.ui.prefs?rev=569893&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/.settings/org.eclipse.jdt.ui.prefs (added)
+++ tapestry/tapestry5/trunk/.settings/org.eclipse.jdt.ui.prefs Sun Aug 26 15:23:55 2007
@@ -0,0 +1,3 @@
+#Mon Jul 30 09:36:58 PDT 2007
+eclipse.preferences.version=1
+internal.default.compliance=default
Modified: tapestry/tapestry5/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/pom.xml?rev=569893&r1=569892&r2=569893&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/pom.xml (original)
+++ tapestry/tapestry5/trunk/pom.xml Sun Aug 26 15:23:55 2007
@@ -77,13 +77,13 @@
<module>tapestry-test</module>
<module>tapestry-ioc</module>
<module>tapestry-core</module>
+
+
<module>tapestry-spring</module>
<module>tapestry-hibernate</module>
<module>tapestry-upload</module>
-
- <!-- Temporarily removed until the project is named correctly and set up with a trunk, etc.
- <module>tapestry-Workbench</module>
- -->
+
+
<!-- Now we're getting into the archetypes. -->
<module>quickstart</module>
<!-- And the Maven plugin. -->
@@ -97,32 +97,26 @@
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.9</version>
- <scope>test</scope>
- </dependency>
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>jboss</groupId>
<artifactId>javassist</artifactId>
<version>3.4.ga</version>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- </dependency>
+
+
+
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.2</version>
+ <version>2.3</version>
<scope>test</scope>
</dependency>
Modified: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/services/AppModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/services/AppModule.java?rev=569893&r1=569892&r2=569893&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/services/AppModule.java (original)
+++ tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/services/AppModule.java Sun Aug 26 15:23:55 2007
@@ -2,7 +2,6 @@
import java.io.IOException;
-import org.apache.commons.logging.Log;
import org.apache.tapestry.ioc.MappedConfiguration;
import org.apache.tapestry.ioc.OrderedConfiguration;
import org.apache.tapestry.ioc.ServiceBinder;
@@ -11,6 +10,7 @@
import org.apache.tapestry.services.RequestFilter;
import org.apache.tapestry.services.RequestHandler;
import org.apache.tapestry.services.Response;
+import org.slf4j.Logger;
/**
* This module is automatically included as part of the Tapestry IoC Registry, it's a good place to
@@ -60,7 +60,7 @@
* a service named "RequestFilter" we use an explicit service id that we can reference
* inside the contribution method.
*/
- public RequestFilter buildTimingFilter(final Log log)
+ public RequestFilter buildTimingFilter(final Logger log)
{
return new RequestFilter()
{
Modified: tapestry/tapestry5/trunk/src/site/resources/tap5devwiki.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/src/site/resources/tap5devwiki.xml?rev=569893&r1=569892&r2=569893&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/src/site/resources/tap5devwiki.xml (original)
+++ tapestry/tapestry5/trunk/src/site/resources/tap5devwiki.xml Sun Aug 26 15:23:55 2007
@@ -1,4 +1,20 @@
<?xml version="1.0"?>
+<!--
+ Copyright 2007 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
<rss version="2.0">
<channel>
<title>Tapestry 5 Brain Dump</title>
Modified: tapestry/tapestry5/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/src/site/site.xml?rev=569893&r1=569892&r2=569893&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/src/site/site.xml (original)
+++ tapestry/tapestry5/trunk/src/site/site.xml Sun Aug 26 15:23:55 2007
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Copyright 2007 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
<project name="Apache Tapestry">
<bannerLeft>
<name>Tapestry 5</name>
Modified: tapestry/tapestry5/trunk/src/site/xdoc/release-notes.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/src/site/xdoc/release-notes.xml?rev=569893&r1=569892&r2=569893&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/src/site/xdoc/release-notes.xml (original)
+++ tapestry/tapestry5/trunk/src/site/xdoc/release-notes.xml Sun Aug 26 15:23:55 2007
@@ -1,4 +1,20 @@
<document>
+<!--
+ Copyright 2007 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
<properties>
<title>Tapestry Project Release Notes</title>
</properties>
Modified: tapestry/tapestry5/trunk/support/tapestry-ioc.launch
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/support/tapestry-ioc.launch?rev=569893&r1=569892&r2=569893&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/support/tapestry-ioc.launch (original)
+++ tapestry/tapestry5/trunk/support/tapestry-ioc.launch Sun Aug 26 15:23:55 2007
@@ -7,6 +7,7 @@
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="tapestry5"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
</listAttribute>
<mapAttribute key="org.testng.eclipse.ALL_CLASS_METHODS"/>
<listAttribute key="org.testng.eclipse.SUITE_TEST_LIST">
Added: tapestry/tapestry5/trunk/support/update-eclipse
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/support/update-eclipse?rev=569893&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/support/update-eclipse (added)
+++ tapestry/tapestry5/trunk/support/update-eclipse Sun Aug 26 15:23:55 2007
@@ -0,0 +1,140 @@
+#!/usr/bin/ruby
+
+# This script is used to update the Eclipse .classpath file for the master project; it is used when
+# a module is added or removed, or when a src folder is added or removed from a module.
+#
+# It assumes the layout of each module conforms to Datatech's normal layout:
+# - src
+# - test
+# - resources
+# - test-resources
+#
+# This script must be executed from the root project directory (the directory containing the master pom.xml, and containing
+# the directories for the modules).
+
+# TODO: Update the .classpath in each module
+# TODO: Generated IDEA control files as well
+
+require 'optparse'
+
+# Rub gems: Think of it as Maven for Ruby but not brain-damaged. See http://www.rubygems.org/read/book/1
+
+require 'rubygems'
+
+# This script requires the Ruby gem hpricot ("gem install hpricot"). It was built with version 0.6.
+# http://code.whytheluckystiff.net/hpricot
+
+require 'hpricot'
+
+$dryrun = false
+
+$opts = OptionParser.new do |opts|
+ opts.banner = "Usage: update-eclipse [options]"
+
+ opts.on("-d", "--dry-run", "Show the generated POM but don't write anything") do
+ $dryrun = true
+ end
+
+ opts.on("-h", "--help", "Help for this command") do
+ puts opts
+ exit
+ end
+
+end
+
+def fail(message)
+ puts "Error: #{message}"
+ puts $opts
+end
+
+begin
+ $opts.parse!
+rescue OptionParser::InvalidOption
+ fail $!
+end
+
+def exist(mod_name, folder)
+ path = "#{mod_name}/#{folder}"
+
+ if File.directory?(path)
+ yield path
+ end
+end
+
+def add_source_folder(mod_name, folder, output_dir)
+ exist(mod_name, folder) do |path|
+ $classpath << %Q{ <classpathentry kind="src" output="#{output_dir}" path="#{path}"/>}
+ end
+end
+
+def add_class_folder(mod_name, folder)
+ exist(mod_name, folder) do |path|
+ $lib_classpath << %Q{ <classpathentry kind="lib" path="#{path}"/>}
+ end
+end
+
+def add_module(mod_name)
+ add_source_folder(mod_name, "src/main/java", "bin");
+ add_source_folder(mod_name, "src/test/java", "bin-test")
+
+ add_class_folder(mod_name, "src/main/resources")
+ add_class_folder(mod_name, "src/test/resources")
+end
+
+$master_pom = open("pom.xml") do |f|
+ Hpricot.XML(f)
+end
+
+
+# We're going to build up the classpath a line at a time. This part is always the same:
+
+$classpath = [
+ %Q{<?xml version="1.0" encoding="UTF-8"?>},
+ "<classpath>"
+]
+
+# I like the resource folders to be organized at the bottom of the list, after all source folders.
+# So we use a temporary buffer to collect those lines and add them all in at the end.
+
+$lib_classpath = []
+
+$modules = []
+
+($master_pom/"project/modules/module").each { |elem| $modules << elem.inner_html }
+
+# Add entries for each module
+
+$modules.sort.each { |mod_name| add_module(mod_name) }
+
+# Add in the libraries (i.e. class folders)
+
+$classpath.concat($lib_classpath)
+
+# And this stuff is attached to the end.
+
+$classpath.concat [
+ %Q{ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>},
+ %Q{ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>},
+ %Q{ <classpathentry kind="output" path="bin"/>},
+ %Q{</classpath>}
+ ]
+
+# And we're done!
+
+if $dryrun
+ puts "Generated .classpath:"
+ $classpath.each { |s| puts s }
+ exit
+end
+
+# Write out the updated .classpath
+
+File.open(".classpath", "w") do |file|
+ $classpath.each do |line|
+ file.print line
+ file.print "\n"
+ end
+end
+
+puts "Updated .classpath successfully."
+
Propchange: tapestry/tapestry5/trunk/support/update-eclipse
------------------------------------------------------------------------------
svn:executable = *
Modified: tapestry/tapestry5/trunk/tapestry-core/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/pom.xml?rev=569893&r1=569892&r2=569893&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/pom.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-core/pom.xml Sun Aug 26 15:23:55 2007
@@ -5,10 +5,10 @@
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-core</artifactId>
<packaging>jar</packaging>
- <parent>
+ <parent>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-project</artifactId>
- <version>5.0.6-SNAPSHOT</version>
+ <version>5.0.6-SNAPSHOT</version>
</parent>
<name>Tapestry Core Library</name>
<inceptionYear>2006</inceptionYear>
@@ -24,8 +24,6 @@
<!-- This would be test, but we provide a few base classes that depend on TestNG, which is provided by tapestry-test. -->
<scope>provided</scope>
</dependency>
- <!-- This should be a transitive dependency from tapestry-ioc, but for some reason,
- it needs to be explicitly listed. -->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
@@ -39,10 +37,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
</dependency>
</dependencies>
<build>
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ComponentResourcesCommon.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ComponentResourcesCommon.java?rev=569893&r1=569892&r2=569893&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ComponentResourcesCommon.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ComponentResourcesCommon.java Sun Aug 26 15:23:55 2007
@@ -16,13 +16,13 @@
import java.util.Locale;
-import org.apache.commons.logging.Log;
import org.apache.tapestry.annotations.OnEvent;
import org.apache.tapestry.internal.services.OnEventWorker;
import org.apache.tapestry.internal.structure.ComponentPageElement;
import org.apache.tapestry.ioc.Locatable;
import org.apache.tapestry.model.ComponentModel;
import org.apache.tapestry.services.ComponentSource;
+import org.slf4j.Logger;
/**
* Operations shared by the public {@link ComponentResources} interface and
@@ -118,9 +118,9 @@
* Returns the log instance associated with the component (which is based on the component or
* mixin's class name).
*
- * @see ComponentModel#getLog()
+ * @see ComponentModel#getLogger()
*/
- Log getLog();
+ Logger getLogger();
/** Returns the locale for the page containing this component. */
Locale getLocale();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/TapestryFilter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/TapestryFilter.java?rev=569893&r1=569892&r2=569893&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/TapestryFilter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/TapestryFilter.java Sun Aug 26 15:23:55 2007
@@ -28,8 +28,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+
import org.apache.tapestry.internal.ServletContextSymbolProvider;
import org.apache.tapestry.internal.TapestryAppInitializer;
import org.apache.tapestry.ioc.Registry;
@@ -37,6 +36,8 @@
import org.apache.tapestry.ioc.services.SymbolProvider;
import org.apache.tapestry.services.HttpServletRequestHandler;
import org.apache.tapestry.services.ServletApplicationInitializer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The TapestryFilter is responsible for intercepting all requests into the web application. It
@@ -45,7 +46,7 @@
*/
public class TapestryFilter implements Filter
{
- private final Log _log = LogFactory.getLog(TapestryFilter.class);
+ private final Logger _logger = LoggerFactory.getLogger(TapestryFilter.class);
private FilterConfig _config;
@@ -95,7 +96,7 @@
long toFinish = System.currentTimeMillis();
- _log.info(format("Startup time: %,d ms to build IoC Registry, %,d ms overall.", toRegistry
+ _logger.info(format("Startup time: %,d ms to build IoC Registry, %,d ms overall.", toRegistry
- start, toFinish - start));
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/SyntheticModuleDef.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/SyntheticModuleDef.java?rev=569893&r1=569892&r2=569893&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/SyntheticModuleDef.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/SyntheticModuleDef.java Sun Aug 26 15:23:55 2007
@@ -55,7 +55,7 @@
}
/** Returns "SyntheticModule". */
- public String getLogName()
+ public String getLoggerName()
{
return "SyntheticModule";
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/model/MutableComponentModelImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/model/MutableComponentModelImpl.java?rev=569893&r1=569892&r2=569893&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/model/MutableComponentModelImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/model/MutableComponentModelImpl.java Sun Aug 26 15:23:55 2007
@@ -23,7 +23,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
import org.apache.tapestry.ioc.Location;
import org.apache.tapestry.ioc.Resource;
import org.apache.tapestry.ioc.internal.util.IdAllocator;
@@ -33,6 +32,7 @@
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.model.MutableEmbeddedComponentModel;
import org.apache.tapestry.model.ParameterModel;
+import org.slf4j.Logger;
/**
* Internal implementation of {@link org.apache.tapestry.model.MutableComponentModel}.
@@ -47,7 +47,7 @@
private final IdAllocator _persistentFieldNameAllocator = new IdAllocator();
- private final Log _log;
+ private final Logger _logger;
private Map<String, ParameterModel> _parameters;
@@ -64,11 +64,11 @@
private Map<String, String> _metaData;
- public MutableComponentModelImpl(String componentClassName, Log log, Resource baseResource,
+ public MutableComponentModelImpl(String componentClassName, Logger logger, Resource baseResource,
ComponentModel parentModel)
{
_componentClassName = componentClassName;
- _log = log;
+ _logger = logger;
_baseResource = baseResource;
_parentModel = parentModel;
@@ -89,9 +89,9 @@
return String.format("ComponentModel[%s]", _componentClassName);
}
- public Log getLog()
+ public Logger getLogger()
{
- return _log;
+ return _logger;
}
public Resource getBaseResource()
Added: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxFilter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxFilter.java?rev=569893&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxFilter.java (added)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxFilter.java Sun Aug 26 15:23:55 2007
@@ -0,0 +1,40 @@
+// Copyright 2007 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry.internal.services;
+
+import org.apache.tapestry.services.ActionResponseGenerator;
+import org.apache.tapestry.services.ComponentActionRequestFilter;
+import org.apache.tapestry.services.ComponentActionRequestHandler;
+
+/**
+ * A filter that intercepts Ajax-oriented requests, thos that originate on the client-side using
+ * XmlHttpRequest. In these cases, the action processing occurs normally, but the response is quite
+ * different.
+ */
+public class AjaxFilter implements ComponentActionRequestFilter
+{
+ public ActionResponseGenerator handle(String logicalPageName, String nestedComponentId,
+ String eventType, String[] context, String[] activationContext,
+ ComponentActionRequestHandler handler)
+ {
+ return handler.handle(
+ logicalPageName,
+ nestedComponentId,
+ eventType,
+ context,
+ activationContext);
+ }
+
+}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AliasManagerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AliasManagerImpl.java?rev=569893&r1=569892&r2=569893&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AliasManagerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AliasManagerImpl.java Sun Aug 26 15:23:55 2007
@@ -19,19 +19,19 @@
import java.util.Collection;
import java.util.Map;
-import org.apache.commons.logging.Log;
import org.apache.tapestry.services.AliasContribution;
import org.apache.tapestry.services.AliasManager;
+import org.slf4j.Logger;
public class AliasManagerImpl implements AliasManager
{
- private final Log _log;
+ private final Logger _logger;
private final Collection<AliasContribution> _contributions;
- public AliasManagerImpl(Log log, Collection<AliasContribution> contributions)
+ public AliasManagerImpl(Logger logger, Collection<AliasContribution> contributions)
{
- _log = log;
+ _logger = logger;
_contributions = contributions;
}
@@ -61,7 +61,7 @@
if (existing != null)
{
- _log.error(ServicesMessages.duplicateContribution(
+ _logger.error(ServicesMessages.duplicateContribution(
ic.getObject(),
contributionType,
existing));
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CommonResourcesInjectionProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CommonResourcesInjectionProvider.java?rev=569893&r1=569892&r2=569893&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CommonResourcesInjectionProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CommonResourcesInjectionProvider.java Sun Aug 26 15:23:55 2007
@@ -19,12 +19,12 @@
import java.util.Locale;
import java.util.Map;
-import org.apache.commons.logging.Log;
import org.apache.tapestry.ioc.Messages;
import org.apache.tapestry.ioc.ObjectLocator;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
import org.apache.tapestry.services.InjectionProvider;
+import org.slf4j.Logger;
/**
* Allows for a number of anonymous injections based on the type of field that is to be injected.
@@ -37,7 +37,7 @@
{
add(Messages.class, "getMessages");
add(Locale.class, "getLocale");
- add(Log.class, "getLog");
+ add(Logger.class, "getLogger");
add(String.class, "getCompleteId");
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassTransformerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassTransformerImpl.java?rev=569893&r1=569892&r2=569893&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassTransformerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassTransformerImpl.java Sun Aug 26 15:23:55 2007
@@ -23,7 +23,6 @@
import javassist.CtConstructor;
import javassist.NotFoundException;
-import org.apache.commons.logging.Log;
import org.apache.tapestry.internal.events.InvalidationListener;
import org.apache.tapestry.internal.model.MutableComponentModelImpl;
import org.apache.tapestry.ioc.LogSource;
@@ -32,6 +31,7 @@
import org.apache.tapestry.model.ComponentModel;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ComponentClassTransformWorker;
+import org.slf4j.Logger;
/**
* Implementation of {@link org.apache.tapestry.internal.services.ComponentClassTransformer}.
@@ -103,7 +103,7 @@
String classname = ctClass.getName();
- Log log = _logSource.getLog(classname);
+ Logger logger = _logSource.getLogger(classname);
// If the parent class is in a controlled package, it will already have been loaded and
// transformed (that is driven by the ComponentInstantiatorSource).
@@ -118,13 +118,13 @@
ComponentModel parentModel = _nameToComponentModel.get(parentClassname);
- MutableComponentModel model = new MutableComponentModelImpl(classname, log, baseResource,
- parentModel);
+ MutableComponentModel model = new MutableComponentModelImpl(classname, logger,
+ baseResource, parentModel);
InternalClassTransformation transformation = parentTransformation == null ? new InternalClassTransformationImpl(
- ctClass, classLoader, log, model)
+ ctClass, classLoader, logger, model)
: new InternalClassTransformationImpl(ctClass, parentTransformation, classLoader,
- log, model);
+ logger, model);
try
{
@@ -137,7 +137,8 @@
throw new TransformationException(transformation, ex);
}
- if (log.isDebugEnabled()) log.debug("Finished class transformation: " + transformation);
+ if (logger.isDebugEnabled())
+ logger.debug("Finished class transformation: " + transformation);
_nameToClassTransformation.put(classname, transformation);
_nameToComponentModel.put(classname, model);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstanceResultProcessor.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstanceResultProcessor.java?rev=569893&r1=569892&r2=569893&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstanceResultProcessor.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstanceResultProcessor.java Sun Aug 26 15:23:55 2007
@@ -14,13 +14,13 @@
package org.apache.tapestry.internal.services;
-import org.apache.commons.logging.Log;
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.Link;
import org.apache.tapestry.internal.structure.Page;
import org.apache.tapestry.runtime.Component;
import org.apache.tapestry.services.ActionResponseGenerator;
import org.apache.tapestry.services.ComponentEventResultProcessor;
+import org.slf4j.Logger;
public class ComponentInstanceResultProcessor implements ComponentEventResultProcessor<Component>
{
@@ -28,14 +28,14 @@
private final LinkFactory _linkFactory;
- private final Log _log;
+ private final Logger _logger;
public ComponentInstanceResultProcessor(final RequestPageCache requestPageCache,
- LinkFactory linkFactory, Log log)
+ LinkFactory linkFactory, Logger logger)
{
_requestPageCache = requestPageCache;
_linkFactory = linkFactory;
- _log = log;
+ _logger = logger;
}
public ActionResponseGenerator processComponentEvent(Component value, Component component,
@@ -44,7 +44,7 @@
ComponentResources resources = value.getComponentResources();
if (resources.getContainer() != null)
- _log.warn(ServicesMessages.componentInstanceIsNotAPage(
+ _logger.warn(ServicesMessages.componentInstanceIsNotAPage(
methodDescription,
component,
value));
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImpl.java?rev=569893&r1=569892&r2=569893&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImpl.java Sun Aug 26 15:23:55 2007
@@ -30,7 +30,6 @@
import javassist.NotFoundException;
import javassist.Translator;
-import org.apache.commons.logging.Log;
import org.apache.tapestry.internal.event.InvalidationEventHubImpl;
import org.apache.tapestry.internal.events.UpdateListener;
import org.apache.tapestry.internal.util.URLChangeTracker;
@@ -38,6 +37,7 @@
import org.apache.tapestry.ioc.internal.services.ClassFactoryImpl;
import org.apache.tapestry.ioc.internal.util.Defense;
import org.apache.tapestry.ioc.services.ClassFactory;
+import org.slf4j.Logger;
/**
* A wrapper around a Javassist class loader that allows certain classes to be modified as they are
@@ -64,7 +64,7 @@
private final ComponentClassTransformer _transformer;
- private final Log _log;
+ private final Logger _logger;
private ClassFactory _classFactory;
@@ -92,11 +92,11 @@
}
public ComponentInstantiatorSourceImpl(ClassLoader parent,
- ComponentClassTransformer transformer, Log log)
+ ComponentClassTransformer transformer, Logger logger)
{
_parent = parent;
_transformer = transformer;
- _log = log;
+ _logger = logger;
initializeService();
}
@@ -143,14 +143,14 @@
throw new RuntimeException(ex);
}
- _classFactory = new ClassFactoryImpl(_loader, _classPool, _log);
+ _classFactory = new ClassFactoryImpl(_loader, _classPool, _logger);
}
// This is called from well within a synchronized block.
public void onLoad(ClassPool pool, String classname) throws NotFoundException,
CannotCompileException
{
- _log.debug("BEGIN onLoad " + classname);
+ _logger.debug("BEGIN onLoad " + classname);
// This is our chance to make changes to the CtClass before it is loaded into memory.
@@ -186,7 +186,7 @@
}
finally
{
- _log.debug(String.format("%5s onLoad %s", diag, classname));
+ _logger.debug(String.format("%5s onLoad %s", diag, classname));
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultRequestExceptionHandler.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultRequestExceptionHandler.java?rev=569893&r1=569892&r2=569893&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultRequestExceptionHandler.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultRequestExceptionHandler.java Sun Aug 26 15:23:55 2007
@@ -16,11 +16,11 @@
import java.io.IOException;
-import org.apache.commons.logging.Log;
import org.apache.tapestry.internal.structure.Page;
import org.apache.tapestry.services.ExceptionReporter;
import org.apache.tapestry.services.RequestExceptionHandler;
import org.apache.tapestry.services.Response;
+import org.slf4j.Logger;
/**
* Default implementation of {@link RequestExceptionHandler} that displays the standard
@@ -34,20 +34,20 @@
private final Response _response;
- private final Log _log;
+ private final Logger _logger;
public DefaultRequestExceptionHandler(RequestPageCache pageCache,
- PageResponseRenderer renderer, Response response, Log log)
+ PageResponseRenderer renderer, Response response, Logger logger)
{
_pageCache = pageCache;
_renderer = renderer;
_response = response;
- _log = log;
+ _logger = logger;
}
public void handleRequestException(Throwable exception) throws IOException
{
- _log.error(ServicesMessages.requestException(exception), exception);
+ _logger.error(ServicesMessages.requestException(exception), exception);
Page page = _pageCache.get("ExceptionReport");
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformationImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformationImpl.java?rev=569893&r1=569892&r2=569893&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformationImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformationImpl.java Sun Aug 26 15:23:55 2007
@@ -43,7 +43,6 @@
import javassist.expr.ExprEditor;
import javassist.expr.FieldAccess;
-import org.apache.commons.logging.Log;
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.internal.InternalComponentResources;
import org.apache.tapestry.internal.util.MultiKey;
@@ -56,6 +55,7 @@
import org.apache.tapestry.services.MethodFilter;
import org.apache.tapestry.services.MethodSignature;
import org.apache.tapestry.services.TransformUtils;
+import org.slf4j.Logger;
/**
* Implementation of the {@link org.apache.tapestry.internal.services.InternalClassTransformation}
@@ -67,7 +67,7 @@
private final CtClass _ctClass;
- private final Log _log;
+ private final Logger _logger;
private final InternalClassTransformation _parentTransformation;
@@ -126,7 +126,7 @@
* This is a constructor for the root class, the class that directly contains the ComponentClass
* annotation.
*/
- public InternalClassTransformationImpl(CtClass ctClass, ClassLoader loader, Log log,
+ public InternalClassTransformationImpl(CtClass ctClass, ClassLoader loader, Logger logger,
ComponentModel componentModel)
{
_ctClass = ctClass;
@@ -137,7 +137,7 @@
_idAllocator = new IdAllocator();
- _log = log;
+ _logger = logger;
preloadMemberNames();
@@ -158,13 +158,13 @@
}
public InternalClassTransformationImpl(CtClass ctClass,
- InternalClassTransformation parentTransformation, ClassLoader loader, Log log,
+ InternalClassTransformation parentTransformation, ClassLoader loader, Logger logger,
ComponentModel componentModel)
{
_ctClass = ctClass;
_classPool = _ctClass.getClassPool();
_loader = loader;
- _log = log;
+ _logger = logger;
_parentTransformation = parentTransformation;
_componentModel = componentModel;
@@ -259,7 +259,7 @@
{
Collections.sort(names);
- _log.error(ServicesMessages.nonPrivateFields(getClassName(), names));
+ _logger.error(ServicesMessages.nonPrivateFields(getClassName(), names));
}
}
@@ -1476,9 +1476,9 @@
return _ctClass.getName();
}
- public Log getLog()
+ public Logger getLogger()
{
- return _log;
+ return _logger;
}
public void extendConstructor(String statement)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalModule.java?rev=569893&r1=569892&r2=569893&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalModule.java Sun Aug 26 15:23:55 2007
@@ -25,7 +25,6 @@
import javax.servlet.http.Cookie;
-import org.apache.commons.logging.Log;
import org.apache.tapestry.Binding;
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.internal.bindings.LiteralBinding;
@@ -67,6 +66,7 @@
import org.apache.tapestry.services.RequestFilter;
import org.apache.tapestry.services.RequestGlobals;
import org.apache.tapestry.services.ResourceDigestGenerator;
+import org.slf4j.Logger;
public final class InternalModule
{
@@ -175,10 +175,10 @@
ComponentClassTransformer transformer,
- Log log)
+ Logger logger)
{
ComponentInstantiatorSourceImpl source = new ComponentInstantiatorSourceImpl(classFactory
- .getClassLoader(), transformer, log);
+ .getClassLoader(), transformer, logger);
_updateListenerHub.addUpdateListener(source);
@@ -195,10 +195,10 @@
return transformer;
}
- public PagePool build(Log log, PageLoader pageLoader,
+ public PagePool build(Logger logger, PageLoader pageLoader,
ComponentMessagesSource componentMessagesSource, ComponentClassResolver resolver)
{
- PagePoolImpl service = new PagePoolImpl(log, pageLoader, _threadLocale, resolver);
+ PagePoolImpl service = new PagePoolImpl(logger, pageLoader, _threadLocale, resolver);
// This covers invalidations due to changes to classes
@@ -549,5 +549,7 @@
};
configuration.add("SetRequestEncoding", filter, "before:*");
+
+ configuration.add("Ajax", new AjaxFilter());
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLoaderProcessor.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLoaderProcessor.java?rev=569893&r1=569892&r2=569893&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLoaderProcessor.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLoaderProcessor.java Sun Aug 26 15:23:55 2007
@@ -23,7 +23,6 @@
import java.util.Locale;
import java.util.Map;
-import org.apache.commons.logging.Log;
import org.apache.tapestry.Binding;
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.TapestryConstants;
@@ -56,6 +55,7 @@
import org.apache.tapestry.model.EmbeddedComponentModel;
import org.apache.tapestry.services.BindingSource;
import org.apache.tapestry.services.PersistentFieldManager;
+import org.slf4j.Logger;
/**
* Contains all the work-state related to the {@link PageLoaderImpl}.
@@ -436,7 +436,7 @@
// Pre-allocate ids to avoid later name collisions.
- Log log = _loadingComponentModel.getLog();
+ Logger logger = _loadingComponentModel.getLogger();
// Don't have a case-insensitive Set, so we'll make due with a Map
Map<String, Boolean> embeddedIds = newCaseInsensitiveMap();
@@ -453,7 +453,7 @@
}
if (!embeddedIds.isEmpty())
- log.error(ServicesMessages.embeddedComponentsNotInTemplate(
+ logger.error(ServicesMessages.embeddedComponentsNotInTemplate(
embeddedIds.keySet(),
componentClassName));
@@ -602,7 +602,7 @@
if (isNonBlank(modelType) && embeddedType != null)
{
- Log log = _loadingComponentModel.getLog();
+ Logger log = _loadingComponentModel.getLogger();
log.error(ServicesMessages.compTypeConflict(embeddedId, embeddedType, modelType));
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageMarkupRendererImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageMarkupRendererImpl.java?rev=569893&r1=569892&r2=569893&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageMarkupRendererImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageMarkupRendererImpl.java Sun Aug 26 15:23:55 2007
@@ -31,7 +31,7 @@
{
_pageRenderInitializer.setup(writer);
- RenderQueueImpl queue = new RenderQueueImpl(page.getLog());
+ RenderQueueImpl queue = new RenderQueueImpl(page.getLogger());
queue.push(page.getRootElement());
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PagePoolImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PagePoolImpl.java?rev=569893&r1=569892&r2=569893&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PagePoolImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PagePoolImpl.java Sun Aug 26 15:23:55 2007
@@ -20,12 +20,12 @@
import java.util.Locale;
import java.util.Map;
-import org.apache.commons.logging.Log;
import org.apache.tapestry.internal.events.InvalidationListener;
import org.apache.tapestry.internal.structure.Page;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.ioc.services.ThreadLocale;
import org.apache.tapestry.services.ComponentClassResolver;
+import org.slf4j.Logger;
/**
* A very naive implementation just to get us past the start line.
@@ -35,7 +35,7 @@
*/
public class PagePoolImpl implements PagePool, InvalidationListener
{
- private final Log _log;
+ private final Logger _logger;
private final PageLoader _pageLoader;
@@ -45,10 +45,10 @@
private final Map<PageLocator, List<Page>> _pool = newMap();
- public PagePoolImpl(Log log, PageLoader pageLoader, ThreadLocale threadLocale,
+ public PagePoolImpl(Logger logger, PageLoader pageLoader, ThreadLocale threadLocale,
ComponentClassResolver resolver)
{
- _log = log;
+ _logger = logger;
_pageLoader = pageLoader;
_threadLocale = threadLocale;
_resolver = resolver;
@@ -66,7 +66,7 @@
// This is not as bad in T5 as in T4, since a seperate request will
// render the response (and will have a chance to get the page in a different locale).
- if (pages == null || pages.isEmpty())
+ if (pages == null || pages.isEmpty())
return _pageLoader.loadPage(canonicalPageName, locale);
// Remove and return the last page in the pool.
@@ -80,7 +80,7 @@
if (dirty)
{
- _log.error(ServicesMessages.pageIsDirty(page));
+ _logger.error(ServicesMessages.pageIsDirty(page));
return;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RenderQueueImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RenderQueueImpl.java?rev=569893&r1=569892&r2=569893&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RenderQueueImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RenderQueueImpl.java Sun Aug 26 15:23:55 2007
@@ -14,11 +14,11 @@
package org.apache.tapestry.internal.services;
-import org.apache.commons.logging.Log;
import org.apache.tapestry.MarkupWriter;
import org.apache.tapestry.ioc.util.Stack;
import org.apache.tapestry.runtime.RenderCommand;
import org.apache.tapestry.runtime.RenderQueue;
+import org.slf4j.Logger;
public class RenderQueueImpl implements RenderQueue
{
@@ -26,11 +26,11 @@
private final Stack<RenderCommand> _queue = new Stack<RenderCommand>(INITIAL_QUEUE_DEPTH);
- private final Log _log;
+ private final Logger _logger;
- public RenderQueueImpl(Log log)
+ public RenderQueueImpl(Logger logger)
{
- _log = log;
+ _logger = logger;
}
public void push(RenderCommand command)
@@ -51,8 +51,8 @@
{
command = _queue.pop();
- if (_log.isDebugEnabled())
- _log.debug(String.format("Executing: %s", command));
+ if (_logger.isDebugEnabled())
+ _logger.debug(String.format("Executing: %s", command));
command.render(writer, this);
}
@@ -62,7 +62,7 @@
// This will likely leave the page in a dirty state, and it will not go back into the
// page pool.
- _log.error(ServicesMessages.renderQueueError(command, ex), ex);
+ _logger.error(ServicesMessages.renderQueueError(command, ex), ex);
throw ex;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestImpl.java?rev=569893&r1=569892&r2=569893&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RequestImpl.java Sun Aug 26 15:23:55 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -31,6 +31,10 @@
*/
public class RequestImpl implements Request
{
+ static final String REQUESTED_WITH_HEADER = "X-Requested-With";
+
+ static final String XML_HTTP_REQUEST = "XmlHttpRequest";
+
private final HttpServletRequest _request;
public RequestImpl(HttpServletRequest request)
@@ -100,6 +104,11 @@
{
throw new RuntimeException(ex);
}
+ }
+
+ public boolean isXHR()
+ {
+ return XML_HTTP_REQUEST.equals(_request.getHeader(REQUESTED_WITH_HEADER));
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TemplateParserImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TemplateParserImpl.java?rev=569893&r1=569892&r2=569893&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TemplateParserImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TemplateParserImpl.java Sun Aug 26 15:23:55 2007
@@ -26,7 +26,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.commons.logging.Log;
import org.apache.tapestry.internal.parser.AttributeToken;
import org.apache.tapestry.internal.parser.BlockToken;
import org.apache.tapestry.internal.parser.BodyToken;
@@ -48,6 +47,7 @@
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.ioc.internal.util.LocationImpl;
import org.apache.tapestry.ioc.internal.util.TapestryException;
+import org.slf4j.Logger;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.EntityResolver;
@@ -102,7 +102,7 @@
private boolean _ignoreEvents;
- private final Log _log;
+ private final Logger _logger;
private final Map<String, URL> _configuration;
@@ -114,9 +114,9 @@
"\\$\\{\\s*(.*?)\\s*}",
Pattern.MULTILINE);
- public TemplateParserImpl(Log log, Map<String, URL> configuration)
+ public TemplateParserImpl(Logger logger, Map<String, URL> configuration)
{
- _log = log;
+ _logger = logger;
_configuration = configuration;
reset();
@@ -310,7 +310,7 @@
// Limit to one logged error per infraction.
if (!_insideBodyErrorLogged)
- _log.error(ServicesMessages.contentInsideBodyNotAllowed(getCurrentLocation()));
+ _logger.error(ServicesMessages.contentInsideBodyNotAllowed(getCurrentLocation()));
_insideBodyErrorLogged = true;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/ComponentPageElementImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/ComponentPageElementImpl.java?rev=569893&r1=569892&r2=569893&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/ComponentPageElementImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/ComponentPageElementImpl.java Sun Aug 26 15:23:55 2007
@@ -23,7 +23,6 @@
import java.util.Locale;
import java.util.Map;
-import org.apache.commons.logging.Log;
import org.apache.tapestry.Binding;
import org.apache.tapestry.Block;
import org.apache.tapestry.BlockNotFoundException;
@@ -53,6 +52,7 @@
import org.apache.tapestry.runtime.RenderCommand;
import org.apache.tapestry.runtime.RenderQueue;
import org.apache.tapestry.services.ComponentMessagesSource;
+import org.slf4j.Logger;
/**
* Implements {@link org.apache.tapestry.internal.structure.PageElement} and
@@ -844,9 +844,9 @@
return _id;
}
- public Log getLog()
+ public Logger getLogger()
{
- return _coreResources.getLog();
+ return _coreResources.getLogger();
}
public Component getMixinByClassName(String mixinClassName)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/InternalComponentResourcesImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/InternalComponentResourcesImpl.java?rev=569893&r1=569892&r2=569893&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/InternalComponentResourcesImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/InternalComponentResourcesImpl.java Sun Aug 26 15:23:55 2007
@@ -19,7 +19,6 @@
import java.util.Locale;
import java.util.Map;
-import org.apache.commons.logging.Log;
import org.apache.tapestry.Binding;
import org.apache.tapestry.Block;
import org.apache.tapestry.ComponentEventHandler;
@@ -38,6 +37,7 @@
import org.apache.tapestry.runtime.Component;
import org.apache.tapestry.runtime.RenderQueue;
import org.apache.tapestry.services.ComponentMessagesSource;
+import org.slf4j.Logger;
/**
* The bridge between a component and its {@link ComponentPageElement}, that supplies all kinds of
@@ -253,9 +253,9 @@
return getBinding(parameterName);
}
- public Log getLog()
+ public Logger getLogger()
{
- return _componentModel.getLog();
+ return _componentModel.getLogger();
}
public Component getMixinByClassName(String mixinClassName)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/Page.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/Page.java?rev=569893&r1=569892&r2=569893&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/Page.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/Page.java Sun Aug 26 15:23:55 2007
@@ -16,11 +16,11 @@
import java.util.Locale;
-import org.apache.commons.logging.Log;
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.Link;
import org.apache.tapestry.runtime.Component;
import org.apache.tapestry.runtime.PageLifecycleListener;
+import org.slf4j.Logger;
/**
* Represents a unique page within the application. Pages are part of the <em>internal</em>
@@ -100,8 +100,11 @@
*/
void addLifecycleListener(PageLifecycleListener listener);
- /** Returns the log of the root component element. */
- Log getLog();
+ /**
+ * Returns the logger of the root component element. Any logging about page construction or
+ * activity should be sent to this logger.
+ */
+ Logger getLogger();
/**
* Retrieves a component element by its nested id (a sequence of simple ids, separated by dots).
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/PageImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/PageImpl.java?rev=569893&r1=569892&r2=569893&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/PageImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/PageImpl.java Sun Aug 26 15:23:55 2007
@@ -20,7 +20,6 @@
import java.util.List;
import java.util.Locale;
-import org.apache.commons.logging.Log;
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.Link;
import org.apache.tapestry.internal.services.LinkFactory;
@@ -29,6 +28,7 @@
import org.apache.tapestry.runtime.PageLifecycleListener;
import org.apache.tapestry.services.PersistentFieldBundle;
import org.apache.tapestry.services.PersistentFieldManager;
+import org.slf4j.Logger;
public class PageImpl implements Page
{
@@ -123,7 +123,7 @@
}
catch (RuntimeException ex)
{
- getLog().error(StructureMessages.detachFailure(listener, ex), ex);
+ getLogger().error(StructureMessages.detachFailure(listener, ex), ex);
result = true;
}
}
@@ -147,9 +147,9 @@
listener.containingPageDidAttach();
}
- public Log getLog()
+ public Logger getLogger()
{
- return _rootElement.getLog();
+ return _rootElement.getLogger();
}
public Link createActionLink(ComponentPageElement element, String action, boolean forForm,
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java?rev=569893&r1=569892&r2=569893&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java Sun Aug 26 15:23:55 2007
@@ -28,7 +28,6 @@
import java.util.Locale;
import java.util.ResourceBundle;
-import org.apache.commons.logging.Log;
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.ComponentResourcesCommon;
import org.apache.tapestry.Link;
@@ -79,6 +78,7 @@
import org.apache.tapestry.services.TapestryModule;
import org.apache.tapestry.test.TapestryTestCase;
import org.easymock.EasyMock;
+import org.slf4j.Logger;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.AfterSuite;
import org.testng.annotations.BeforeSuite;
@@ -324,9 +324,9 @@
return newMock(ComponentTemplateSource.class);
}
- protected final void train_getLog(ComponentModel model, Log log)
+ protected final void train_getLogger(ComponentModel model, Logger logger)
{
- expect(model.getLog()).andReturn(log).atLeastOnce();
+ expect(model.getLogger()).andReturn(logger).atLeastOnce();
}
protected final void train_getTokens(ComponentTemplate template, TemplateToken... tokens)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableRequestImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableRequestImpl.java?rev=569893&r1=569892&r2=569893&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableRequestImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableRequestImpl.java Sun Aug 26 15:23:55 2007
@@ -133,4 +133,10 @@
{
}
+ /** Always returns false. If you need to test Ajax functionality, you need to be using Selenium. */
+ public boolean isXHR()
+ {
+ return false;
+ }
+
}