You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2003/03/23 02:29:43 UTC
cvs commit: jakarta-tapestry/framework/src/org/apache/tapestry/callback ExternalCallback.java
hlship 2003/03/22 17:29:43
Modified: contrib/src/org/apache/tapestry/contrib/form
CheckBoxMultiplePropertySelectionRenderer.java
framework/src/org/apache/tapestry/util ComponentAddress.java
framework/src/org/apache/tapestry/engine
ISpecificationSource.java IPageLoader.java
AbstractEngine.java DefaultSpecificationSource.java
Namespace.java IEngineService.java
framework/src/org/apache/tapestry/bean
FieldBeanInitializer.java
AbstractBeanInitializer.java
StringBeanInitializer.java
ExpressionBeanInitializer.java
StaticBeanInitializer.java
framework/src/org/apache/tapestry/form Upload.java
Option.java SelectPropertySelectionRenderer.java
TextArea.java RadioPropertySelectionRenderer.java
Radio.java Select.java AbstractTextField.java
PropertySelection.java Submit.java Checkbox.java
ImageSubmit.java Button.java
framework/src/org/apache/tapestry/parse
ComponentTemplate.java
framework/src/org/apache/tapestry/request
RequestContext.java
framework/src/org/apache/tapestry AbstractMarkupWriter.java
AbstractComponent.java IPage.java
BaseComponentTemplateLoader.java INamespace.java
Tapestry.java IEngine.java IMarkupWriter.java
AbstractPage.java
contrib/src/org/apache/tapestry/contrib/palette Palette.java
framework/src/org/apache/tapestry/spec
AssetSpecification.java LibrarySpecification.java
SpecFactory.java ILibrarySpecification.java
BindingSpecification.java
framework/src/org/apache/tapestry/binding
ListenerBinding.java
framework/src/org/apache/tapestry/pageload PageSource.java
PageLoader.java
eclipse Tapestry-Mock.launch
web new.html
framework/src/org/apache/tapestry/callback
ExternalCallback.java
Removed: framework/src/org/apache/tapestry/bean
PropertyBeanInitializer.java
framework/src/org/apache/tapestry/util/prop IPublicBean.java
framework/src/org/apache/tapestry/event
PageCleanupListener.java
Log:
Remove dead and deprecated code.
Revision Changes Path
1.3 +3 -3 jakarta-tapestry/contrib/src/org/apache/tapestry/contrib/form/CheckBoxMultiplePropertySelectionRenderer.java
Index: CheckBoxMultiplePropertySelectionRenderer.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/contrib/src/org/apache/tapestry/contrib/form/CheckBoxMultiplePropertySelectionRenderer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CheckBoxMultiplePropertySelectionRenderer.java 15 Mar 2003 21:22:14 -0000 1.2
+++ CheckBoxMultiplePropertySelectionRenderer.java 23 Mar 2003 01:29:41 -0000 1.3
@@ -125,10 +125,10 @@
writer.attribute("value", model.getValue(index));
if (component.isDisabled())
- writer.attribute("disabled");
+ writer.attribute("disabled", "disabled");
if (selected)
- writer.attribute("checked");
+ writer.attribute("checked", "checked");
writer.end(); // <td>
1.2 +2 -2 jakarta-tapestry/framework/src/org/apache/tapestry/util/ComponentAddress.java
Index: ComponentAddress.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/util/ComponentAddress.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ComponentAddress.java 5 Mar 2003 22:59:33 -0000 1.1
+++ ComponentAddress.java 23 Mar 2003 01:29:41 -0000 1.2
@@ -93,7 +93,7 @@
*/
public ComponentAddress(IComponent component)
{
- this(component.getPage().getName(), component.getIdPath());
+ this(component.getPage().getPageName(), component.getIdPath());
}
/**
1.2 +1 -17 jakarta-tapestry/framework/src/org/apache/tapestry/engine/ISpecificationSource.java
Index: ISpecificationSource.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/engine/ISpecificationSource.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ISpecificationSource.java 5 Mar 2003 22:59:43 -0000 1.1
+++ ISpecificationSource.java 23 Mar 2003 01:29:41 -0000 1.2
@@ -111,22 +111,6 @@
public void reset();
/**
- * Returns a {@link INamespace} for the given id.
- *
- * @param id the name of the namespace, possibly as a dotted name
- * sequence. Null for the application namespace, "framework"
- * for the framework namespace.
- * @return the namespace
- * @throws ApplicationRuntimeException if the namespace cannot
- * be located.
- *
- * @since 2.2
- *
- **/
-
- public INamespace getNamespace(String id);
-
- /**
* Returns a {@link LibrarySpecification} with the given path.
*
* @param resourcePath the resource path of the specification
1.3 +4 -2 jakarta-tapestry/framework/src/org/apache/tapestry/engine/IPageLoader.java
Index: IPageLoader.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/engine/IPageLoader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IPageLoader.java 15 Mar 2003 21:22:20 -0000 1.2
+++ IPageLoader.java 23 Mar 2003 01:29:41 -0000 1.3
@@ -58,6 +58,7 @@
import org.apache.tapestry.IComponent;
import org.apache.tapestry.IEngine;
import org.apache.tapestry.IRequestCycle;
+import org.apache.tapestry.Location;
/**
* Interface exposed to components as they are loaded by the page loader.
@@ -105,5 +106,6 @@
IRequestCycle cycle,
IComponent container,
String componentId,
- String componentType);
+ String componentType,
+ Location location);
}
1.6 +2 -43 jakarta-tapestry/framework/src/org/apache/tapestry/engine/AbstractEngine.java
Index: AbstractEngine.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/engine/AbstractEngine.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractEngine.java 18 Mar 2003 20:55:31 -0000 1.5
+++ AbstractEngine.java 23 Mar 2003 01:29:41 -0000 1.6
@@ -889,7 +889,7 @@
}
catch (RedirectException ex)
{
- redirectOut(cycle, ex);
+ handleRedirectException(cycle, ex);
}
catch (StaleLinkException ex)
{
@@ -1706,22 +1706,6 @@
/**
* Invoked when a {@link RedirectException} is thrown during the processing of a request.
*
- * @throws RequestCycleException if an {@link IOException} is thrown by the redirect
- *
- * @since 1.0.6
- * @deprecated To be removed in 2.3.
- * Override {@link #handleRedirectException(IRequestCycle, RedirectException)} instead.
- *
- **/
-
- protected void redirectOut(IRequestCycle cycle, RedirectException ex)
- {
- handleRedirectException(cycle, ex);
- }
-
- /**
- * Invoked when a {@link RedirectException} is thrown during the processing of a request.
- *
* @throws RequestCycleException if an {@link IOException},
* {@link ServletException} is thrown by the redirect, or if no
* {@link RequestDispatcher} can be found for local resource.
@@ -1946,31 +1930,6 @@
return serviceData;
return serviceData.substring(0, slashx);
- }
-
- /**
- * Returns false.
- *
- * @deprecated With no replacement. To be removed in 2.5.
- * @since 2.2
- *
- **/
-
- public boolean isRefreshing()
- {
- return false;
- }
-
- /**
- * Does nothing.
- *
- * @deprecated With no replacement. To be removed in 2.5.
- * @since 2.2
- *
- **/
-
- public void setRefreshing(boolean refreshing)
- {
}
/** @since 2.3 **/
1.3 +1 -56 jakarta-tapestry/framework/src/org/apache/tapestry/engine/DefaultSpecificationSource.java
Index: DefaultSpecificationSource.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/engine/DefaultSpecificationSource.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultSpecificationSource.java 15 Mar 2003 21:22:20 -0000 1.2
+++ DefaultSpecificationSource.java 23 Mar 2003 01:29:41 -0000 1.3
@@ -271,21 +271,6 @@
}
}
- /** @since 2.2 **/
-
- private void close(InputStream stream)
- {
- try
- {
- if (stream != null)
- stream.close();
- }
- catch (IOException ex)
- {
- // Ignore it.
- }
- }
-
public synchronized String toString()
{
ToStringBuilder builder = new ToStringBuilder(this);
@@ -395,20 +380,6 @@
return result;
}
- public synchronized INamespace getNamespace(String id)
- {
- INamespace result = (INamespace) _namespaceCache.get(id);
-
- if (result == null)
- {
- result = findNamespace(id);
-
- _namespaceCache.put(id, result);
- }
-
- return result;
- }
-
/** @since 2.2 **/
protected SpecificationParser getParser()
@@ -451,30 +422,4 @@
return _frameworkNamespace;
}
- /**
- *
- * Finds or creates the namespace.
- *
- * @param id the id, or id path, of the namespace.
- * @return the namespace,
- * @throws ApplicationRuntimeException if the namespace does not exist
- * @since 2.2
- *
- **/
-
- private INamespace findNamespace(String id)
- {
- StringSplitter splitter = new StringSplitter('.');
-
- String idPath[] = splitter.splitToArray(id);
-
- INamespace n = getApplicationNamespace();
-
- for (int i = 0; i < idPath.length; i++)
- {
- n = n.getChildNamespace(idPath[i]);
- }
-
- return n;
- }
}
1.2 +24 -27 jakarta-tapestry/framework/src/org/apache/tapestry/engine/Namespace.java
Index: Namespace.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/engine/Namespace.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Namespace.java 5 Mar 2003 22:59:43 -0000 1.1
+++ Namespace.java 23 Mar 2003 01:29:41 -0000 1.2
@@ -66,6 +66,7 @@
import org.apache.tapestry.ApplicationRuntimeException;
import org.apache.tapestry.INamespace;
import org.apache.tapestry.IResourceLocation;
+import org.apache.tapestry.Location;
import org.apache.tapestry.Tapestry;
import org.apache.tapestry.resource.ClasspathResourceLocation;
import org.apache.tapestry.spec.ComponentSpecification;
@@ -246,20 +247,6 @@
return result;
}
- public List getComponentAliases()
- {
- Set types = new HashSet();
-
- types.addAll(_components.keySet());
- types.addAll(_specification.getComponentTypes());
-
- List result = new ArrayList(types);
-
- Collections.sort(result);
-
- return result;
- }
-
public String getServiceClassName(String name)
{
return _specification.getServiceClassName(name);
@@ -363,12 +350,6 @@
return new Namespace(id, this, ls, _specificationSource);
}
- public boolean containsAlias(String type)
- {
- return _components.containsKey(type)
- || (_specification.getComponentSpecificationPath(type) != null);
- }
-
public boolean containsPage(String name)
{
return _pages.containsKey(name) || (_specification.getPageSpecificationPath(name) != null);
@@ -418,22 +399,38 @@
_components.put(type, specification);
}
- // On these renamed methods, we simply invoke the old, deprecated method
- // for code coverage reasons. In 2.5 we delete the deprecated method
- // and move its body here.
-
/** @since 2.4 **/
public boolean containsComponentType(String type)
{
- return containsAlias(type);
+ return _components.containsKey(type)
+ || (_specification.getComponentSpecificationPath(type) != null);
}
/** @since 2.4 **/
public List getComponentTypes()
{
- return getComponentAliases();
+ Set types = new HashSet();
+
+ types.addAll(_components.keySet());
+ types.addAll(_specification.getComponentTypes());
+
+ List result = new ArrayList(types);
+
+ Collections.sort(result);
+
+ return result;
+ }
+
+ /** @since 2.4 **/
+
+ public Location getLocation()
+ {
+ if (_specification == null)
+ return null;
+
+ return _specification.getLocation();
}
}
1.4 +1 -2 jakarta-tapestry/framework/src/org/apache/tapestry/engine/IEngineService.java
Index: IEngineService.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/engine/IEngineService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IEngineService.java 18 Mar 2003 20:55:31 -0000 1.3
+++ IEngineService.java 23 Mar 2003 01:29:41 -0000 1.4
@@ -61,7 +61,6 @@
import org.apache.tapestry.IComponent;
import org.apache.tapestry.IRequestCycle;
-import org.apache.tapestry.Tapestry;
import org.apache.tapestry.request.ResponseOutputStream;
/**
1.2 +1 -8 jakarta-tapestry/framework/src/org/apache/tapestry/bean/FieldBeanInitializer.java
Index: FieldBeanInitializer.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/bean/FieldBeanInitializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FieldBeanInitializer.java 5 Mar 2003 22:59:29 -0000 1.1
+++ FieldBeanInitializer.java 23 Mar 2003 01:29:41 -0000 1.2
@@ -77,13 +77,6 @@
protected Object _fieldValue;
private boolean _fieldResolved = false;
- public FieldBeanInitializer(String propertyName, String fieldName)
- {
- super(propertyName);
-
- _fieldName = fieldName;
- }
-
public void setBeanProperty(IBeanProvider provider, Object bean)
{
IResourceResolver resolver = provider.getResourceResolver();
1.3 +1 -15 jakarta-tapestry/framework/src/org/apache/tapestry/bean/AbstractBeanInitializer.java
Index: AbstractBeanInitializer.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/bean/AbstractBeanInitializer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractBeanInitializer.java 15 Mar 2003 21:22:23 -0000 1.2
+++ AbstractBeanInitializer.java 23 Mar 2003 01:29:41 -0000 1.3
@@ -72,20 +72,6 @@
{
protected String _propertyName;
- /** @since 2.4 **/
-
- public AbstractBeanInitializer()
- {
- }
-
- /** @deprecated **/
-
- public AbstractBeanInitializer(String propertyName)
- {
- this();
- setPropertyName(propertyName);
- }
-
public String getPropertyName()
{
return _propertyName;
1.3 +1 -15 jakarta-tapestry/framework/src/org/apache/tapestry/bean/StringBeanInitializer.java
Index: StringBeanInitializer.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/bean/StringBeanInitializer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StringBeanInitializer.java 15 Mar 2003 21:22:23 -0000 1.2
+++ StringBeanInitializer.java 23 Mar 2003 01:29:41 -0000 1.3
@@ -71,21 +71,7 @@
public class StringBeanInitializer extends AbstractBeanInitializer
{
protected String _key;
-
- /** @since 2.4 **/
- public StringBeanInitializer()
- {
- }
-
- /** @deprecated **/
-
- public StringBeanInitializer(String propertyName, String key)
- {
- super(propertyName);
-
- setKey(key);
- }
public void setBeanProperty(IBeanProvider provider, Object bean)
{
1.3 +26 -9 jakarta-tapestry/framework/src/org/apache/tapestry/bean/ExpressionBeanInitializer.java
Index: ExpressionBeanInitializer.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/bean/ExpressionBeanInitializer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ExpressionBeanInitializer.java 15 Mar 2003 21:22:23 -0000 1.2
+++ ExpressionBeanInitializer.java 23 Mar 2003 01:29:41 -0000 1.3
@@ -55,31 +55,48 @@
package org.apache.tapestry.bean;
+import org.apache.tapestry.IBeanProvider;
+import org.apache.tapestry.IComponent;
+import org.apache.tapestry.IResourceResolver;
+import org.apache.tapestry.util.prop.OgnlUtils;
+
/**
*
* Initializes a helper bean property from an OGNL expression (relative
* to the bean's {@link IComponent}).
*
- * <p>Replacement for {@link org.apache.tapestry.bean.PropertyBeanInitializer}.
- *
* @author Howard Lewis Ship
* @version $Id$
* @since 2.2
*
**/
-public class ExpressionBeanInitializer extends PropertyBeanInitializer
+
+public class ExpressionBeanInitializer extends AbstractBeanInitializer
{
+ protected String _expression;
+
+ public void setBeanProperty(IBeanProvider provider, Object bean)
+ {
+ IResourceResolver resolver = provider.getResourceResolver();
+ IComponent component = provider.getComponent();
+
+ Object value = OgnlUtils.get(_expression, resolver, component);
+
+ setBeanProperty(resolver, bean, value);
+ }
+
/** @since 2.4 **/
- public ExpressionBeanInitializer()
+ public String getExpression()
{
+ return _expression;
}
- /** @deprecated **/
+ /** @since 2.4 **/
- public ExpressionBeanInitializer(String propertyName, String expression)
+ public void setExpression(String expression)
{
- super(propertyName, expression);
+ _expression = expression;
}
-}
+}
\ No newline at end of file
1.2 +1 -8 jakarta-tapestry/framework/src/org/apache/tapestry/bean/StaticBeanInitializer.java
Index: StaticBeanInitializer.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/bean/StaticBeanInitializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StaticBeanInitializer.java 5 Mar 2003 22:59:29 -0000 1.1
+++ StaticBeanInitializer.java 23 Mar 2003 01:29:41 -0000 1.2
@@ -70,13 +70,6 @@
{
protected Object _value;
- public StaticBeanInitializer(String propertyName, Object value)
- {
- super(propertyName);
-
- _value = value;
- }
-
public void setBeanProperty(IBeanProvider provider, Object bean)
{
setBeanProperty(provider.getResourceResolver(), bean, _value);
1.4 +2 -2 jakarta-tapestry/framework/src/org/apache/tapestry/form/Upload.java
Index: Upload.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/form/Upload.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Upload.java 17 Mar 2003 18:10:48 -0000 1.3
+++ Upload.java 23 Mar 2003 01:29:41 -0000 1.4
@@ -98,7 +98,7 @@
writer.attribute("name", name);
if (isDisabled())
- writer.attribute("disabled");
+ writer.attribute("disabled", "disabled");
// Size, width, etc. can be specified as informal parameters
// (Not making the same mistake here that was made with TextField
1.3 +2 -2 jakarta-tapestry/framework/src/org/apache/tapestry/form/Option.java
Index: Option.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/form/Option.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Option.java 15 Mar 2003 21:22:11 -0000 1.2
+++ Option.java 23 Mar 2003 01:29:41 -0000 1.3
@@ -114,7 +114,7 @@
writer.attribute("value", value);
if (getSelectedBinding().getBoolean())
- writer.attribute("selected");
+ writer.attribute("selected", "selected");
generateAttributes(writer, cycle);
1.3 +3 -3 jakarta-tapestry/framework/src/org/apache/tapestry/form/SelectPropertySelectionRenderer.java
Index: SelectPropertySelectionRenderer.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/form/SelectPropertySelectionRenderer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SelectPropertySelectionRenderer.java 15 Mar 2003 21:22:11 -0000 1.2
+++ SelectPropertySelectionRenderer.java 23 Mar 2003 01:29:41 -0000 1.3
@@ -87,7 +87,7 @@
writer.attribute("name", component.getName());
if (component.isDisabled())
- writer.attribute("disabled");
+ writer.attribute("disabled", "disabled");
writer.println();
}
@@ -123,7 +123,7 @@
writer.attribute("value", model.getValue(index));
if (selected)
- writer.attribute("selected");
+ writer.attribute("selected", "selected");
writer.print(model.getLabel(index));
1.4 +2 -2 jakarta-tapestry/framework/src/org/apache/tapestry/form/TextArea.java
Index: TextArea.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/form/TextArea.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TextArea.java 17 Mar 2003 18:10:48 -0000 1.3
+++ TextArea.java 23 Mar 2003 01:29:41 -0000 1.4
@@ -108,7 +108,7 @@
writer.attribute("name", name);
if (isDisabled())
- writer.attribute("disabled");
+ writer.attribute("disabled", "disabled");
int rows = getRows();
int columns = getColumns();
1.3 +3 -3 jakarta-tapestry/framework/src/org/apache/tapestry/form/RadioPropertySelectionRenderer.java
Index: RadioPropertySelectionRenderer.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/form/RadioPropertySelectionRenderer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RadioPropertySelectionRenderer.java 15 Mar 2003 21:22:11 -0000 1.2
+++ RadioPropertySelectionRenderer.java 23 Mar 2003 01:29:41 -0000 1.3
@@ -117,10 +117,10 @@
writer.attribute("value", model.getValue(index));
if (component.isDisabled())
- writer.attribute("disabled");
+ writer.attribute("disabled", "disabled");
if (selected)
- writer.attribute("checked");
+ writer.attribute("checked", "checked");
writer.end(); // <td>
1.3 +3 -3 jakarta-tapestry/framework/src/org/apache/tapestry/form/Radio.java
Index: Radio.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/form/Radio.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Radio.java 15 Mar 2003 21:22:11 -0000 1.2
+++ Radio.java 23 Mar 2003 01:29:41 -0000 1.3
@@ -123,10 +123,10 @@
// for the group as a whole; if so this is the default radio and is checked.
if (group.isSelection(getValue()))
- writer.attribute("checked");
+ writer.attribute("checked", "checked");
if (isDisabled() || group.isDisabled())
- writer.attribute("disabled");
+ writer.attribute("disabled", "disabled");
// The value for the Radio matches the option number (provided by the RadioGroup).
// When the form is submitted, the RadioGroup will know which option was,
1.4 +3 -3 jakarta-tapestry/framework/src/org/apache/tapestry/form/Select.java
Index: Select.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/form/Select.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Select.java 17 Mar 2003 18:10:48 -0000 1.3
+++ Select.java 23 Mar 2003 01:29:41 -0000 1.4
@@ -166,10 +166,10 @@
writer.attribute("name", name);
if (isMultiple())
- writer.attribute("multiple");
+ writer.attribute("multiple", "multiple");
if (isDisabled())
- writer.attribute("disabled");
+ writer.attribute("disabled", "disabled");
generateAttributes(writer, cycle);
}
1.5 +2 -2 jakarta-tapestry/framework/src/org/apache/tapestry/form/AbstractTextField.java
Index: AbstractTextField.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/form/AbstractTextField.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractTextField.java 21 Mar 2003 19:01:25 -0000 1.4
+++ AbstractTextField.java 23 Mar 2003 01:29:41 -0000 1.5
@@ -117,7 +117,7 @@
writer.attribute("type", isHidden() ? "password" : "text");
if (isDisabled())
- writer.attribute("disabled");
+ writer.attribute("disabled", "disabled");
writer.attribute("name", name);
1.6 +3 -3 jakarta-tapestry/framework/src/org/apache/tapestry/form/PropertySelection.java
Index: PropertySelection.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/form/PropertySelection.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PropertySelection.java 17 Mar 2003 18:10:48 -0000 1.5
+++ PropertySelection.java 23 Mar 2003 01:29:41 -0000 1.6
@@ -151,7 +151,7 @@
writer.attribute("name", name);
if (isDisabled())
- writer.attribute("disabled");
+ writer.attribute("disabled", "disabled");
if (getSubmitOnChange())
writer.attribute("onchange", "javascript:this.form.submit();");
@@ -187,7 +187,7 @@
writer.attribute("value", model.getValue(i));
if (selected)
- writer.attribute("selected");
+ writer.attribute("selected", "selected");
writer.print(model.getLabel(i));
1.4 +2 -2 jakarta-tapestry/framework/src/org/apache/tapestry/form/Submit.java
Index: Submit.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/form/Submit.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Submit.java 17 Mar 2003 18:10:48 -0000 1.3
+++ Submit.java 23 Mar 2003 01:29:41 -0000 1.4
@@ -127,7 +127,7 @@
writer.attribute("name", name);
if (isDisabled())
- writer.attribute("disabled");
+ writer.attribute("disabled", "disabled");
String label = getLabel();
1.4 +3 -3 jakarta-tapestry/framework/src/org/apache/tapestry/form/Checkbox.java
Index: Checkbox.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/form/Checkbox.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Checkbox.java 17 Mar 2003 18:10:48 -0000 1.3
+++ Checkbox.java 23 Mar 2003 01:29:41 -0000 1.4
@@ -105,10 +105,10 @@
writer.attribute("name", name);
if (isDisabled())
- writer.attribute("disabled");
+ writer.attribute("disabled", "disabled");
if (isSelected())
- writer.attribute("checked");
+ writer.attribute("checked", "checked");
generateAttributes(writer, cycle);
1.4 +2 -2 jakarta-tapestry/framework/src/org/apache/tapestry/form/ImageSubmit.java
Index: ImageSubmit.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/form/ImageSubmit.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ImageSubmit.java 17 Mar 2003 18:10:48 -0000 1.3
+++ ImageSubmit.java 23 Mar 2003 01:29:41 -0000 1.4
@@ -167,7 +167,7 @@
writer.attribute("name", name);
if (disabled)
- writer.attribute("disabled");
+ writer.attribute("disabled", "disabled");
// NN4 places a border unless you tell it otherwise.
// IE ignores the border attribute and never shows a border.
1.4 +2 -2 jakarta-tapestry/framework/src/org/apache/tapestry/form/Button.java
Index: Button.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/form/Button.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Button.java 17 Mar 2003 18:10:48 -0000 1.3
+++ Button.java 23 Mar 2003 01:29:41 -0000 1.4
@@ -93,7 +93,7 @@
if (isDisabled())
{
- writer.attribute("disabled");
+ writer.attribute("disabled", "disabled");
}
String label = getLabel();
1.2 +11 -9 jakarta-tapestry/framework/src/org/apache/tapestry/parse/ComponentTemplate.java
Index: ComponentTemplate.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/parse/ComponentTemplate.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ComponentTemplate.java 5 Mar 2003 22:59:28 -0000 1.1
+++ ComponentTemplate.java 23 Mar 2003 01:29:42 -0000 1.2
@@ -76,9 +76,9 @@
*
**/
- private char[] templateData;
+ private char[] _templateData;
- private TemplateToken[] tokens;
+ private TemplateToken[] _tokens;
/**
* Creates a new ComponentTemplate.
@@ -86,28 +86,30 @@
* @param templateData The template data. This is <em>not</em> copied, so
* the array passed in should not be modified further.
*
- * @param tokens The tokens making up the template.
+ * @param tokens The tokens making up the template. This is also
+ * retained (<em>not</em> copied), and so should not
+ * be modified once passed to the constructor.
*
**/
public ComponentTemplate(char[] templateData, TemplateToken[] tokens)
{
- this.templateData = templateData;
- this.tokens = tokens;
+ _templateData = templateData;
+ _tokens = tokens;
}
public char[] getTemplateData()
{
- return templateData;
+ return _templateData;
}
public TemplateToken getToken(int index)
{
- return tokens[index];
+ return _tokens[index];
}
public int getTokenCount()
{
- return tokens.length;
+ return _tokens.length;
}
}
1.3 +1 -78 jakarta-tapestry/framework/src/org/apache/tapestry/request/RequestContext.java
Index: RequestContext.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/request/RequestContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RequestContext.java 15 Mar 2003 21:22:30 -0000 1.2
+++ RequestContext.java 23 Mar 2003 01:29:42 -0000 1.3
@@ -184,15 +184,6 @@
private Map _cookieMap;
/**
- * Used to contain the parsed, decoded pathInfo.
- *
- * @deprecated To be removed in 2.3.
- *
- **/
-
- private String[] _pathInfo;
-
- /**
* Used during {@link #write(IMarkupWriter)}.
*
**/
@@ -305,22 +296,6 @@
_cookieMap.put(cookie.getName(), cookie);
}
- private void buildPathInfo()
- {
- String raw = _request.getPathInfo();
-
- if (raw == null)
- {
- _pathInfo = new String[] {
- };
- return;
- }
-
- StringSplitter splitter = new StringSplitter('/');
-
- _pathInfo = splitter.splitToArray(raw);
- }
-
private void datePair(IMarkupWriter writer, String name, long value)
{
pair(writer, name, new Date(value));
@@ -649,44 +624,6 @@
}
/**
- * Returns the pathInfo string at the given index. If the index
- * is out of range, this returns null.
- *
- * @deprecated To be removed in 2.3
- **/
-
- public String getPathInfo(int index)
- {
- if (_pathInfo == null)
- buildPathInfo();
-
- try
- {
- return _pathInfo[index];
- }
- catch (ArrayIndexOutOfBoundsException ex)
- {
- return null;
- }
-
- }
-
- /**
- * Returns the number of items in the pathInfo.
- *
- * @deprecated To be removed in 2.3.
- *
- **/
-
- public int getPathInfoCount()
- {
- if (_pathInfo == null)
- buildPathInfo();
-
- return _pathInfo.length;
- }
-
- /**
* Returns the request which initiated the current request cycle. Note that
* the methods {@link #getParameter(String)} and {@link #getParameters(String)}
* should be used, rather than obtaining parameters directly from the request
@@ -958,20 +895,6 @@
object(writer, "Request");
writer.begin("table");
writer.attribute("class", "request-context-object");
-
- if (_pathInfo == null)
- buildPathInfo();
-
- for (int i = 0; i < _pathInfo.length; i++)
- {
- if (i == 0)
- {
- section(writer, "Path Info");
- header(writer, "Index", "Value");
- }
-
- pair(writer, Integer.toString(i), _pathInfo[i]);
- }
// Parameters ...
1.3 +1 -18 jakarta-tapestry/framework/src/org/apache/tapestry/AbstractMarkupWriter.java
Index: AbstractMarkupWriter.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/AbstractMarkupWriter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractMarkupWriter.java 12 Mar 2003 16:49:37 -0000 1.2
+++ AbstractMarkupWriter.java 23 Mar 2003 01:29:42 -0000 1.3
@@ -254,23 +254,6 @@
}
/**
- * Simply prints the attribute name. This is used for
- * idempotent attributes, such as 'disabled' in an
- * <input>.
- *
- * <p>TBD: Check that name is legal.
- *
- * @throws IllegalStateException if there is no open tag.
- * @deprecated To be removed in 2.3. Use
- * {@link #attribute(String, String)} instead.
- **/
-
- public void attribute(String name)
- {
- attribute(name, name);
- }
-
- /**
* Writes an integer attribute into the currently open tag.
*
* <p>TBD: Validate that name is legal.
1.3 +1 -2 jakarta-tapestry/framework/src/org/apache/tapestry/AbstractComponent.java
Index: AbstractComponent.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/AbstractComponent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractComponent.java 15 Mar 2003 21:22:08 -0000 1.2
+++ AbstractComponent.java 23 Mar 2003 01:29:42 -0000 1.3
@@ -122,7 +122,6 @@
/**
* The simple id of this component.
*
- * @deprecated To be made private in 2.3.
*
**/
1.3 +1 -60 jakarta-tapestry/framework/src/org/apache/tapestry/IPage.java
Index: IPage.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/IPage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IPage.java 15 Mar 2003 21:22:09 -0000 1.2
+++ IPage.java 23 Mar 2003 01:29:42 -0000 1.3
@@ -59,7 +59,6 @@
import java.util.Locale;
import org.apache.tapestry.event.ChangeObserver;
-import org.apache.tapestry.event.PageCleanupListener;
import org.apache.tapestry.event.PageDetachListener;
import org.apache.tapestry.event.PageRenderListener;
@@ -131,27 +130,6 @@
public void setLocale(Locale value);
/**
- * Returns the simple name of the page within its namespace.
- *
- * @deprecated This method has no use and will be removed after release 2.4.
- *
- **/
-
- public String getName();
-
- /**
- * Returns the fully qualified name of the page, including its
- * namespace prefix, if any.
- *
- * @since 2.3
- * @deprecated This method will be removed after release 2.4, use
- * {@link #getPageName()} instead.
- *
- **/
-
- public String getQualifiedName();
-
- /**
* Returns the fully qualified name of the page, including its
* namespace prefix, if any.
*
@@ -245,16 +223,6 @@
public void setChangeObserver(ChangeObserver value);
/**
- * Sets the simple (unqualified) name for the page.
- *
- * @deprecated To be removed after 2.4, use {@link #setPageName(String)}
- * instead.
- *
- **/
-
- public void setName(String value);
-
- /**
* Method invoked by the page, action and direct services
* to validate that the
* user is allowed to visit the page.
@@ -313,15 +281,6 @@
public void setRequestCycle(IRequestCycle cycle);
/**
- *
- * @deprecated With no replacement.
- * @see PageCleanupListener
- *
- **/
-
- public void cleanupPage();
-
- /**
* Returns the visit object for the application; the visit object
* contains application-specific information.
*
@@ -371,22 +330,4 @@
public void removePageDetachListener(PageDetachListener listener);
- /**
- *
- * @since 1.0.5
- * @deprecated With no replacement.
- * @see PageCleanupListener
- *
- **/
-
- public void addPageCleanupListener(PageCleanupListener listener);
-
- /**
- *
- * @since 2.1
- * @deprecated With no replacement.
- * @see PageCleanupListener
- **/
-
- public void removePageCleanupListener(PageCleanupListener listener);
}
1.4 +2 -4 jakarta-tapestry/framework/src/org/apache/tapestry/BaseComponentTemplateLoader.java
Index: BaseComponentTemplateLoader.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/BaseComponentTemplateLoader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BaseComponentTemplateLoader.java 15 Mar 2003 21:22:08 -0000 1.3
+++ BaseComponentTemplateLoader.java 23 Mar 2003 01:29:42 -0000 1.4
@@ -314,9 +314,7 @@
private IComponent createImplicitComponent(String id, String componentType, Location location)
{
IComponent result =
- _pageLoader.createImplicitComponent(_requestCycle, _loadComponent, id, componentType);
-
- result.setLocation(location);
+ _pageLoader.createImplicitComponent(_requestCycle, _loadComponent, id, componentType, location);
return result;
}
1.2 +2 -22 jakarta-tapestry/framework/src/org/apache/tapestry/INamespace.java
Index: INamespace.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/INamespace.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- INamespace.java 5 Mar 2003 22:59:22 -0000 1.1
+++ INamespace.java 23 Mar 2003 01:29:42 -0000 1.2
@@ -78,7 +78,7 @@
*
**/
-public interface INamespace
+public interface INamespace extends ILocatable
{
/**
* Reserved name of a the implicit Framework library.
@@ -209,30 +209,10 @@
* Returns true if the namespace contains the indicated component type.
*
* @param type a simple component type (no namespace prefix is allowed)
- *
- * @deprecated use {@link #containsComponentType(String)} instead.
- *
- **/
-
- public boolean containsAlias(String type);
-
- /**
- * Returns true if the namespace contains the indicated component type.
- *
- * @param type a simple component type (no namespace prefix is allowed)
*
**/
public boolean containsComponentType(String type);
-
- /**
- * Deprecated name for {@link #getComponentTypes()}.
- *
- * @deprecated use {@link #getComponentTypes()} instead.
- *
- **/
-
- public List getComponentAliases();
/**
* Returns a sorted list of component types. May return
1.5 +27 -2 jakarta-tapestry/framework/src/org/apache/tapestry/Tapestry.java
Index: Tapestry.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/Tapestry.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Tapestry.java 18 Mar 2003 20:55:32 -0000 1.4
+++ Tapestry.java 23 Mar 2003 01:29:42 -0000 1.5
@@ -230,7 +230,6 @@
public static final String SERVICE_QUERY_PARAMETER_NAME = "service";
-
/**
* The query parameter for application specific parameters to the
* service (this is used with the direct service). Each of these
@@ -287,6 +286,32 @@
**/
public static final String PARAMETER_PROPERTY_NAME_SUFFIX = "Binding";
+
+ /**
+ * Name of application extension used to resolve page and component
+ * specifications that can't be located by the normal means. The
+ * extension must implement
+ * {@link org.apache.tapestry.resolver.ISpecificationResolverDelegate}.
+ *
+ * @since 2.4
+ *
+ **/
+
+ public static final String SPECIFICATION_RESOLVER_DELEGATE_EXTENSION_NAME =
+ "org.apache.tapestry.specification-resolver-delegate";
+
+ /**
+ * Name of application extension used to resolve page and component
+ * templates that can't be located by the normal means.
+ * The extension must implement
+ * {@link org.apache.tapestry.engine.ITemplateSourceDelegate}.
+ *
+ * @since 2.4
+ *
+ **/
+
+ public static final String TEMPLATE_SOURCE_DELEGATE_EXTENSION_NAME =
+ "org.apache.tapestry.template-source-delegate";
/**
* Prevent instantiation.
1.3 +1 -23 jakarta-tapestry/framework/src/org/apache/tapestry/IEngine.java
Index: IEngine.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/IEngine.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IEngine.java 8 Mar 2003 17:07:45 -0000 1.2
+++ IEngine.java 23 Mar 2003 01:29:42 -0000 1.3
@@ -354,28 +354,6 @@
public DataSqueezer getDataSqueezer();
- /**
- *
- * @see #setRefreshing(boolean)
- * @since 2.2
- *
- **/
-
- public boolean isRefreshing();
-
- /**
- * This method has been deprecated. It existed as part
- * of support for {@link org.apache.tapestry.event.PageCleanupListener} interface,
- * which has also been deprecated.
- *
- *
- * @since 2.2
- * @deprecated With no replacement.
- *
- **/
-
- public void setRefreshing(boolean refreshing);
-
/**
* Returns a {@link org.apache.tapestry.IPropertySource} that should be
* used to obtain configuration data. The returned source represents
1.2 +1 -11 jakarta-tapestry/framework/src/org/apache/tapestry/IMarkupWriter.java
Index: IMarkupWriter.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/IMarkupWriter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IMarkupWriter.java 5 Mar 2003 22:59:22 -0000 1.1
+++ IMarkupWriter.java 23 Mar 2003 01:29:42 -0000 1.2
@@ -69,16 +69,6 @@
public interface IMarkupWriter
{
/**
- * Simply prints the attribute name. This is used for
- * idempotent attributes, such as 'disabled' in an
- * <input>.
- *
- * @throws IllegalStateException if there is no open tag.
- **/
-
- public void attribute(String name);
-
- /**
* Writes an integer attribute into the currently open tag.
*
* @throws IllegalStateException if there is no open tag.
1.3 +5 -71 jakarta-tapestry/framework/src/org/apache/tapestry/AbstractPage.java
Index: AbstractPage.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/AbstractPage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractPage.java 15 Mar 2003 21:22:09 -0000 1.2
+++ AbstractPage.java 23 Mar 2003 01:29:42 -0000 1.3
@@ -63,9 +63,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.apache.tapestry.event.ChangeObserver;
-import org.apache.tapestry.event.PageCleanupListener;
import org.apache.tapestry.event.PageDetachListener;
import org.apache.tapestry.event.PageEvent;
import org.apache.tapestry.event.PageRenderListener;
@@ -110,14 +108,6 @@
private Object _visit;
/**
- * The name of this page. This may be read, but not changed, by
- * subclasses.
- *
- **/
-
- private String _name;
-
- /**
* The qualified name of the page, which may be prefixed by the
* namespace.
*
@@ -190,9 +180,9 @@
public void detach()
{
- // Do this first,so that any changes to persistent properties do not
- // cause errors.
-
+ // Do this first,so that any changes to persistent properties do not
+ // cause errors.
+
_changeObserver = null;
firePageDetached();
@@ -239,7 +229,7 @@
public String getExtendedId()
{
- return _name;
+ return _pageName;
}
/**
@@ -272,11 +262,6 @@
_locale = value;
}
- public String getName()
- {
- return _name;
- }
-
public IComponent getNestedComponent(String path)
{
StringSplitter splitter;
@@ -354,14 +339,6 @@
_changeObserver = value;
}
- public void setName(String value)
- {
- if (_name != null)
- throw new ApplicationRuntimeException(
- Tapestry.getString("AbstractPage.attempt-to-change-name"));
-
- _name = value;
- }
/** @since 2.4 **/
public void setPageName(String pageName)
@@ -403,18 +380,6 @@
}
/**
- * Does nothing.
- *
- * @deprecated With no replacement.
- * @see PageCleanupListener
- *
- **/
-
- public void cleanupPage()
- {
- }
-
- /**
* Returns the visit object obtained from the engine via
* {@link IEngine#getVisit(IRequestCycle)}.
*
@@ -470,18 +435,6 @@
addListener(PageRenderListener.class, listener);
}
- /**
- * Does nothing.
- *
- * @deprecated With no replacement.
- * @see PageCleanupListener
- *
- **/
-
- public void addPageCleanupListener(PageCleanupListener listener)
- {
- }
-
/**
* @since 1.0.5
*
@@ -563,18 +516,6 @@
}
}
- /**
- * Does nothing.
- *
- * @deprecated With no replacement.
- * @see PageCleanupListener
- *
- **/
-
- public void removePageCleanupListener(PageCleanupListener listener)
- {
- }
-
/**
* @since 2.1-beta-2
*
@@ -583,13 +524,6 @@
public void removePageDetachListener(PageDetachListener listener)
{
removeListener(PageDetachListener.class, listener);
- }
-
- /** @since 2.3 **/
-
- public String getQualifiedName()
- {
- return _pageName;
}
public void removePageRenderListener(PageRenderListener listener)
1.4 +3 -3 jakarta-tapestry/contrib/src/org/apache/tapestry/contrib/palette/Palette.java
Index: Palette.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/contrib/src/org/apache/tapestry/contrib/palette/Palette.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Palette.java 17 Mar 2003 18:10:15 -0000 1.3
+++ Palette.java 23 Mar 2003 01:29:42 -0000 1.4
@@ -430,13 +430,13 @@
_availableWriter = writer.getNestedWriter();
_selectedWriter.begin("select");
- _selectedWriter.attribute("multiple");
+ _selectedWriter.attribute("multiple", "multiple");
_selectedWriter.attribute("size", getRows());
_selectedWriter.attribute("name", getName());
_selectedWriter.println();
_availableWriter.begin("select");
- _availableWriter.attribute("multiple");
+ _availableWriter.attribute("multiple", "multiple");
_availableWriter.attribute("size", getRows());
_availableWriter.attribute("name", (String) _symbols.get("availableName"));
_availableWriter.println();
1.3 +1 -15 jakarta-tapestry/framework/src/org/apache/tapestry/spec/AssetSpecification.java
Index: AssetSpecification.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/spec/AssetSpecification.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AssetSpecification.java 15 Mar 2003 21:22:25 -0000 1.2
+++ AssetSpecification.java 23 Mar 2003 01:29:42 -0000 1.3
@@ -68,20 +68,6 @@
private AssetType type;
protected String path;
- /** @since 2.4 **/
-
- public AssetSpecification()
- {
- }
-
- /** @deprecated **/
-
- public AssetSpecification(AssetType type, String path)
- {
- this.type = type;
- this.path = path;
- }
-
/**
* Returns the base path for the asset. This may be interpreted as a URL, relative URL
* or the path to a resource, depending on the type of asset.
1.3 +11 -13 jakarta-tapestry/framework/src/org/apache/tapestry/spec/LibrarySpecification.java
Index: LibrarySpecification.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/spec/LibrarySpecification.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LibrarySpecification.java 15 Mar 2003 21:22:25 -0000 1.2
+++ LibrarySpecification.java 23 Mar 2003 01:29:42 -0000 1.3
@@ -187,7 +187,8 @@
_pages = new HashMap();
if (_pages.containsKey(name))
- throw new IllegalArgumentException(Tapestry.getString("LibrarySpecification.duplicate-page-name", name));
+ throw new IllegalArgumentException(
+ Tapestry.getString("LibrarySpecification.duplicate-page-name", name));
_pages.put(name, path);
}
@@ -214,21 +215,16 @@
return (String) get(_components, alias);
}
- public List getComponentAliases()
- {
- return sortedKeys(_components);
- }
-
/**
* @since 2.4
*
**/
-
- public List getComponentTypes()
+
+ public List getComponentTypes()
{
- return getComponentAliases();
+ return sortedKeys(_components);
}
-
+
public String getServiceClassName(String name)
{
return (String) get(_services, name);
@@ -245,7 +241,8 @@
_services = new HashMap();
if (_services.containsKey(name))
- throw new IllegalArgumentException(Tapestry.getString("LibrarySpecification.duplicate-service-name", name));
+ throw new IllegalArgumentException(
+ Tapestry.getString("LibrarySpecification.duplicate-service-name", name));
_services.put(name, className);
}
@@ -394,7 +391,8 @@
ExtensionSpecification spec = getExtensionSpecification(name);
if (spec == null)
- throw new IllegalArgumentException(Tapestry.getString("LibrarySpecification.no-such-extension", name));
+ throw new IllegalArgumentException(
+ Tapestry.getString("LibrarySpecification.no-such-extension", name));
result = spec.instantiateExtension(_resolver);
1.3 +0 -99 jakarta-tapestry/framework/src/org/apache/tapestry/spec/SpecFactory.java
Index: SpecFactory.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/spec/SpecFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SpecFactory.java 15 Mar 2003 21:22:25 -0000 1.2
+++ SpecFactory.java 23 Mar 2003 01:29:42 -0000 1.3
@@ -56,9 +56,7 @@
package org.apache.tapestry.spec;
import org.apache.tapestry.bean.ExpressionBeanInitializer;
-import org.apache.tapestry.bean.FieldBeanInitializer;
import org.apache.tapestry.bean.IBeanInitializer;
-import org.apache.tapestry.bean.StaticBeanInitializer;
import org.apache.tapestry.bean.StringBeanInitializer;
/**
@@ -104,17 +102,6 @@
return new LibrarySpecification();
}
- /**
- * Creates a concrete instance of {@link AssetSpecification}.
- *
- * @deprecated
- **/
-
- public AssetSpecification createAssetSpecification(AssetType type, String path)
- {
- return new AssetSpecification(type, path);
- }
-
/**
* Returns a new instance of {@link AssetSpecification}.
*
@@ -127,17 +114,6 @@
return new AssetSpecification();
}
- /**
- * Creates a concrete instance of {@link BeanSpecification}.
- *
- * @deprecated
- **/
-
- public BeanSpecification createBeanSpecification(String className, BeanLifecycle lifecycle)
- {
- return new BeanSpecification(className, lifecycle);
- }
-
/**
* Creates a new instance of {@link BeanSpecification}.
*
@@ -150,18 +126,6 @@
return new BeanSpecification();
}
- /**
- * Creates a concrete instance of {@link BindingSpecification}.
- *
- * @deprecated
- *
- **/
-
- public BindingSpecification createBindingSpecification(BindingType type, String value)
- {
- return new BindingSpecification(type, value);
- }
-
public BindingSpecification createBindingSpecification()
{
return new BindingSpecification();
@@ -207,32 +171,6 @@
return new ParameterSpecification();
}
- /**
- * Creates a concrete instance of {@link IBeanInitializer}.
- * <p>
- * Default implementation returns an instance of {@link PropertyBeanInitializer}.
- *
- * @deprecated To be removed in 2.3. Use {@link #createExpressionBeanInitializer(String, String)}.
- **/
-
- public IBeanInitializer createPropertyBeanInitializer(String propertyName, String expression)
- {
- return new ExpressionBeanInitializer(propertyName, expression);
- }
-
- /**
- *
- * @deprecated
- *
- * @since 2.2
- *
- **/
-
- public IBeanInitializer createExpressionBeanInitializer(String propertyName, String expression)
- {
- return new ExpressionBeanInitializer(propertyName, expression);
- }
-
/**
* Creates a new instance of {@link ExpressionBeanInitializer}.
*
@@ -244,43 +182,6 @@
{
return new ExpressionBeanInitializer();
}
-
- /**
- * Creates a concrete instance of {@link IBeanInitializer}.
- * <p>
- * Default implementation returns an instance of {@link StaticBeanInitializer}.
- **/
-
- public IBeanInitializer createStaticBeanInitializer(String propertyName, Object staticValue)
- {
- return new StaticBeanInitializer(propertyName, staticValue);
- }
-
- /**
- * Creates a concrete instance of {@link IBeanInitializer}.
- * <p>
- * Default implementation returns an instance of {@link FieldBeanInitializer}.
- **/
-
- public IBeanInitializer createFieldBeanInitializer(String propertyName, String fieldName)
- {
- return new FieldBeanInitializer(propertyName, fieldName);
- }
-
- /**
- * Creates a concrete instance of {@link IBeanInitializer}.
- *
- * <p>
- * Default implementation returns an instance of {@link org.apache.tapestry.bean.StringBeanInitializer}.
- *
- * @since 2.2
- * @deprecated
- **/
-
- public IBeanInitializer createStringBeanInitializer(String propertyName, String key)
- {
- return new StringBeanInitializer(propertyName, key);
- }
/**
* Returns a new instance of {@link StringBeanInitializer}.
1.3 +1 -12 jakarta-tapestry/framework/src/org/apache/tapestry/spec/ILibrarySpecification.java
Index: ILibrarySpecification.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/spec/ILibrarySpecification.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ILibrarySpecification.java 15 Mar 2003 21:22:25 -0000 1.2
+++ ILibrarySpecification.java 23 Mar 2003 01:29:42 -0000 1.3
@@ -119,17 +119,6 @@
public String getComponentSpecificationPath(String type);
/**
- * Returns the simple types ('alias' is an archaic term) of
- * all components defined in this library.
- *
- * @deprecated To be removed after release 2.4, use
- * {@link #getComponentTypes()} instead.
- *
- **/
-
- public List getComponentAliases();
-
- /**
* Returns the simple types of all components defined in
* this library. Returns a list of strings in sorted order,
* or an empty list (but not null).
1.3 +8 -22 jakarta-tapestry/framework/src/org/apache/tapestry/spec/BindingSpecification.java
Index: BindingSpecification.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/spec/BindingSpecification.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BindingSpecification.java 15 Mar 2003 21:22:25 -0000 1.2
+++ BindingSpecification.java 23 Mar 2003 01:29:42 -0000 1.3
@@ -67,40 +67,26 @@
public class BindingSpecification extends BaseLocatable
{
- private BindingType type;
- private String value;
-
- /** @since 2.4 **/
-
- public BindingSpecification()
- {
- }
-
- /** @deprecated **/
+ private BindingType _type;
+ private String _value;
- public BindingSpecification(BindingType type, String value)
- {
- this.type = type;
- this.value = value;
- }
-
public BindingType getType()
{
- return type;
+ return _type;
}
public String getValue()
{
- return value;
+ return _value;
}
- public void setType(BindingType value)
+ public void setType(BindingType type)
{
- type = value;
+ _type = type;
}
public void setValue(String value)
{
- this.value = value;
+ _value = value;
}
}
1.3 +8 -3 jakarta-tapestry/framework/src/org/apache/tapestry/binding/ListenerBinding.java
Index: ListenerBinding.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/binding/ListenerBinding.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ListenerBinding.java 15 Mar 2003 21:22:15 -0000 1.2
+++ ListenerBinding.java 23 Mar 2003 01:29:43 -0000 1.3
@@ -169,7 +169,7 @@
BSFManager bsf = obtainBSFManager(cycle);
- String location = getLocation().toString();
+ Location location = getLocation();
try
{
@@ -179,7 +179,12 @@
bsf.declareBean("page", page, page.getClass());
bsf.declareBean("cycle", cycle, cycle.getClass());
- bsf.exec(_language, location, 0, 0, _script);
+ bsf.exec(
+ _language,
+ location.getResourceLocation().toString(),
+ location.getLineNumber(),
+ location.getLineNumber(),
+ _script);
}
catch (BSFException ex)
{
1.3 +2 -2 jakarta-tapestry/framework/src/org/apache/tapestry/pageload/PageSource.java
Index: PageSource.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/pageload/PageSource.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PageSource.java 15 Mar 2003 21:22:24 -0000 1.2
+++ PageSource.java 23 Mar 2003 01:29:43 -0000 1.3
@@ -180,7 +180,7 @@
if (_pageSpecificationResolver == null)
_pageSpecificationResolver = new PageSpecificationResolver(cycle);
- _pageSpecificationResolver.resolve(pageName);
+ _pageSpecificationResolver.resolve(cycle, pageName);
// Page loader's are not threadsafe, so we create a new
// one as needed. However, they would make an excellent
1.5 +11 -10 jakarta-tapestry/framework/src/org/apache/tapestry/pageload/PageLoader.java
Index: PageLoader.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/pageload/PageLoader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PageLoader.java 17 Mar 2003 03:25:19 -0000 1.4
+++ PageLoader.java 23 Mar 2003 01:29:43 -0000 1.5
@@ -467,7 +467,7 @@
String type = contained.getType();
- _componentResolver.resolve(namespace, type);
+ _componentResolver.resolve(cycle, namespace, type);
ComponentSpecification componentSpecification =
_componentResolver.getSpecification();
@@ -481,9 +481,8 @@
container,
id,
componentSpecification,
- componentNamespace);
-
- component.setLocation(contained.getLocation());
+ componentNamespace,
+ contained.getLocation());
// Add it, by name, to the container.
@@ -551,17 +550,18 @@
IRequestCycle cycle,
IComponent container,
String componentId,
- String componentType)
+ String componentType,
+ Location location)
{
IPage page = container.getPage();
- _componentResolver.resolve(container.getNamespace(), componentType);
+ _componentResolver.resolve(cycle, container.getNamespace(), componentType);
INamespace componentNamespace = _componentResolver.getNamespace();
ComponentSpecification spec = _componentResolver.getSpecification();
IComponent result =
- instantiateComponent(page, container, componentId, spec, componentNamespace);
+ instantiateComponent(page, container, componentId, spec, componentNamespace, location);
container.addComponent(result);
@@ -585,7 +585,8 @@
IComponent container,
String id,
ComponentSpecification spec,
- INamespace namespace)
+ INamespace namespace,
+ Location location)
{
IComponent result = null;
String className = spec.getComponentClassName();
@@ -627,6 +628,7 @@
result.setPage(page);
result.setContainer(container);
result.setId(id);
+ result.setLocation(location);
_count++;
@@ -682,7 +684,6 @@
result.setNamespace(namespace);
result.setSpecification(spec);
- result.setName(name);
result.setPageName(pageName);
result.setPage(result);
result.setLocale(_locale);
1.13 +5 -0 jakarta-tapestry/eclipse/Tapestry-Mock.launch
Index: Tapestry-Mock.launch
===================================================================
RCS file: /home/cvs/jakarta-tapestry/eclipse/Tapestry-Mock.launch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Tapestry-Mock.launch 15 Mar 2003 21:22:28 -0000 1.12
+++ Tapestry-Mock.launch 23 Mar 2003 01:29:43 -0000 1.13
@@ -94,6 +94,11 @@
<listEntry value="<?xml version="1.0" encoding="UTF-8"?>
<runtimeClasspathEntry containerPath="JYTHON_DIR/jython.jar" path="3" type="3"/>
"/>
+ <listEntry value="<?xml version="1.0" encoding="UTF-8"?>
+<runtimeClasspathEntry
+ internalArchive="/jakarta-tapestry/lib/ext/commons-collections-2.1.jar"
+ path="3" type="2"/>
+"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jakarta-tapestry"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dnet.sf.tapestry.enable-reset-service=true"/>
1.140 +4 -2 jakarta-tapestry/web/new.html
Index: new.html
===================================================================
RCS file: /home/cvs/jakarta-tapestry/web/new.html,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- new.html 21 Mar 2003 19:01:26 -0000 1.139
+++ new.html 23 Mar 2003 01:29:43 -0000 1.140
@@ -30,7 +30,9 @@
under ApplicationRuntimeException.</li>
<li>Simplified the URL format, merging the "service" and "context" parameters together.</li>
<li>Removed the "width" and "displayWidth" and "maxLength" parameters from TextField and ValidField
-(HTML attributes "size" and "maxlength", as informal parameters, are sufficient).</li>
+(HTML attributes "size" and "maxlength", as informal parameters, are sufficient).</li>\
+<li>Added two new application extensions to allow page and component specifications and templates
+to be provided in non-standard ways (when not found using the default rules).</li>
</ul>
<h3>Release 2.4-alpha-4</h3>
1.3 +2 -2 jakarta-tapestry/framework/src/org/apache/tapestry/callback/ExternalCallback.java
Index: ExternalCallback.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/callback/ExternalCallback.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ExternalCallback.java 15 Mar 2003 21:22:26 -0000 1.2
+++ ExternalCallback.java 23 Mar 2003 01:29:43 -0000 1.3
@@ -154,7 +154,7 @@
public ExternalCallback(IExternalPage page, Object[] parameters)
{
- _pageName = page.getName();
+ _pageName = page.getPageName();
_parameters = parameters;
}