You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2006/08/24 18:34:01 UTC
svn commit: r434419 [2/2] - in /tapestry/tapestry5/tapestry-core/trunk/src:
main/java/org/apache/tapestry/ main/java/org/apache/tapestry/internal/
main/java/org/apache/tapestry/internal/pageload/
main/java/org/apache/tapestry/internal/parser/ main/java...
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/structure/TextPageElement.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/structure/TextPageElement.java?rev=434419&r1=434418&r2=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/structure/TextPageElement.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/structure/TextPageElement.java Thu Aug 24 09:33:54 2006
@@ -1,3 +1,17 @@
+// Copyright 2006 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.structure;
import org.apache.tapestry.MarkupWriter;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java?rev=434419&r1=434418&r2=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java Thu Aug 24 09:33:54 2006
@@ -21,7 +21,7 @@
import org.apache.tapestry.internal.ioc.InternalRegistry;
import org.apache.tapestry.internal.ioc.Module;
import org.apache.tapestry.internal.parser.ComponentTemplate;
-import org.apache.tapestry.internal.transform.ComponentInstantiatorSource;
+import org.apache.tapestry.internal.services.ComponentInstantiatorSource;
import org.apache.tapestry.ioc.ObjectProvider;
import org.apache.tapestry.ioc.Registry;
import org.apache.tapestry.ioc.RegistryBuilder;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/MethodSignature.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/MethodSignature.java?rev=434419&r1=434418&r2=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/MethodSignature.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/ioc/services/MethodSignature.java Thu Aug 24 09:33:54 2006
@@ -36,7 +36,7 @@
* This version of MethodSignature works with <em>loaded</em> classes, and it usually used in the
* context of {@link org.apache.tapestry.ioc.services.ClassFab} to create new classes and
* subclasses. Another class with the same name,
- * {@link org.apache.tapestry.transform.MethodSignature} is similar, but is used <em>before</em>
+ * {@link org.apache.tapestry.services.MethodSignature} is similar, but is used <em>before</em>
* classes are loaded, to transform the classes as they are loaded (it uses strings for class names,
* where this class uses Class instances).
*
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/ApplicationInitializer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/ApplicationInitializer.java?rev=434419&r1=434418&r2=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/ApplicationInitializer.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/ApplicationInitializer.java Thu Aug 24 09:33:54 2006
@@ -1,3 +1,17 @@
+// Copyright 2006 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.services;
/**
Copied: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/ClassTransformation.java (from r433091, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/transform/ClassTransformation.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/ClassTransformation.java?p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/ClassTransformation.java&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/transform/ClassTransformation.java&r1=433091&r2=434419&rev=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/transform/ClassTransformation.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/ClassTransformation.java Thu Aug 24 09:33:54 2006
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.transform;
+package org.apache.tapestry.services;
import java.lang.annotation.Annotation;
import java.util.List;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/ComponentClassResolver.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/ComponentClassResolver.java?rev=434419&r1=434418&r2=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/ComponentClassResolver.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/ComponentClassResolver.java Thu Aug 24 09:33:54 2006
@@ -1,3 +1,17 @@
+// Copyright 2006 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.services;
/**
Copied: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/ComponentClassTransformWorker.java (from r433091, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/transform/ComponentClassTransformWorker.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/ComponentClassTransformWorker.java?p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/ComponentClassTransformWorker.java&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/transform/ComponentClassTransformWorker.java&r1=433091&r2=434419&rev=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/transform/ComponentClassTransformWorker.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/ComponentClassTransformWorker.java Thu Aug 24 09:33:54 2006
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.transform;
+package org.apache.tapestry.services;
import org.apache.tapestry.model.MutableComponentModel;
/**
* Interface for a set of objects that can perform component class transformations. Implementations
* should be multithreaded, ideally they should be stateless (all necessary state can be stored in
- * the {@link org.apache.tapestry.transform.ClassTransformation}).
+ * the {@link org.apache.tapestry.services.ClassTransformation}).
*
* @author Howard M. Lewis Ship
*/
Copied: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/Dispatcher.java (from r434403, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/request/Dispatcher.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/Dispatcher.java?p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/Dispatcher.java&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/request/Dispatcher.java&r1=434403&r2=434419&rev=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/request/Dispatcher.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/Dispatcher.java Thu Aug 24 09:33:54 2006
@@ -1,4 +1,18 @@
-package org.apache.tapestry.request;
+// Copyright 2006 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.services;
/**
Copied: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/HttpServletRequestFilter.java (from r434112, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/request/HttpServletRequestFilter.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/HttpServletRequestFilter.java?p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/HttpServletRequestFilter.java&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/request/HttpServletRequestFilter.java&r1=434112&r2=434419&rev=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/request/HttpServletRequestFilter.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/HttpServletRequestFilter.java Thu Aug 24 09:33:54 2006
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.request;
+package org.apache.tapestry.services;
import java.io.IOException;
@@ -21,7 +21,7 @@
/**
* @author Howard M. Lewis Ship
- * @see org.apache.tapestry.request.HttpServletRequestHandler
+ * @see org.apache.tapestry.services.HttpServletRequestHandler
*/
public interface HttpServletRequestFilter
{
Copied: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/HttpServletRequestHandler.java (from r434112, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/request/HttpServletRequestHandler.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/HttpServletRequestHandler.java?p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/HttpServletRequestHandler.java&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/request/HttpServletRequestHandler.java&r1=434112&r2=434419&rev=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/request/HttpServletRequestHandler.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/HttpServletRequestHandler.java Thu Aug 24 09:33:54 2006
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.request;
+package org.apache.tapestry.services;
import java.io.IOException;
@@ -23,7 +23,7 @@
* Service interface for the tapestry.request.HttpServletRequestHandler pipeline service.
*
* @author Howard M. Lewis Ship
- * @see org.apache.tapestry.request.HttpServletRequestFilter
+ * @see org.apache.tapestry.services.HttpServletRequestFilter
*/
public interface HttpServletRequestHandler
{
Copied: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/MethodSignature.java (from r433278, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/transform/MethodSignature.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/MethodSignature.java?p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/MethodSignature.java&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/transform/MethodSignature.java&r1=433278&r2=434419&rev=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/transform/MethodSignature.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/MethodSignature.java Thu Aug 24 09:33:54 2006
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.transform;
+package org.apache.tapestry.services;
import static org.apache.tapestry.util.Defense.notBlank;
Copied: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/RequestGlobals.java (from r433091, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/request/RequestGlobals.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/RequestGlobals.java?p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/RequestGlobals.java&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/request/RequestGlobals.java&r1=433091&r2=434419&rev=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/request/RequestGlobals.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/RequestGlobals.java Thu Aug 24 09:33:54 2006
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.request;
+package org.apache.tapestry.services;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/TapestryModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/TapestryModule.java?rev=434419&r1=434418&r2=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/TapestryModule.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/TapestryModule.java Thu Aug 24 09:33:54 2006
@@ -14,15 +14,22 @@
package org.apache.tapestry.services;
+import java.io.IOException;
import java.util.Collection;
import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.commons.logging.Log;
import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.internal.InternalModule;
import org.apache.tapestry.internal.services.InfrastructureImpl;
import org.apache.tapestry.internal.services.InfrastructureManagerImpl;
+import org.apache.tapestry.internal.services.InternalModule;
import org.apache.tapestry.internal.services.MarkupWriterImpl;
+import org.apache.tapestry.internal.services.RequestGlobalsImpl;
+import org.apache.tapestry.internal.services.WebRequestImpl;
+import org.apache.tapestry.internal.services.WebResponseImpl;
import org.apache.tapestry.ioc.Configuration;
import org.apache.tapestry.ioc.MappedConfiguration;
import org.apache.tapestry.ioc.ObjectProvider;
@@ -31,10 +38,11 @@
import org.apache.tapestry.ioc.annotations.Contribute;
import org.apache.tapestry.ioc.annotations.Id;
import org.apache.tapestry.ioc.annotations.InjectService;
+import org.apache.tapestry.ioc.annotations.Lifecycle;
import org.apache.tapestry.ioc.annotations.SubModule;
import org.apache.tapestry.ioc.services.ChainBuilder;
-import org.apache.tapestry.request.RequestModule;
-import org.apache.tapestry.transform.TransformModule;
+import org.apache.tapestry.ioc.services.PipelineBuilder;
+import org.apache.tapestry.ioc.services.PropertyShadowBuilder;
/**
* The root module for Tapestry.
@@ -43,43 +51,30 @@
*/
@Id("tapestry")
@SubModule(
-{ TransformModule.class, InternalModule.class, RequestModule.class })
+{ InternalModule.class })
public final class TapestryModule
{
private final ChainBuilder _chainBuilder;
- public TapestryModule(@InjectService("tapestry.ioc.ChainBuilder")
- ChainBuilder chainBuilder)
- {
- _chainBuilder = chainBuilder;
- }
+ private final PipelineBuilder _pipelineBuilder;
- public Infrastructure buildInfrastructure(Log log,
- Collection<InfrastructureContribution> configuration)
- {
- InfrastructureManager manager = new InfrastructureManagerImpl(log, configuration);
+ private final RequestGlobals _requestGlobals;
- return new InfrastructureImpl(manager);
- }
+ private final PropertyShadowBuilder _shadowBuilder;
- /**
- * Contributes the {@link ObjectProvider} provided by {@link Infrastructure#getObjectProvider()}
- * mapped to the provider prefix "infrastructure".
- */
- @Contribute("tapestry.ioc.MasterObjectProvider")
- public void contributeInfrastructureToMasterObjectProvider(
- MappedConfiguration<String, ObjectProvider> configuration,
- @InjectService("Infrastructure")
- Infrastructure infrastructure)
- {
- configuration.add("service", infrastructure.getObjectProvider());
- }
+ // Yes, you can inject services defined by this module into this module. The service proxy is
+ // created without instantiating the module itself.
- public void contributeInfrastructure(Configuration<InfrastructureContribution> configuration,
- ServiceResources resources)
+ public TapestryModule(@InjectService("tapestry.ioc.PipelineBuilder")
+ PipelineBuilder pipelineBuilder, @InjectService("tapestry.ioc.PropertyShadowBuilder")
+ PropertyShadowBuilder shadowBuilder, @InjectService("RequestGlobals")
+ RequestGlobals requestGlobals, @InjectService("tapestry.ioc.ChainBuilder")
+ ChainBuilder chainBuilder)
{
- add(configuration, resources, ComponentNameExpander.class);
- add(configuration, resources, MarkupWriterFactory.class);
+ _pipelineBuilder = pipelineBuilder;
+ _shadowBuilder = shadowBuilder;
+ _requestGlobals = requestGlobals;
+ _chainBuilder = chainBuilder;
}
private <T> void add(Configuration<InfrastructureContribution> configuration,
@@ -101,6 +96,76 @@
configuration.add(contribution);
}
+ /** Initialized the application. */
+ public ApplicationInitializer buildApplicationInitializer(Log log,
+ List<ApplicationInitializer> configuration)
+ {
+ return _chainBuilder.build(ApplicationInitializer.class, configuration);
+ }
+
+ /**
+ * Allows the exact steps in the component class transformation process to be defined.
+ */
+ public ComponentClassTransformWorker buildComponentClassTransformWorker(
+ List<ComponentClassTransformWorker> configuration)
+ {
+ return _chainBuilder.build(ComponentClassTransformWorker.class, configuration);
+ }
+
+ /**
+ * Builds a provisional implementation that assumes the input name already is a fully qualified
+ * class name.
+ */
+ public ComponentNameExpander buildComponentNameExpander()
+ {
+ return new ComponentNameExpander()
+ {
+ public String expandComponentName(String componentName)
+ {
+ return componentName;
+ }
+ };
+ }
+
+ public Dispatcher buildHTMLDispatcher()
+ {
+ return null;
+ }
+
+ public HttpServletRequestHandler buildHttpServletRequestHandler(Log log,
+ List<HttpServletRequestFilter> configuration, @InjectService("WebRequestHandler")
+ final WebRequestHandler webRequestHandler)
+ {
+ HttpServletRequestHandler terminator = new HttpServletRequestHandler()
+ {
+ public boolean service(HttpServletRequest request, HttpServletResponse response)
+ throws IOException
+ {
+ _requestGlobals.store(request, response);
+
+ WebRequest wrequest = new WebRequestImpl(request);
+ WebResponse wresponse = new WebResponseImpl(response);
+
+ return webRequestHandler.service(wrequest, wresponse);
+ }
+ };
+
+ return _pipelineBuilder.build(
+ log,
+ HttpServletRequestHandler.class,
+ HttpServletRequestFilter.class,
+ configuration,
+ terminator);
+ }
+
+ public Infrastructure buildInfrastructure(Log log,
+ Collection<InfrastructureContribution> configuration)
+ {
+ InfrastructureManager manager = new InfrastructureManagerImpl(log, configuration);
+
+ return new InfrastructureImpl(manager);
+ }
+
public MarkupWriterFactory buildMarkupWriterFactory()
{
// Temporary ...
@@ -114,25 +179,45 @@
}
/**
- * Builds a provisional implementation that assumes the input name already is a fully qualified
- * class name.
+ * Ordered contributions to the MasterDispatcher service allow different URL matching strategies
+ * to occur.
*/
- public ComponentNameExpander buildComponentNameExpander()
+ public Dispatcher buildMasterDispatcher(List<Dispatcher> configuration)
{
- return new ComponentNameExpander()
+ return _chainBuilder.build(Dispatcher.class, configuration);
+ }
+
+ @Lifecycle("perthread")
+ public RequestGlobals buildRequestGlobals()
+ {
+ return new RequestGlobalsImpl();
+ }
+
+ public WebRequest buildWebRequest()
+ {
+ return _shadowBuilder.build(_requestGlobals, "request", WebRequest.class);
+ }
+
+ public WebRequestHandler buildWebRequestHandler(Log log, List<WebRequestFilter> configuration,
+ @InjectService("MasterDispatcher")
+ final Dispatcher masterDispatcher)
+ {
+ WebRequestHandler terminator = new WebRequestHandler()
{
- public String expandComponentName(String componentName)
+ public boolean service(WebRequest request, WebResponse response) throws IOException
{
- return componentName;
+ _requestGlobals.store(request, response);
+
+ return masterDispatcher.dispatch(request, response);
}
};
- }
- /** Initialized the application. */
- public ApplicationInitializer buildApplicationInitializer(Log log,
- List<ApplicationInitializer> configuration)
- {
- return _chainBuilder.build(ApplicationInitializer.class, configuration);
+ return _pipelineBuilder.build(
+ log,
+ WebRequestHandler.class,
+ WebRequestFilter.class,
+ configuration,
+ terminator);
}
public void contributeApplicationInitializer(
@@ -149,5 +234,38 @@
};
configuration.add("SetInfrastructureMode", contribution, "before:*.*");
+ }
+
+ /**
+ * Contributes properties: componentNameExpander, markupWriterFactory, request
+ */
+ public void contributeInfrastructure(Configuration<InfrastructureContribution> configuration,
+ ServiceResources resources, @InjectService("WebRequest")
+ WebRequest request)
+ {
+ add(configuration, resources, ComponentNameExpander.class);
+ add(configuration, resources, MarkupWriterFactory.class);
+
+ configuration.add(new InfrastructureContribution("request", request));
+ }
+
+ /**
+ * Contributes the {@link ObjectProvider} provided by {@link Infrastructure#getObjectProvider()}
+ * mapped to the provider prefix "infrastructure".
+ */
+ @Contribute("tapestry.ioc.MasterObjectProvider")
+ public void contributeInfrastructureToMasterObjectProvider(
+ MappedConfiguration<String, ObjectProvider> configuration,
+ @InjectService("Infrastructure")
+ Infrastructure infrastructure)
+ {
+ configuration.add("service", infrastructure.getObjectProvider());
+ }
+
+ public void contributeMasterDispatcher(OrderedConfiguration<Dispatcher> configuration,
+ @InjectService("HTMLDispatcher")
+ Dispatcher HTMLDispatcher)
+ {
+ configuration.add("HTML", HTMLDispatcher);
}
}
Copied: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/TransformConstants.java (from r433091, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/transform/TransformConstants.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/TransformConstants.java?p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/TransformConstants.java&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/transform/TransformConstants.java&r1=433091&r2=434419&rev=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/transform/TransformConstants.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/TransformConstants.java Thu Aug 24 09:33:54 2006
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.transform;
+package org.apache.tapestry.services;
import org.apache.tapestry.internal.annotations.Utility;
/**
- * Constants used by implementations of {@link org.apache.tapestry.transform.ComponentClassTransformWorker}.
+ * Constants used by implementations of {@link org.apache.tapestry.services.ComponentClassTransformWorker}.
*
* @author Howard M. Lewis Ship
*/
Copied: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/WebRequest.java (from r434403, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/request/WebRequest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/WebRequest.java?p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/WebRequest.java&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/request/WebRequest.java&r1=434403&r2=434419&rev=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/request/WebRequest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/WebRequest.java Thu Aug 24 09:33:54 2006
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.request;
+package org.apache.tapestry.services;
import java.util.List;
Copied: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/WebRequestFilter.java (from r434112, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/request/WebRequestFilter.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/WebRequestFilter.java?p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/WebRequestFilter.java&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/request/WebRequestFilter.java&r1=434112&r2=434419&rev=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/request/WebRequestFilter.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/WebRequestFilter.java Thu Aug 24 09:33:54 2006
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.request;
+package org.apache.tapestry.services;
import java.io.IOException;
/**
- * Filter interface for {@link org.apache.tapestry.request.WebRequestHandler}.
+ * Filter interface for {@link org.apache.tapestry.services.WebRequestHandler}.
*
* @author Howard M. Lewis Ship
*/
Copied: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/WebRequestHandler.java (from r434112, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/request/WebRequestHandler.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/WebRequestHandler.java?p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/WebRequestHandler.java&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/request/WebRequestHandler.java&r1=434112&r2=434419&rev=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/request/WebRequestHandler.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/WebRequestHandler.java Thu Aug 24 09:33:54 2006
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.request;
+package org.apache.tapestry.services;
import java.io.IOException;
Copied: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/WebResponse.java (from r433091, tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/request/WebResponse.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/WebResponse.java?p2=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/WebResponse.java&p1=tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/request/WebResponse.java&r1=433091&r2=434419&rev=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/request/WebResponse.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/services/WebResponse.java Thu Aug 24 09:33:54 2006
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.request;
+package org.apache.tapestry.services;
public interface WebResponse
{
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/BaseTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/BaseTestCase.java?rev=434419&r1=434418&r2=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/BaseTestCase.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/BaseTestCase.java Thu Aug 24 09:33:54 2006
@@ -44,7 +44,7 @@
import org.apache.tapestry.ioc.def.ModuleDef;
import org.apache.tapestry.ioc.def.ServiceDef;
import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.transform.ClassTransformation;
+import org.apache.tapestry.services.ClassTransformation;
import static java.lang.Thread.sleep;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/internal/services/ServicesStrings.properties
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/internal/services/ServicesStrings.properties?rev=434419&r1=434418&r2=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/internal/services/ServicesStrings.properties (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/internal/services/ServicesStrings.properties Thu Aug 24 09:33:54 2006
@@ -19,3 +19,13 @@
markup-writer-no-current-element=This markup writer does not have a current element. \
The current element is established with the first call to element() and is \
maintained across subsequent calls.
+no-constructor-found=Unable to find an applicable constructor for class %s.
+missing-declared-field=Class %s does not contain a field named '%s'.
+error-adding-method=Error adding method %s to class %s: %s
+field-already-claimed=Field %s of class %s is already claimed by %s and can not be claimed by %s.
+no-declared-method=Class %s does not declare method '%s'.
+incorrect-class-for-instantiator=Unable to create a component instantiator for class %s because class %s was provided instead.
+class-not-transformed=Class %s was not transformed for use as a component; either it does not have the @ComponentClass annotation, or was not in a package subject to component transformation.
+new-parser-error=Failure obtaining a SAX parser for resource %s: %s
+missing-template-resource=Template resource %s does not exist.
+template-parse-error=Failure parsing template %s: %s
Modified: tapestry/tapestry5/tapestry-core/trunk/src/site/apt/guide/request.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/site/apt/guide/request.apt?rev=434419&r1=434418&r2=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/site/apt/guide/request.apt (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/site/apt/guide/request.apt Thu Aug 24 09:33:54 2006
@@ -19,7 +19,7 @@
functions.
When it receives a request, the TapestryFilter obtains the
- {{{../apidocs/org/apache/tapestry/request/HttpServletRequestHandler.html}tapestry.request.HttpServletRequestHandler}}
+ {{{../apidocs/org/apache/tapestry/services/HttpServletRequestHandler.html}tapestry.HttpServletRequestHandler}}
service, and invokes its service() method.
<<TODO: How does the TF identify which requests it will process, and which are
@@ -30,18 +30,18 @@
This pipeline performs initial processing of the request. It can be extended
by contributing a
- {{{../apidocs/org/apache/tapestry/request/HttpServletRequestFilter.html}tapestry.request.HttpServletRequestFilter}} into
- the tapestry.request.HttpServletRequestHandler service's configuration.
+ {{{../apidocs/org/apache/tapestry/services/HttpServletRequestFilter.html}tapestry.HttpServletRequestFilter}} into
+ the tapestry.HttpServletRequestHandler service's configuration.
The terminator for the pipeline does two things:
- * It stores the request and response into the {{{.../apidocs/org/apache/tapestry/request/RequestGlobals.html}tapestry.request.RequestGlobals}}
+ * It stores the request and response into the {{{.../apidocs/org/apache/tapestry/services/RequestGlobals.html}tapestry.RequestGlobals}}
service. This is a threaded service that stores per-thread/per-request information.
* It wraps the request and response as a
- {{{../apidocs/org/apache/tapestry/request/WebRequest.html}WebRequest}} and
- {{{../apidocs/org/apache/tapestry/request/WebResponse.html}WebResponse}}, and passes them into the
- {{{../apidocs/org/apache/tapestry/request/WebRequestHandler.html}tapestry.request.WebRequestHandler}} pipeline.
+ {{{../apidocs/org/apache/tapestry/services/WebRequest.html}WebRequest}} and
+ {{{../apidocs/org/apache/tapestry/services/WebResponse.html}WebResponse}}, and passes them into the
+ {{{../apidocs/org/apache/tapestry/services/WebRequestHandler.html}tapestry.WebRequestHandler}} pipeline.
[]
@@ -58,13 +58,13 @@
RequestGlobals Service
- The tapestry.request.RequestGlobals service
+ The tapestry.RequestGlobals service
has a lifecycle of perthread; this means that a seperate instance exists for every thread, and therefore,
for every request. The terminators of the two handler pipelines store the request/response pairs into the RequestGlobals service.
WebRequest Service
- The tapestry.request.WebRequest service is a
+ The tapestry.WebRequest service is a
{{{../ioc/shadow.html}shadow}}
of the RequestGlobals services' request property. That is, any methods invoked
on this service are delegated to the request object stored inside the RequestGlobals.
Modified: tapestry/tapestry5/tapestry-core/trunk/src/site/apt/ioc/provider.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/site/apt/ioc/provider.apt?rev=434419&r1=434418&r2=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/site/apt/ioc/provider.apt (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/site/apt/ioc/provider.apt Thu Aug 24 09:33:54 2006
@@ -59,7 +59,7 @@
*-----------------------+--------------------------------------------------------------------------------------------------------+
| componentNameExpander | {{{../apidocs/org/apache/tapestry/services/ComponentNameExpander.html}tapestry.ComponentNameExpander}} |
*-----------------------+--------------------------------------------------------------------------------------------------------+
-| request | {{{../apidocs/org/apache/tapestry/request/WebRequest.html}tapestry.request.WebRequest}} |
+| request | {{{../apidocs/org/apache/tapestry/services/WebRequest.html}tapestry.WebRequest}} |
*-----------------------+--------------------------------------------------------------------------------------------------------+
Default properties available via the infrastructure object provider
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/aspects/InternalUtilityAspectTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/aspects/InternalUtilityAspectTest.java?rev=434419&r1=434418&r2=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/aspects/InternalUtilityAspectTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/aspects/InternalUtilityAspectTest.java Thu Aug 24 09:33:54 2006
@@ -14,8 +14,8 @@
package org.apache.tapestry.internal.aspects;
+import org.apache.tapestry.services.TransformConstants;
import org.apache.tapestry.test.TestBase;
-import org.apache.tapestry.transform.TransformConstants;
import org.testng.annotations.Test;
/** @author Howard M. Lewis Ship */
@@ -34,7 +34,9 @@
{
assertEquals(
ex.getMessage(),
- "Class org.apache.tapestry.transform.TransformConstants has been marked as a utility class (with the @Utility annotation) and may not be instantiated.");
+ "Class "
+ + TransformConstants.class.getName()
+ + " has been marked as a utility class (with the @Utility annotation) and may not be instantiated.");
}
}
}
Copied: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/BarInterface.java (from r433091, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/BarInterface.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/BarInterface.java?p2=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/BarInterface.java&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/BarInterface.java&r1=433091&r2=434419&rev=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/BarInterface.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/BarInterface.java Thu Aug 24 09:33:54 2006
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.transform;
+package org.apache.tapestry.internal.services;
public interface BarInterface
{
Copied: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImplTest.java (from r434403, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/ComponentInstantiatorSourceImplTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImplTest.java?p2=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImplTest.java&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/ComponentInstantiatorSourceImplTest.java&r1=434403&r2=434419&rev=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/ComponentInstantiatorSourceImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImplTest.java Thu Aug 24 09:33:54 2006
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.transform;
+package org.apache.tapestry.internal.services;
import java.io.File;
import java.io.IOException;
@@ -30,26 +30,24 @@
import org.apache.commons.logging.Log;
import org.apache.tapestry.internal.InternalComponentResources;
-import org.apache.tapestry.internal.InternalModule;
import org.apache.tapestry.internal.ioc.services.PropertyAccessImpl;
-import org.apache.tapestry.internal.services.UpdateListenerHub;
import org.apache.tapestry.internal.transform.pages.BasicComponent;
import org.apache.tapestry.internal.transform.pages.BasicSubComponent;
import org.apache.tapestry.ioc.Registry;
import org.apache.tapestry.ioc.RegistryBuilder;
import org.apache.tapestry.ioc.services.PropertyAccess;
import org.apache.tapestry.runtime.ComponentLifecycle;
+import org.apache.tapestry.services.TapestryModule;
import org.apache.tapestry.test.BaseTestCase;
-import org.apache.tapestry.transform.TransformModule;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
/**
- * Tests for {@link org.apache.tapestry.internal.transform.ComponentInstantiatorSourceImpl}.
- * Several of these tests are more of the form of integration tests that instantiate the Tapestry
- * IoC Registry.
+ * Tests for {@link org.apache.tapestry.internal.services.ComponentInstantiatorSourceImpl}. Several
+ * of these tests are more of the form of integration tests that instantiate the Tapestry IoC
+ * Registry.
*
* @author Howard M. Lewis Ship
*/
@@ -252,7 +250,7 @@
RegistryBuilder builder = new RegistryBuilder();
- builder.add(TransformModule.class, InternalModule.class);
+ builder.add(TapestryModule.class, InternalModule.class);
_registry = builder.build();
Copied: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImplTest.java (from r433091, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/pageload/ComponentTemplateSourceImplTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImplTest.java?p2=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImplTest.java&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/pageload/ComponentTemplateSourceImplTest.java&r1=433091&r2=434419&rev=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/pageload/ComponentTemplateSourceImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImplTest.java Thu Aug 24 09:33:54 2006
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.pageload;
+package org.apache.tapestry.internal.services;
import java.io.File;
import java.net.URLClassLoader;
@@ -24,7 +24,8 @@
import org.apache.tapestry.events.UpdateEvent;
import org.apache.tapestry.internal.ClasspathResource;
import org.apache.tapestry.internal.parser.ComponentTemplate;
-import org.apache.tapestry.internal.parser.TemplateParser;
+import org.apache.tapestry.internal.services.ComponentTemplateSource;
+import org.apache.tapestry.internal.services.ComponentTemplateSourceImpl;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.testng.annotations.Test;
Copied: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/FooBarInterface.java (from r433091, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/FooBarInterface.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/FooBarInterface.java?p2=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/FooBarInterface.java&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/FooBarInterface.java&r1=433091&r2=434419&rev=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/FooBarInterface.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/FooBarInterface.java Thu Aug 24 09:33:54 2006
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.transform;
+package org.apache.tapestry.internal.services;
public interface FooBarInterface extends FooInterface, BarInterface
{
Copied: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/FooInterface.java (from r433091, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/FooInterface.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/FooInterface.java?p2=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/FooInterface.java&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/FooInterface.java&r1=433091&r2=434419&rev=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/FooInterface.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/FooInterface.java Thu Aug 24 09:33:54 2006
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.transform;
+package org.apache.tapestry.internal.services;
/**
* @author Howard M. Lewis Ship
Copied: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/GetterMethodsInterface.java (from r433091, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/GetterMethodsInterface.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/GetterMethodsInterface.java?p2=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/GetterMethodsInterface.java&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/GetterMethodsInterface.java&r1=433091&r2=434419&rev=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/GetterMethodsInterface.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/GetterMethodsInterface.java Thu Aug 24 09:33:54 2006
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.transform;
+package org.apache.tapestry.internal.services;
/**
* @author Howard M. Lewis Ship
Copied: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java (from r433119, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/InternalClassTransformationImplTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java?p2=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/InternalClassTransformationImplTest.java&r1=433119&r2=434419&rev=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/InternalClassTransformationImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java Thu Aug 24 09:33:54 2006
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.transform;
+package org.apache.tapestry.internal.services;
import java.lang.annotation.Documented;
import java.lang.annotation.Target;
@@ -30,6 +30,9 @@
import org.apache.tapestry.annotations.ComponentClass;
import org.apache.tapestry.annotations.Retain;
import org.apache.tapestry.internal.InternalComponentResources;
+import org.apache.tapestry.internal.services.Instantiator;
+import org.apache.tapestry.internal.services.InternalClassTransformation;
+import org.apache.tapestry.internal.services.InternalClassTransformationImpl;
import org.apache.tapestry.internal.transform.pages.AbstractFoo;
import org.apache.tapestry.internal.transform.pages.BarImpl;
import org.apache.tapestry.internal.transform.pages.BasicComponent;
@@ -39,8 +42,8 @@
import org.apache.tapestry.internal.transform.pages.TargetObject;
import org.apache.tapestry.runtime.ComponentLifecycle;
import org.apache.tapestry.runtime.ResourceAware;
+import org.apache.tapestry.services.ClassTransformation;
import org.apache.tapestry.test.BaseTestCase;
-import org.apache.tapestry.transform.ClassTransformation;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -347,7 +350,7 @@
}
catch (IllegalArgumentException ex)
{
- assertEquals(ex.getMessage(), TransformMessages.incorrectClassForInstantiator(
+ assertEquals(ex.getMessage(), ServicesMessages.incorrectClassForInstantiator(
BasicComponent.class.getName(),
Boolean.class));
}
Copied: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/Named.java (from r433091, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/Named.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/Named.java?p2=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/Named.java&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/Named.java&r1=433091&r2=434419&rev=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/Named.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/Named.java Thu Aug 24 09:33:54 2006
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.transform;
+package org.apache.tapestry.internal.services;
/**
- * Used by {@link org.apache.tapestry.internal.transform.ComponentInstantiatorSourceImplTest}.
+ * Used by {@link org.apache.tapestry.internal.services.ComponentInstantiatorSourceImplTest}.
*
* @author Howard M. Lewis Ship
*/
Copied: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PageElementFactoryImplTest.java (from r434403, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/pageload/PageElementFactoryImplTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PageElementFactoryImplTest.java?p2=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PageElementFactoryImplTest.java&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/pageload/PageElementFactoryImplTest.java&r1=434403&r2=434419&rev=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/pageload/PageElementFactoryImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PageElementFactoryImplTest.java Thu Aug 24 09:33:54 2006
@@ -1,4 +1,18 @@
-package org.apache.tapestry.internal.pageload;
+// Copyright 2006 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.Location;
import org.apache.tapestry.MarkupWriter;
@@ -7,9 +21,10 @@
import org.apache.tapestry.internal.parser.StartElementToken;
import org.apache.tapestry.internal.parser.TextToken;
import org.apache.tapestry.internal.services.MarkupWriterImpl;
+import org.apache.tapestry.internal.services.PageElementFactory;
+import org.apache.tapestry.internal.services.PageElementFactoryImpl;
import org.apache.tapestry.internal.structure.PageElement;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.internal.transform.ComponentInstantiatorSource;
import org.testng.annotations.Test;
/**
Copied: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ParserExperiment.java (from r433091, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/parser/ParserExperiment.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ParserExperiment.java?p2=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ParserExperiment.java&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/parser/ParserExperiment.java&r1=433091&r2=434419&rev=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/parser/ParserExperiment.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ParserExperiment.java Thu Aug 24 09:33:54 2006
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.parser;
+package org.apache.tapestry.internal.services;
import java.io.BufferedInputStream;
import java.net.URL;
Copied: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/RetainWorkerTest.java (from r433091, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/worker/RetainWorkerTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/RetainWorkerTest.java?p2=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/RetainWorkerTest.java&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/worker/RetainWorkerTest.java&r1=433091&r2=434419&rev=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/worker/RetainWorkerTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/RetainWorkerTest.java Thu Aug 24 09:33:54 2006
@@ -12,12 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.transform.worker;
+package org.apache.tapestry.internal.services;
import org.apache.tapestry.annotations.Retain;
+import org.apache.tapestry.internal.services.RetainWorker;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.transform.ClassTransformation;
+import org.apache.tapestry.services.ClassTransformation;
import org.testng.annotations.Test;
/**
Copied: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/TemplateParserImplTest.java (from r433663, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/parser/TemplateParserImplTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/TemplateParserImplTest.java?p2=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/TemplateParserImplTest.java&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/parser/TemplateParserImplTest.java&r1=433663&r2=434419&rev=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/parser/TemplateParserImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/TemplateParserImplTest.java Thu Aug 24 09:33:54 2006
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.parser;
+package org.apache.tapestry.internal.services;
import java.util.List;
@@ -20,6 +20,14 @@
import org.apache.tapestry.Location;
import org.apache.tapestry.Resource;
import org.apache.tapestry.internal.ClasspathResource;
+import org.apache.tapestry.internal.parser.AttributeToken;
+import org.apache.tapestry.internal.parser.CDATAToken;
+import org.apache.tapestry.internal.parser.CommentToken;
+import org.apache.tapestry.internal.parser.ComponentTemplate;
+import org.apache.tapestry.internal.parser.StartComponentToken;
+import org.apache.tapestry.internal.parser.StartElementToken;
+import org.apache.tapestry.internal.parser.TemplateToken;
+import org.apache.tapestry.internal.parser.TextToken;
import org.apache.tapestry.test.BaseTestCase;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
Copied: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/UnclaimedFieldWorkerTest.java (from r433091, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/worker/UnclaimedFieldWorkerTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/UnclaimedFieldWorkerTest.java?p2=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/UnclaimedFieldWorkerTest.java&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/worker/UnclaimedFieldWorkerTest.java&r1=433091&r2=434419&rev=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/worker/UnclaimedFieldWorkerTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/UnclaimedFieldWorkerTest.java Thu Aug 24 09:33:54 2006
@@ -12,16 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.transform.worker;
+package org.apache.tapestry.internal.services;
-import static org.apache.tapestry.transform.TransformConstants.CONTAINING_PAGE_DID_DETACH_SIGNATURE;
-import static org.apache.tapestry.transform.TransformConstants.CONTAINING_PAGE_DID_LOAD_SIGNATURE;
+import static org.apache.tapestry.services.TransformConstants.CONTAINING_PAGE_DID_DETACH_SIGNATURE;
+import static org.apache.tapestry.services.TransformConstants.CONTAINING_PAGE_DID_LOAD_SIGNATURE;
import java.lang.reflect.Modifier;
+import org.apache.tapestry.internal.services.UnclaimedFieldWorker;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.transform.ClassTransformation;
+import org.apache.tapestry.services.ClassTransformation;
import org.testng.annotations.Test;
/**
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/AbstractFoo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/AbstractFoo.java?rev=434419&r1=434418&r2=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/AbstractFoo.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/AbstractFoo.java Thu Aug 24 09:33:54 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.transform.pages;
-import org.apache.tapestry.internal.transform.FooInterface;
+import org.apache.tapestry.internal.services.FooInterface;
/**
* @author Howard M. Lewis Ship
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/BarImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/BarImpl.java?rev=434419&r1=434418&r2=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/BarImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/BarImpl.java Thu Aug 24 09:33:54 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.transform.pages;
-import org.apache.tapestry.internal.transform.BarInterface;
+import org.apache.tapestry.internal.services.BarInterface;
/**
* @author Howard M. Lewis Ship
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/FooImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/FooImpl.java?rev=434419&r1=434418&r2=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/FooImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/FooImpl.java Thu Aug 24 09:33:54 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.transform.pages;
-import org.apache.tapestry.internal.transform.FooInterface;
+import org.apache.tapestry.internal.services.FooInterface;
/**
* @author Howard M. Lewis Ship
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/ParentClass.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/ParentClass.java?rev=434419&r1=434418&r2=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/ParentClass.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/transform/pages/ParentClass.java Thu Aug 24 09:33:54 2006
@@ -19,7 +19,7 @@
/**
* Test class used with
- * {@link org.apache.tapestry.internal.transform.InternalClassTransformationImplTest}
+ * {@link org.apache.tapestry.internal.services.InternalClassTransformationImplTest}
*
* @author Howard M. Lewis Ship
*/
Copied: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/MethodSignatureTest.java (from r433091, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/transform/MethodSignatureTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/MethodSignatureTest.java?p2=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/MethodSignatureTest.java&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/transform/MethodSignatureTest.java&r1=433091&r2=434419&rev=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/transform/MethodSignatureTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/MethodSignatureTest.java Thu Aug 24 09:33:54 2006
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.transform;
+package org.apache.tapestry.services;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import java.lang.reflect.Modifier;
-import org.apache.tapestry.transform.MethodSignature;
+import org.apache.tapestry.services.MethodSignature;
import org.testng.annotations.Test;
/**
Copied: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/SyncCostBench.java (from r433091, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/transform/SyncCostBench.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/SyncCostBench.java?p2=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/SyncCostBench.java&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/transform/SyncCostBench.java&r1=433091&r2=434419&rev=434419&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/transform/SyncCostBench.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/SyncCostBench.java Thu Aug 24 09:33:54 2006
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.transform;
+package org.apache.tapestry.services;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;