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 2008/05/16 03:55:34 UTC
svn commit: r656921 [3/3] - in /tapestry/tapestry5/trunk:
tapestry-core/src/main/java/org/apache/tapestry/
tapestry-core/src/main/java/org/apache/tapestry/annotations/
tapestry-core/src/main/java/org/apache/tapestry/corelib/base/
tapestry-core/src/main...
Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/upgrade.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/upgrade.apt?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/upgrade.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/upgrade.apt Thu May 15 18:55:31 2008
@@ -14,6 +14,22 @@
Release 5.0.12
+* {{{https://issues.apache.org/jira/browse/TAPESTRY-2421}TAPESTRY-2421}}
+
+ To enable deployment compatibility between Tapestry 4 and Tapestry 5, a
+ small number of classes
+ had to be renamed or refactored.
+
+ PageRenderSupport has been renamed to just
+ {{{../apidocs/org/apache/tapestry/RenderSupport.html}RenderSupport}}.
+
+ TapestryConstants has been removed, split into a number of new classes (by type), such as
+ {{{../apidocs/org/apache/tapestry/SymbolConstants.html}SymbolConstants}}.
+
+ Likewise, TapestryUtils has been split into
+ {{{../apidocs/org/apache/tapestry/MarkupUtils.html}MarkupUtils}} and
+ {{{../apidocs/org/apache/tapestry/VersionUtils.html}VersionUtils}}.
+
* TapestryModule
Many of the internal services of Tapestry have been split off into their own module,
Copied: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/MarkupUtilsTest.java (from r650576, tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/TapestryUtilsTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/MarkupUtilsTest.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/MarkupUtilsTest.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/TapestryUtilsTest.java&r1=650576&r2=656921&rev=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/TapestryUtilsTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/MarkupUtilsTest.java Thu May 15 18:55:31 2008
@@ -21,12 +21,12 @@
import java.util.Arrays;
import java.util.List;
-public class TapestryUtilsTest extends Assert
+public class MarkupUtilsTest extends Assert
{
@Test(dataProvider = "string_quoting_input")
public void string_quoting(String input, String expected)
{
- assertEquals(TapestryUtils.quote(input), expected);
+ assertEquals(MarkupUtils.quote(input), expected);
}
@DataProvider(name = "string_quoting_input")
@@ -44,7 +44,7 @@
@Test(dataProvider = "join_input")
public void join_array(String[] inputs, String expected)
{
- assertEquals(TapestryUtils.join(inputs), expected);
+ assertEquals(MarkupUtils.join(inputs), expected);
}
@Test(dataProvider = "join_input")
@@ -52,7 +52,7 @@
{
List<String> list = Arrays.asList(inputs);
- assertEquals(TapestryUtils.join(list), expected);
+ assertEquals(MarkupUtils.join(list), expected);
}
@DataProvider(name = "join_input")
@@ -67,22 +67,5 @@
{ "fred", "barney", "wilma" }, "barney fred wilma" } };
}
- @Test
- public void read_version_number_missing()
- {
- assertEquals(TapestryUtils.readVersionNumber("no-such-file.properties"), "UNKNOWN");
- }
-
- @Test
- public void read_version_number()
- {
- assertEquals(TapestryUtils.readVersionNumber("org/apache/tapestry/version.properties"), "1.2.3.4");
- }
-
- @Test
- public void read_version_number_no_version_key()
- {
- assertEquals(TapestryUtils.readVersionNumber("org/apache/tapestry/noversion.properties"), "UNKNOWN");
- }
}
Added: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/VersionUtilsTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/VersionUtilsTest.java?rev=656921&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/VersionUtilsTest.java (added)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/VersionUtilsTest.java Thu May 15 18:55:31 2008
@@ -0,0 +1,25 @@
+package org.apache.tapestry;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+public class VersionUtilsTest extends Assert
+{
+ @Test
+ public void read_version_number_missing()
+ {
+ assertEquals(VersionUtils.readVersionNumber("no-such-file.properties"), "UNKNOWN");
+ }
+
+ @Test
+ public void read_version_number()
+ {
+ assertEquals(VersionUtils.readVersionNumber("org/apache/tapestry/version.properties"), "1.2.3.4");
+ }
+
+ @Test
+ public void read_version_number_no_version_key()
+ {
+ assertEquals(VersionUtils.readVersionNumber("org/apache/tapestry/noversion.properties"), "UNKNOWN");
+ }
+}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/AnyTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/AnyTest.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/AnyTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/AnyTest.java Thu May 15 18:55:31 2008
@@ -16,7 +16,7 @@
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.PageRenderSupport;
+import org.apache.tapestry.RenderSupport;
import org.apache.tapestry.dom.DefaultMarkupModel;
import org.apache.tapestry.internal.services.MarkupWriterImpl;
import org.apache.tapestry.test.TapestryTestCase;
@@ -28,7 +28,7 @@
public void render_simple()
{
ComponentResources resources = mockComponentResources();
- PageRenderSupport support = mockPageRenderSupport();
+ RenderSupport support = mockRenderSupport();
MarkupWriter writer = new MarkupWriterImpl(new DefaultMarkupModel());
@@ -52,7 +52,7 @@
public void render_with_id()
{
ComponentResources resources = mockComponentResources();
- PageRenderSupport support = mockPageRenderSupport();
+ RenderSupport support = mockRenderSupport();
MarkupWriter writer = new MarkupWriterImpl(new DefaultMarkupModel());
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/ImmediateModeTests.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/ImmediateModeTests.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/ImmediateModeTests.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/ImmediateModeTests.java Thu May 15 18:55:31 2008
@@ -18,10 +18,10 @@
import org.testng.annotations.Test;
/**
- * Tests for immediate mode (aka T4 mode, aka {@linkplain org.apache.tapestry.TapestryConstants#SUPPRESS_REDIRECT_FROM_ACTION_REQUESTS_SYMBOL
+ * Tests for immediate mode (aka T4 mode, aka {@linkplain org.apache.tapestry.SymbolConstants#SUPPRESS_REDIRECT_FROM_ACTION_REQUESTS
* redirects suppressed} mode).
*/
-@Test(timeOut = 50000, sequential = true, groups = {"integration"})
+@Test(timeOut = 50000, sequential = true, groups = { "integration" })
public class ImmediateModeTests extends AbstractIntegrationTestSuite
{
public ImmediateModeTests()
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Outer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Outer.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Outer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Outer.java Thu May 15 18:55:31 2008
@@ -14,12 +14,12 @@
package org.apache.tapestry.integration.app1.components;
-import static org.apache.tapestry.TapestryConstants.LITERAL_BINDING_PREFIX;
+import org.apache.tapestry.BindingConstants;
import org.apache.tapestry.annotations.Parameter;
public class Outer
{
@SuppressWarnings("unused")
- @Parameter(defaultPrefix = LITERAL_BINDING_PREFIX)
+ @Parameter(defaultPrefix = BindingConstants.LITERAL)
private String outerValue;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/FormInjectorDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/FormInjectorDemo.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/FormInjectorDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/FormInjectorDemo.java Thu May 15 18:55:31 2008
@@ -15,7 +15,7 @@
package org.apache.tapestry.integration.app1.pages;
import org.apache.tapestry.Block;
-import org.apache.tapestry.PageRenderSupport;
+import org.apache.tapestry.RenderSupport;
import org.apache.tapestry.annotations.Component;
import org.apache.tapestry.annotations.Persist;
import org.apache.tapestry.corelib.components.FormInjector;
@@ -32,7 +32,7 @@
private Block newRow;
@Inject
- private PageRenderSupport pageRenderSupport;
+ private RenderSupport renderSupport;
@Component
private FormInjector formInjector;
@@ -65,7 +65,7 @@
void afterRender()
{
- pageRenderSupport.addScript(
+ renderSupport.addScript(
"$('addnewrow').observe('click', function() { $('%s').trigger(); return false; });",
formInjector.getClientId());
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/services/AppModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/services/AppModule.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/services/AppModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/services/AppModule.java Thu May 15 18:55:31 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.integration.app1.services;
-import org.apache.tapestry.TapestryConstants;
+import org.apache.tapestry.SymbolConstants;
import org.apache.tapestry.ValueEncoder;
import org.apache.tapestry.integration.app1.data.Track;
import org.apache.tapestry.internal.services.GenericValueEncoderFactory;
@@ -123,9 +123,9 @@
public static void contributeApplicationDefaults(MappedConfiguration<String, String> configuration)
{
- configuration.add(TapestryConstants.SUPPORTED_LOCALES_SYMBOL, "en,fr");
- configuration.add(TapestryConstants.PRODUCTION_MODE_SYMBOL, "false");
- configuration.add(TapestryConstants.COMPRESS_WHITESPACE_SYMBOL, "false");
+ configuration.add(SymbolConstants.SUPPORTED_LOCALES, "en,fr");
+ configuration.add(SymbolConstants.PRODUCTION_MODE, "false");
+ configuration.add(SymbolConstants.COMPRESS_WHITESPACE, "false");
configuration.add("app.injected-symbol", "Symbol contributed to ApplicationDefaults");
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app4/services/AppModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app4/services/AppModule.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app4/services/AppModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app4/services/AppModule.java Thu May 15 18:55:31 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.integration.app4.services;
-import org.apache.tapestry.TapestryConstants;
+import org.apache.tapestry.SymbolConstants;
import org.apache.tapestry.ioc.MappedConfiguration;
/**
@@ -25,6 +25,6 @@
{
public static void contributeApplicationDefaults(MappedConfiguration<String, String> configuration)
{
- configuration.add(TapestryConstants.SUPPRESS_REDIRECT_FROM_ACTION_REQUESTS_SYMBOL, "true");
+ configuration.add(SymbolConstants.SUPPRESS_REDIRECT_FROM_ACTION_REQUESTS, "true");
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/model/MutableComponentModelImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/model/MutableComponentModelImplTest.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/model/MutableComponentModelImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/model/MutableComponentModelImplTest.java Thu May 15 18:55:31 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.model;
-import org.apache.tapestry.TapestryConstants;
+import org.apache.tapestry.BindingConstants;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.ioc.Location;
import org.apache.tapestry.ioc.Resource;
@@ -70,13 +70,13 @@
String parameterName = "value";
- model.addParameter(parameterName, true, TapestryConstants.PROP_BINDING_PREFIX);
+ model.addParameter(parameterName, true, BindingConstants.PROP);
ParameterModel pm = model.getParameterModel(parameterName);
assertEquals(pm.getName(), parameterName);
assertEquals(true, pm.isRequired());
- assertEquals(pm.getDefaultBindingPrefix(), TapestryConstants.PROP_BINDING_PREFIX);
+ assertEquals(pm.getDefaultBindingPrefix(), BindingConstants.PROP);
assertEquals(model.getDeclaredParameterNames(), Arrays.asList(parameterName));
@@ -101,9 +101,9 @@
MutableComponentModel model = new MutableComponentModelImpl(CLASS_NAME, logger, r, null);
- model.addParameter("fred", true, TapestryConstants.PROP_BINDING_PREFIX);
- model.addParameter("wilma", true, TapestryConstants.PROP_BINDING_PREFIX);
- model.addParameter("barney", true, TapestryConstants.PROP_BINDING_PREFIX);
+ model.addParameter("fred", true, BindingConstants.PROP);
+ model.addParameter("wilma", true, BindingConstants.PROP);
+ model.addParameter("barney", true, BindingConstants.PROP);
assertEquals(model.getDeclaredParameterNames(), Arrays.asList("barney", "fred", "wilma"));
@@ -124,9 +124,9 @@
MutableComponentModel model = new MutableComponentModelImpl(CLASS_NAME, logger, r, parent);
- model.addParameter("fred", true, TapestryConstants.PROP_BINDING_PREFIX);
- model.addParameter("wilma", true, TapestryConstants.PROP_BINDING_PREFIX);
- model.addParameter("barney", true, TapestryConstants.PROP_BINDING_PREFIX);
+ model.addParameter("fred", true, BindingConstants.PROP);
+ model.addParameter("wilma", true, BindingConstants.PROP);
+ model.addParameter("barney", true, BindingConstants.PROP);
assertEquals(model.getDeclaredParameterNames(), Arrays.asList("barney", "fred", "wilma"));
assertEquals(model.getParameterNames(), Arrays.asList("barney", "betty", "fred", "wilma"));
@@ -144,13 +144,13 @@
MutableComponentModel model = new MutableComponentModelImpl(CLASS_NAME, logger, r, null);
- model.addParameter("fred", true, TapestryConstants.PROP_BINDING_PREFIX);
+ model.addParameter("fred", true, BindingConstants.PROP);
try
{
// This also helps check that the comparison is caseless!
- model.addParameter("Fred", true, TapestryConstants.PROP_BINDING_PREFIX);
+ model.addParameter("Fred", true, BindingConstants.PROP);
unreachable();
}
catch (IllegalArgumentException ex)
@@ -186,7 +186,7 @@
replay();
MutableComponentModel model = new MutableComponentModelImpl(CLASS_NAME, logger, r, null);
- model.addParameter("fred", true, TapestryConstants.PROP_BINDING_PREFIX);
+ model.addParameter("fred", true, BindingConstants.PROP);
assertNull(model.getParameterModel("barney"));
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AssetDispatcherTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AssetDispatcherTest.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AssetDispatcherTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AssetDispatcherTest.java Thu May 15 18:55:31 2008
@@ -14,7 +14,6 @@
package org.apache.tapestry.internal.services;
-import org.apache.tapestry.TapestryConstants;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.ioc.Resource;
import org.apache.tapestry.ioc.internal.util.ClasspathResource;
@@ -149,7 +148,7 @@
ResourceCache cache = mockResourceCache();
ResourceStreamer streamer = mockResourceStreamer();
- String clientURL = TapestryConstants.ASSET_PATH_PREFIX + "app1/pages/smiley.RIGHT.png";
+ String clientURL = RequestConstants.ASSET_PATH_PREFIX + "app1/pages/smiley.RIGHT.png";
String resourcePath = "org/apache/tapestry/integration/app1/pages/smiley.RIGHT.png";
train_getPath(request, clientURL);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ClasspathAssetAliasManagerImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ClasspathAssetAliasManagerImplTest.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ClasspathAssetAliasManagerImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ClasspathAssetAliasManagerImplTest.java Thu May 15 18:55:31 2008
@@ -14,7 +14,6 @@
package org.apache.tapestry.internal.services;
-import org.apache.tapestry.TapestryConstants;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
import org.apache.tapestry.services.ClasspathAssetAliasManager;
@@ -48,7 +47,7 @@
train_getContextPath(request, "/ctx");
- train_optimizePath(optimizer, "/ctx" + TapestryConstants.ASSET_PATH_PREFIX + expectedClientURL, OPTIMIZED);
+ train_optimizePath(optimizer, "/ctx" + RequestConstants.ASSET_PATH_PREFIX + expectedClientURL, OPTIMIZED);
replay();
@@ -63,10 +62,11 @@
@DataProvider(name = "to_client_url_data")
public Object[][] to_client_url_data()
{
- return new Object[][]{{"foo/bar/Baz.txt", "foo/bar/Baz.txt"}, {"com/example/mylib/Foo.bar", "mylib/Foo.bar"},
- {"com/example/mylib/nested/Foo.bar", "mylib/nested/Foo.bar"},
- {"org/apache/tapestry/internal/Foo.bar", "tapestry-internal/Foo.bar"},
- {"org/apache/tapestry/Foo.bar", "tapestry/Foo.bar"},};
+ return new Object[][] { { "foo/bar/Baz.txt", "foo/bar/Baz.txt" },
+ { "com/example/mylib/Foo.bar", "mylib/Foo.bar" },
+ { "com/example/mylib/nested/Foo.bar", "mylib/nested/Foo.bar" },
+ { "org/apache/tapestry/internal/Foo.bar", "tapestry-internal/Foo.bar" },
+ { "org/apache/tapestry/Foo.bar", "tapestry/Foo.bar" }, };
}
@Test(dataProvider = "to_resource_path_data")
@@ -85,7 +85,7 @@
for (Object[] pair : data)
{
Object buffer = pair[0];
- pair[0] = TapestryConstants.ASSET_PATH_PREFIX + pair[1];
+ pair[0] = RequestConstants.ASSET_PATH_PREFIX + pair[1];
pair[1] = buffer;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ClientBehaviorSupportImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ClientBehaviorSupportImplTest.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ClientBehaviorSupportImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ClientBehaviorSupportImplTest.java Thu May 15 18:55:31 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.services;
-import org.apache.tapestry.PageRenderSupport;
+import org.apache.tapestry.RenderSupport;
import org.apache.tapestry.json.JSONArray;
import org.apache.tapestry.json.JSONObject;
import org.apache.tapestry.test.TapestryTestCase;
@@ -25,7 +25,7 @@
@Test
public void no_changes()
{
- PageRenderSupport support = mockPageRenderSupport();
+ RenderSupport support = mockRenderSupport();
replay();
@@ -39,7 +39,7 @@
@Test
public void add_links()
{
- PageRenderSupport support = mockPageRenderSupport();
+ RenderSupport support = mockRenderSupport();
support.addInit("linkZone", new JSONArray("['client1', 'zone1']"));
support.addInit("linkZone", new JSONArray("['client2', 'zone2']"));
@@ -59,7 +59,7 @@
@Test
public void add_zones()
{
- PageRenderSupport support = mockPageRenderSupport();
+ RenderSupport support = mockRenderSupport();
support.addInit("zone", "client1");
support.addInit("zone", "client2");
@@ -79,7 +79,7 @@
@Test
public void zones_with_functions()
{
- PageRenderSupport support = mockPageRenderSupport();
+ RenderSupport support = mockRenderSupport();
support.addInit("zone", new JSONObject("{'element':'client1', 'show':'showme' }"));
support.addInit("zone", new JSONObject("{'element':'client2', 'update':'updateme' }"));
@@ -99,7 +99,7 @@
@Test
public void zone_function_names_are_converted_to_lower_case()
{
- PageRenderSupport support = mockPageRenderSupport();
+ RenderSupport support = mockRenderSupport();
support.addInit("zone", new JSONObject("{'element':'client1', 'show':'showme' }"));
support.addInit("zone", new JSONObject("{'element':'client2', 'update':'updateme' }"));
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentDefaultProviderImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentDefaultProviderImplTest.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentDefaultProviderImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentDefaultProviderImplTest.java Thu May 15 18:55:31 2008
@@ -15,8 +15,8 @@
package org.apache.tapestry.internal.services;
import org.apache.tapestry.Binding;
+import org.apache.tapestry.BindingConstants;
import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.TapestryConstants;
import org.apache.tapestry.Translator;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.ioc.Messages;
@@ -138,7 +138,7 @@
bindingSource,
"default myparam",
containerResources,
- TapestryConstants.PROP_BINDING_PREFIX,
+ BindingConstants.PROP,
id,
binding);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentEventDispatcherTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentEventDispatcherTest.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentEventDispatcherTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentEventDispatcherTest.java Thu May 15 18:55:31 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.services;
-import org.apache.tapestry.TapestryConstants;
+import org.apache.tapestry.EventConstants;
import org.apache.tapestry.internal.EmptyEventContext;
import org.apache.tapestry.internal.InternalConstants;
import org.apache.tapestry.internal.URLEventContext;
@@ -85,7 +85,7 @@
@Test
public void event_on_page_dotted_parameters() throws Exception
{
- test("/foo/MyPage:action/1.2.3/4.5.6", "foo/MyPage", "", TapestryConstants.ACTION_EVENT, "1.2.3", "4.5.6");
+ test("/foo/MyPage:action/1.2.3/4.5.6", "foo/MyPage", "", EventConstants.ACTION, "1.2.3", "4.5.6");
}
@Test
@@ -97,20 +97,20 @@
@Test
public void default_event_with_nested_id() throws Exception
{
- test("/foo/MyPage.fred", "foo/MyPage", "fred", TapestryConstants.ACTION_EVENT);
+ test("/foo/MyPage.fred", "foo/MyPage", "fred", EventConstants.ACTION);
}
@Test
public void default_event_with_nested_id_and_context() throws Exception
{
- test("/foo/MyPage.fred/fee/fie/foe/fum", "foo/MyPage", "fred", TapestryConstants.ACTION_EVENT, "fee", "fie",
+ test("/foo/MyPage.fred/fee/fie/foe/fum", "foo/MyPage", "fred", EventConstants.ACTION, "fee", "fie",
"foe", "fum");
}
@Test
public void default_event_with_context_that_includes_a_colon() throws Exception
{
- test("/foo/MyPage.underdog/a:b:c/d", "foo/MyPage", "underdog", TapestryConstants.ACTION_EVENT, "a:b:c", "d");
+ test("/foo/MyPage.underdog/a:b:c/d", "foo/MyPage", "underdog", EventConstants.ACTION, "a:b:c", "d");
}
@Test
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/EnvironmentalShadowBuilderImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/EnvironmentalShadowBuilderImplTest.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/EnvironmentalShadowBuilderImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/EnvironmentalShadowBuilderImplTest.java Thu May 15 18:55:31 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.services;
-import org.apache.tapestry.PageRenderSupport;
+import org.apache.tapestry.RenderSupport;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.ioc.internal.services.ClassFactoryImpl;
import org.apache.tapestry.ioc.services.ClassFactory;
@@ -27,11 +27,11 @@
@Test
public void proxy_class()
{
- PageRenderSupport delegate = newMock(PageRenderSupport.class);
+ RenderSupport delegate = newMock(RenderSupport.class);
ClassFactory factory = new ClassFactoryImpl();
Environment env = mockEnvironment();
- train_peekRequired(env, PageRenderSupport.class, delegate);
+ train_peekRequired(env, RenderSupport.class, delegate);
expect(delegate.allocateClientId("fred")).andReturn("barney");
@@ -39,7 +39,7 @@
EnvironmentalShadowBuilder builder = new EnvironmentalShadowBuilderImpl(factory, env);
- PageRenderSupport proxy = builder.build(PageRenderSupport.class);
+ RenderSupport proxy = builder.build(RenderSupport.class);
assertEquals(proxy.allocateClientId("fred"), "barney");
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/LinkFactoryImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/LinkFactoryImplTest.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/LinkFactoryImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/LinkFactoryImplTest.java Thu May 15 18:55:31 2008
@@ -15,8 +15,8 @@
package org.apache.tapestry.internal.services;
import org.apache.tapestry.ComponentEventCallback;
+import org.apache.tapestry.EventConstants;
import org.apache.tapestry.Link;
-import org.apache.tapestry.TapestryConstants;
import org.apache.tapestry.internal.InternalConstants;
import org.apache.tapestry.internal.structure.ComponentPageElement;
import org.apache.tapestry.internal.structure.Page;
@@ -68,14 +68,14 @@
@Test
public void action_link_with_default_action()
{
- testActionLink("", PAGE_LOGICAL_NAME, "foo.bar", TapestryConstants.ACTION_EVENT, "/sub/mypage.foo.bar/fred/5",
+ testActionLink("", PAGE_LOGICAL_NAME, "foo.bar", EventConstants.ACTION, "/sub/mypage.foo.bar/fred/5",
"fred", 5);
}
@Test
public void page_level_event_always_includes_action()
{
- testActionLink("", PAGE_LOGICAL_NAME, "", TapestryConstants.ACTION_EVENT, "/sub/mypage:action/barney/99",
+ testActionLink("", PAGE_LOGICAL_NAME, "", EventConstants.ACTION, "/sub/mypage:action/barney/99",
"barney", 99);
}
@@ -447,7 +447,7 @@
// Intercept the call to handle component event, and let the IAnswer
// do the work.
- expect(rootElement.triggerEvent(eq(TapestryConstants.PASSIVATE_EVENT), (Object[]) isNull(),
+ expect(rootElement.triggerEvent(eq(EventConstants.PASSIVATE), (Object[]) isNull(),
isA(ComponentEventCallback.class))).andAnswer(triggerEventAnswer);
listener.createdPageLink(isA(Link.class));
@@ -465,7 +465,7 @@
// Intercept the call to handle component event, and let the IAnswer
// do the work.
- expect(rootElement.triggerEvent(eq(TapestryConstants.PASSIVATE_EVENT), (Object[]) isNull(),
+ expect(rootElement.triggerEvent(eq(EventConstants.PASSIVATE), (Object[]) isNull(),
isA(ComponentEventCallback.class))).andAnswer(triggerEventAnswer);
listener.createdActionLink(isA(Link.class));
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageRenderDispatcherTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageRenderDispatcherTest.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageRenderDispatcherTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageRenderDispatcherTest.java Thu May 15 18:55:31 2008
@@ -15,8 +15,8 @@
package org.apache.tapestry.internal.services;
import org.apache.tapestry.ComponentEventCallback;
+import org.apache.tapestry.EventConstants;
import org.apache.tapestry.EventContext;
-import org.apache.tapestry.TapestryConstants;
import org.apache.tapestry.internal.structure.ComponentPageElement;
import org.apache.tapestry.internal.structure.Page;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
@@ -107,7 +107,7 @@
train_getRootElement(page, rootElement);
- train_triggerContextEvent(rootElement, TapestryConstants.ACTIVATE_EVENT, new Object[] { "foo", "bar" }, false);
+ train_triggerContextEvent(rootElement, EventConstants.ACTIVATE, new Object[] { "foo", "bar" }, false);
renderer.renderPageResponse(page);
@@ -154,7 +154,7 @@
train_get(cache, "foo/Bar", page);
train_getRootElement(page, rootElement);
- train_triggerContextEvent(rootElement, TapestryConstants.ACTIVATE_EVENT, new Object[0], false);
+ train_triggerContextEvent(rootElement, EventConstants.ACTIVATE, new Object[0], false);
renderer.renderPageResponse(page);
@@ -204,7 +204,7 @@
train_get(cache, "foo/Bar", page);
train_getRootElement(page, rootElement);
- train_triggerContextEvent(rootElement, TapestryConstants.ACTIVATE_EVENT, new Object[] { "zip", "zoom" }, false);
+ train_triggerContextEvent(rootElement, EventConstants.ACTIVATE, new Object[] { "zip", "zoom" }, false);
renderer.renderPageResponse(page);
Copied: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/RenderSupportImplTest.java (from r649837, tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageRenderSupportImplTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/RenderSupportImplTest.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/RenderSupportImplTest.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageRenderSupportImplTest.java&r1=649837&r2=656921&rev=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageRenderSupportImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/RenderSupportImplTest.java Thu May 15 18:55:31 2008
@@ -15,13 +15,13 @@
package org.apache.tapestry.internal.services;
import org.apache.tapestry.Asset;
-import org.apache.tapestry.PageRenderSupport;
+import org.apache.tapestry.RenderSupport;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.ioc.services.SymbolSource;
import org.apache.tapestry.services.AssetSource;
import org.testng.annotations.Test;
-public class PageRenderSupportImplTest extends InternalBaseTestCase
+public class RenderSupportImplTest extends InternalBaseTestCase
{
private static final String CORE_ASSET_PATH_UNEXPANDED = "${core}";
@@ -42,7 +42,7 @@
replay();
- PageRenderSupport support = new PageRenderSupportImpl(linker, null, null);
+ RenderSupport support = new RenderSupportImpl(linker, null, null);
support.addScriptLink(asset);
@@ -71,8 +71,8 @@
replay();
- PageRenderSupport support = new PageRenderSupportImpl(linker, symbolSource, assetSource,
- CORE_ASSET_PATH_UNEXPANDED);
+ RenderSupport support = new RenderSupportImpl(linker, symbolSource, assetSource,
+ CORE_ASSET_PATH_UNEXPANDED);
support.addScriptLink(asset);
@@ -88,7 +88,7 @@
replay();
- PageRenderSupport support = new PageRenderSupportImpl(linker, null, null);
+ RenderSupport support = new RenderSupportImpl(linker, null, null);
support.addScript("Tapestry.Foo(\"%s\");", "bar");
@@ -115,7 +115,7 @@
replay();
- PageRenderSupport support = new PageRenderSupportImpl(linker, source, assetSource);
+ RenderSupport support = new RenderSupportImpl(linker, source, assetSource);
support.addClasspathScriptLink(path);
@@ -134,7 +134,7 @@
replay();
- PageRenderSupport support = new PageRenderSupportImpl(linker, null, null);
+ RenderSupport support = new RenderSupportImpl(linker, null, null);
support.addStylesheetLink(asset, media);
@@ -150,7 +150,7 @@
replay();
- PageRenderSupportImpl support = new PageRenderSupportImpl(linker, null, null);
+ RenderSupportImpl support = new RenderSupportImpl(linker, null, null);
support.addInit("foo", "fred");
support.addInit("foo", "barney");
@@ -169,7 +169,7 @@
replay();
- PageRenderSupportImpl support = new PageRenderSupportImpl(linker, null, null);
+ RenderSupportImpl support = new RenderSupportImpl(linker, null, null);
support.addInit("foo", "fred", "barney");
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/RequestEncodingInitializerImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/RequestEncodingInitializerImplTest.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/RequestEncodingInitializerImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/RequestEncodingInitializerImplTest.java Thu May 15 18:55:31 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.services;
-import org.apache.tapestry.TapestryConstants;
+import org.apache.tapestry.MetaDataConstants;
import org.apache.tapestry.internal.InternalComponentResources;
import org.apache.tapestry.internal.structure.ComponentPageElement;
import org.apache.tapestry.internal.structure.Page;
@@ -42,7 +42,7 @@
train_findMeta(
locator,
- TapestryConstants.RESPONSE_CONTENT_TYPE,
+ MetaDataConstants.RESPONSE_CONTENT_TYPE,
resources,
String.class,
"text/html;charset=zebra");
@@ -75,9 +75,9 @@
train_getRootElement(page, element);
train_getComponentResources(element, resources);
- train_findMeta(locator, TapestryConstants.RESPONSE_CONTENT_TYPE, resources, String.class, "text/html");
+ train_findMeta(locator, MetaDataConstants.RESPONSE_CONTENT_TYPE, resources, String.class, "text/html");
- train_findMeta(locator, TapestryConstants.RESPONSE_ENCODING, resources, String.class, encoding);
+ train_findMeta(locator, MetaDataConstants.RESPONSE_ENCODING, resources, String.class, encoding);
request.setEncoding(encoding);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/RequestSecurityManagerImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/RequestSecurityManagerImplTest.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/RequestSecurityManagerImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/RequestSecurityManagerImplTest.java Thu May 15 18:55:31 2008
@@ -16,7 +16,7 @@
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.Link;
-import org.apache.tapestry.TapestryConstants;
+import org.apache.tapestry.MetaDataConstants;
import org.apache.tapestry.internal.structure.Page;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.runtime.Component;
@@ -158,7 +158,7 @@
train_getRootComponent(page, component);
train_getComponentResources(component, resources);
- train_findMeta(locator, TapestryConstants.SECURE_PAGE, resources, Boolean.class, secure);
+ train_findMeta(locator, MetaDataConstants.SECURE_PAGE, resources, Boolean.class, secure);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ContentTypeWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ContentTypeWorkerTest.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ContentTypeWorkerTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ContentTypeWorkerTest.java Thu May 15 18:55:31 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.transform;
-import org.apache.tapestry.TapestryConstants;
+import org.apache.tapestry.MetaDataConstants;
import org.apache.tapestry.annotations.ContentType;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
@@ -52,7 +52,7 @@
expect(annotation.value()).andReturn(value);
- model.setMeta(TapestryConstants.RESPONSE_CONTENT_TYPE, value);
+ model.setMeta(MetaDataConstants.RESPONSE_CONTENT_TYPE, value);
replay();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ParameterWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ParameterWorkerTest.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ParameterWorkerTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ParameterWorkerTest.java Thu May 15 18:55:31 2008
@@ -18,7 +18,7 @@
import javassist.Loader;
import javassist.LoaderClassPath;
import org.apache.tapestry.Binding;
-import org.apache.tapestry.TapestryConstants;
+import org.apache.tapestry.BindingConstants;
import org.apache.tapestry.internal.InternalComponentResources;
import org.apache.tapestry.internal.services.Instantiator;
import org.apache.tapestry.internal.services.InternalClassTransformation;
@@ -466,7 +466,7 @@
MutableComponentModel model = mockMutableComponentModel(logger);
- model.addParameter("value", false, TapestryConstants.PROP_BINDING_PREFIX);
+ model.addParameter("value", false, BindingConstants.PROP);
Runnable phaseTwoTraining = new Runnable()
{
@@ -474,7 +474,7 @@
{
train_isBound(resources, "value", false);
- expect(source.newBinding("default value", resources, TapestryConstants.PROP_BINDING_PREFIX,
+ expect(source.newBinding("default value", resources, BindingConstants.PROP,
"literal:greeting")).andReturn(binding);
resources.bindParameter("value", binding);
@@ -511,7 +511,7 @@
MutableComponentModel model = mockMutableComponentModel(logger);
- model.addParameter("value", false, TapestryConstants.PROP_BINDING_PREFIX);
+ model.addParameter("value", false, BindingConstants.PROP);
Runnable phaseTwoTraining = new Runnable()
{
@@ -563,11 +563,11 @@
final Logger logger = mockLogger();
MutableComponentModel model = mockMutableComponentModel(logger);
- model.addParameter("invariantObject", false, TapestryConstants.PROP_BINDING_PREFIX);
- model.addParameter("invariantPrimitive", false, TapestryConstants.PROP_BINDING_PREFIX);
- model.addParameter("object", false, TapestryConstants.PROP_BINDING_PREFIX);
- model.addParameter("primitive", true, TapestryConstants.PROP_BINDING_PREFIX);
- model.addParameter("uncached", false, TapestryConstants.LITERAL_BINDING_PREFIX);
+ model.addParameter("invariantObject", false, BindingConstants.PROP);
+ model.addParameter("invariantPrimitive", false, BindingConstants.PROP);
+ model.addParameter("object", false, BindingConstants.PROP);
+ model.addParameter("primitive", true, BindingConstants.PROP);
+ model.addParameter("uncached", false, BindingConstants.LITERAL);
Runnable phaseTwoTraining = new Runnable()
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ResponseEncodingWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ResponseEncodingWorkerTest.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ResponseEncodingWorkerTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/transform/ResponseEncodingWorkerTest.java Thu May 15 18:55:31 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.transform;
-import org.apache.tapestry.TapestryConstants;
+import org.apache.tapestry.MetaDataConstants;
import org.apache.tapestry.annotations.ResponseEncoding;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
@@ -51,7 +51,7 @@
expect(annotation.value()).andReturn(value);
- model.setMeta(TapestryConstants.RESPONSE_ENCODING, value);
+ model.setMeta(MetaDataConstants.RESPONSE_ENCODING, value);
replay();
Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/services/AppModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/services/AppModule.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/services/AppModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/services/AppModule.java Thu May 15 18:55:31 2008
@@ -14,7 +14,7 @@
package org.example.app0.services;
-import org.apache.tapestry.TapestryConstants;
+import org.apache.tapestry.SymbolConstants;
import org.apache.tapestry.hibernate.HibernateModule;
import org.apache.tapestry.hibernate.HibernateTransactionDecorator;
import org.apache.tapestry.ioc.MappedConfiguration;
@@ -32,7 +32,7 @@
public static void contributeApplicationDefaults(MappedConfiguration<String, String> configuration)
{
- configuration.add(TapestryConstants.PRODUCTION_MODE_SYMBOL, "false");
+ configuration.add(SymbolConstants.PRODUCTION_MODE, "false");
}
@Match("*DAO")
Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/services/AppModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/services/AppModule.java?rev=656921&r1=656920&r2=656921&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/services/AppModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/services/AppModule.java Thu May 15 18:55:31 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.tutorial.services;
-import org.apache.tapestry.TapestryConstants;
+import org.apache.tapestry.SymbolConstants;
import org.apache.tapestry.ioc.MappedConfiguration;
import org.apache.tapestry.ioc.OrderedConfiguration;
import org.apache.tapestry.ioc.annotations.Marker;
@@ -42,8 +42,8 @@
// you can extend this list of locales (it's a comma seperated series of locale names;
// the first locale name is the default when there's no reasonable match).
- configuration.add(TapestryConstants.SUPPORTED_LOCALES_SYMBOL, "en");
- configuration.add(TapestryConstants.PRODUCTION_MODE_SYMBOL, "false");
+ configuration.add(SymbolConstants.SUPPORTED_LOCALES, "en");
+ configuration.add(SymbolConstants.PRODUCTION_MODE, "false");
}
/**