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 2005/01/29 18:09:18 UTC
cvs commit: jakarta-tapestry/framework/src/java/org/apache/tapestry/link PageLink.jwc ExternalLink.jwc
hlship 2005/01/29 09:09:18
Modified: src/documentation/content/xdocs/UsersGuide spec.xml
hivemind.xml
framework/src/java/org/apache/tapestry/html Shell.jwc
framework/src/java/org/apache/tapestry/form ListEdit.jwc
Hidden.jwc Form.jwc
framework/src/java/org/apache/tapestry/components
Foreach.jwc
framework/src/java/org/apache/tapestry/parse
SpecificationParser.java Tapestry_3_1.dtd
framework/src/java/org/apache/tapestry/wml Go.jwc
framework/src/test/org/apache/tapestry/enhance
TestInjectWorker.java
framework/src/java/org/apache/tapestry/enhance
InjectWorker.java
framework/src/java/org/apache/tapestry/spec
InjectSpecification.java
InjectSpecificationImpl.java
framework/src/test/org/apache/tapestry/junit/parse
Inject.jwc TestSpecificationParser.java
framework/src/java/org/apache/tapestry/link PageLink.jwc
ExternalLink.jwc
Log:
Rename 'name' property of <inject> specification element to 'property'.
Revision Changes Path
1.13 +1 -1 jakarta-tapestry/src/documentation/content/xdocs/UsersGuide/spec.xml
Index: spec.xml
===================================================================
RCS file: /home/cvs/jakarta-tapestry/src/documentation/content/xdocs/UsersGuide/spec.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- spec.xml 8 Jan 2005 19:52:21 -0000 1.12
+++ spec.xml 29 Jan 2005 17:09:18 -0000 1.13
@@ -862,7 +862,7 @@
</tr>
<tr>
- <td>name</td>
+ <td>property</td>
<td>string</td>
<td>yes</td>
<td/>
1.5 +1 -1 jakarta-tapestry/src/documentation/content/xdocs/UsersGuide/hivemind.xml
Index: hivemind.xml
===================================================================
RCS file: /home/cvs/jakarta-tapestry/src/documentation/content/xdocs/UsersGuide/hivemind.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hivemind.xml 29 Jan 2005 01:03:17 -0000 1.4
+++ hivemind.xml 29 Jan 2005 17:09:18 -0000 1.5
@@ -45,7 +45,7 @@
<source><![CDATA[
<page-specification class=". . .">
- <inject name="mailSender" object="service:mymodule.MailSender"/>
+ <inject property="mailSender" object="service:mymodule.MailSender"/>
</page-specification>]]> </source>
<p> This would create a new property on your page, mailSender, that would be connected to a HiveMind service,
1.6 +4 -4 jakarta-tapestry/framework/src/java/org/apache/tapestry/html/Shell.jwc
Index: Shell.jwc
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/html/Shell.jwc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Shell.jwc 6 Jan 2005 02:17:23 -0000 1.5
+++ Shell.jwc 29 Jan 2005 17:09:18 -0000 1.6
@@ -82,9 +82,9 @@
</description>
</parameter>
- <inject name="valueConverter" object="service:tapestry.coerce.ValueConverter"/>
- <inject name="pageService" object="engine-service:page"/>
- <inject name="applicationSpecification" object="infrastructure:applicationSpecification"/>
- <inject name="baseTagWriter" object="service:tapestry.url.BaseTagWriter"/>
+ <inject property="valueConverter" object="service:tapestry.coerce.ValueConverter"/>
+ <inject property="pageService" object="engine-service:page"/>
+ <inject property="applicationSpecification" object="infrastructure:applicationSpecification"/>
+ <inject property="baseTagWriter" object="service:tapestry.url.BaseTagWriter"/>
</component-specification>
1.4 +2 -2 jakarta-tapestry/framework/src/java/org/apache/tapestry/form/ListEdit.jwc
Index: ListEdit.jwc
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/form/ListEdit.jwc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ListEdit.jwc 5 Jan 2005 23:17:13 -0000 1.3
+++ ListEdit.jwc 29 Jan 2005 17:09:18 -0000 1.4
@@ -37,8 +37,8 @@
<parameter name="element"/>
- <inject name="dataSqueezer" object="service:tapestry.data.DataSqueezer"/>
- <inject name="valueConverter" object="service:tapestry.coerce.ValueConverter"/>
+ <inject property="dataSqueezer" object="infrastructure:dataSqueezer"/>
+ <inject property="valueConverter" object="service:tapestry.coerce.ValueConverter"/>
</component-specification>
1.6 +1 -1 jakarta-tapestry/framework/src/java/org/apache/tapestry/form/Hidden.jwc
Index: Hidden.jwc
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/form/Hidden.jwc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Hidden.jwc 28 Jan 2005 21:07:15 -0000 1.5
+++ Hidden.jwc 29 Jan 2005 17:09:18 -0000 1.6
@@ -47,6 +47,6 @@
<parameter name="encode" default-value="true"/>
- <inject name="dataSqueezer" object="infrastructure:dataSqueezer"/>
+ <inject property="dataSqueezer" object="infrastructure:dataSqueezer"/>
</component-specification>
\ No newline at end of file
1.5 +2 -2 jakarta-tapestry/framework/src/java/org/apache/tapestry/form/Form.jwc
Index: Form.jwc
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/form/Form.jwc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Form.jwc 27 Jan 2005 19:03:03 -0000 1.4
+++ Form.jwc 29 Jan 2005 17:09:18 -0000 1.5
@@ -59,7 +59,7 @@
<reserved-parameter name="action"/>
- <inject name="directService" object="engine-service:direct"/>
- <inject name="actionService" object="engine-service:action"/>
+ <inject property="directService" object="engine-service:direct"/>
+ <inject property="actionService" object="engine-service:action"/>
</component-specification>
1.4 +1 -1 jakarta-tapestry/framework/src/java/org/apache/tapestry/components/Foreach.jwc
Index: Foreach.jwc
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/components/Foreach.jwc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Foreach.jwc 5 Jan 2005 23:17:08 -0000 1.3
+++ Foreach.jwc 29 Jan 2005 17:09:18 -0000 1.4
@@ -46,5 +46,5 @@
</description>
</parameter>
- <inject name="valueConverter" object="service:tapestry.coerce.ValueConverter"/>
+ <inject property="valueConverter" object="service:tapestry.coerce.ValueConverter"/>
</component-specification>
1.17 +2 -2 jakarta-tapestry/framework/src/java/org/apache/tapestry/parse/SpecificationParser.java
Index: SpecificationParser.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/parse/SpecificationParser.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- SpecificationParser.java 29 Jan 2005 01:03:17 -0000 1.16
+++ SpecificationParser.java 29 Jan 2005 17:09:18 -0000 1.17
@@ -1361,12 +1361,12 @@
private void enterInject()
{
- String name = getValidatedAttribute("name", PROPERTY_NAME_PATTERN, "invalid-property-name");
+ String property = getValidatedAttribute("property", PROPERTY_NAME_PATTERN, "invalid-property-name");
String objectReference = getAttribute("object");
InjectSpecification spec = _factory.createInjectSpecification();
- spec.setName(name);
+ spec.setProperty(property);
spec.setObjectReference(objectReference);
IComponentSpecification cs = (IComponentSpecification) peekObject();
1.9 +2 -2 jakarta-tapestry/framework/src/java/org/apache/tapestry/parse/Tapestry_3_1.dtd
Index: Tapestry_3_1.dtd
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/parse/Tapestry_3_1.dtd,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Tapestry_3_1.dtd 8 Jan 2005 19:52:20 -0000 1.8
+++ Tapestry_3_1.dtd 29 Jan 2005 17:09:18 -0000 1.9
@@ -262,12 +262,12 @@
obtained from HiveMind.
Attributes:
- name: The name of the property.
+ property The name of the property.
object: The locator used to obtain the value.
-->
<!ELEMENT inject EMPTY>
<!ATTLIST inject
- name CDATA #REQUIRED
+ property CDATA #REQUIRED
object CDATA #REQUIRED
>
1.5 +2 -2 jakarta-tapestry/framework/src/java/org/apache/tapestry/wml/Go.jwc
Index: Go.jwc
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/wml/Go.jwc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Go.jwc 27 Jan 2005 19:03:03 -0000 1.4
+++ Go.jwc 29 Jan 2005 17:09:18 -0000 1.5
@@ -53,7 +53,7 @@
<reserved-parameter name="href"/>
- <inject name="directService" object="engine-service:direct"/>
- <inject name="actionService" object="engine-service:action"/>
+ <inject property="directService" object="engine-service:direct"/>
+ <inject property="actionService" object="engine-service:action"/>
</component-specification>
1.5 +1 -1 jakarta-tapestry/framework/src/test/org/apache/tapestry/enhance/TestInjectWorker.java
Index: TestInjectWorker.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/test/org/apache/tapestry/enhance/TestInjectWorker.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestInjectWorker.java 5 Jan 2005 23:17:27 -0000 1.4
+++ TestInjectWorker.java 29 Jan 2005 17:09:18 -0000 1.5
@@ -45,7 +45,7 @@
{
InjectSpecification is = new InjectSpecificationImpl();
- is.setName(name);
+ is.setProperty(name);
is.setObjectReference(locator);
is.setLocation(location);
1.5 +2 -2 jakarta-tapestry/framework/src/java/org/apache/tapestry/enhance/InjectWorker.java
Index: InjectWorker.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/enhance/InjectWorker.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InjectWorker.java 5 Jan 2005 23:16:52 -0000 1.4
+++ InjectWorker.java 29 Jan 2005 17:09:18 -0000 1.5
@@ -53,7 +53,7 @@
catch (Exception ex)
{
_errorLog.error(EnhanceMessages.errorAddingProperty(
- is.getName(),
+ is.getProperty(),
op.getBaseClass(),
ex), is.getLocation(), ex);
}
@@ -62,7 +62,7 @@
private void performEnhancement(EnhancementOperation op, InjectSpecification is)
{
- String name = is.getName();
+ String name = is.getProperty();
String objectReference = is.getObjectReference();
Class propertyType = op.getPropertyType(name);
1.4 +3 -3 jakarta-tapestry/framework/src/java/org/apache/tapestry/spec/InjectSpecification.java
Index: InjectSpecification.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/spec/InjectSpecification.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- InjectSpecification.java 6 Jan 2005 02:17:14 -0000 1.3
+++ InjectSpecification.java 29 Jan 2005 17:09:18 -0000 1.4
@@ -26,9 +26,9 @@
* Returns the name of the property to be created.
*/
- public String getName();
+ public String getProperty();
- public void setName(String name);
+ public void setProperty(String property);
/**
* Returns the object reference used to locate the HiveMind object to be injected into the
@@ -37,5 +37,5 @@
public String getObjectReference();
- public void setObjectReference(String name);
+ public void setObjectReference(String locator);
}
\ No newline at end of file
1.4 +5 -5 jakarta-tapestry/framework/src/java/org/apache/tapestry/spec/InjectSpecificationImpl.java
Index: InjectSpecificationImpl.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/spec/InjectSpecificationImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- InjectSpecificationImpl.java 6 Jan 2005 02:17:14 -0000 1.3
+++ InjectSpecificationImpl.java 29 Jan 2005 17:09:18 -0000 1.4
@@ -22,7 +22,7 @@
*/
public class InjectSpecificationImpl extends BaseLocatable implements InjectSpecification
{
- private String _name;
+ private String _property;
private String _objectReference;
@@ -36,13 +36,13 @@
_objectReference = locator;
}
- public String getName()
+ public String getProperty()
{
- return _name;
+ return _property;
}
- public void setName(String name)
+ public void setProperty(String name)
{
- _name = name;
+ _property = name;
}
}
\ No newline at end of file
1.3 +2 -2 jakarta-tapestry/framework/src/test/org/apache/tapestry/junit/parse/Inject.jwc
Index: Inject.jwc
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/test/org/apache/tapestry/junit/parse/Inject.jwc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Inject.jwc 5 Jan 2005 23:17:15 -0000 1.2
+++ Inject.jwc 29 Jan 2005 17:09:18 -0000 1.3
@@ -21,7 +21,7 @@
<component-specification>
- <inject name="fred" object="flintstone"/>
- <inject name="barney" object="rubble"/>
+ <inject property="fred" object="flintstone"/>
+ <inject property="barney" object="rubble"/>
</component-specification>
1.9 +2 -2 jakarta-tapestry/framework/src/test/org/apache/tapestry/junit/parse/TestSpecificationParser.java
Index: TestSpecificationParser.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/test/org/apache/tapestry/junit/parse/TestSpecificationParser.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TestSpecificationParser.java 6 Jan 2005 02:17:13 -0000 1.8
+++ TestSpecificationParser.java 29 Jan 2005 17:09:18 -0000 1.9
@@ -883,12 +883,12 @@
InjectSpecification i1 = (InjectSpecification) l.get(0);
- assertEquals("fred", i1.getName());
+ assertEquals("fred", i1.getProperty());
assertEquals("flintstone", i1.getObjectReference());
assertNotNull(i1.getLocation());
InjectSpecification i2 = (InjectSpecification) l.get(1);
- assertEquals("barney", i2.getName());
+ assertEquals("barney", i2.getProperty());
assertEquals("rubble", i2.getObjectReference());
assertNotNull(i2.getLocation());
}
1.4 +1 -1 jakarta-tapestry/framework/src/java/org/apache/tapestry/link/PageLink.jwc
Index: PageLink.jwc
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/link/PageLink.jwc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PageLink.jwc 5 Jan 2005 23:17:24 -0000 1.3
+++ PageLink.jwc 29 Jan 2005 17:09:18 -0000 1.4
@@ -41,6 +41,6 @@
<reserved-parameter name="href"/>
- <inject name="pageService" object="engine-service:page"/>
+ <inject property="pageService" object="engine-service:page"/>
</component-specification>
1.4 +1 -1 jakarta-tapestry/framework/src/java/org/apache/tapestry/link/ExternalLink.jwc
Index: ExternalLink.jwc
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/link/ExternalLink.jwc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ExternalLink.jwc 5 Jan 2005 23:17:24 -0000 1.3
+++ ExternalLink.jwc 29 Jan 2005 17:09:18 -0000 1.4
@@ -42,6 +42,6 @@
<reserved-parameter name="href"/>
- <inject name="externalService" object="engine-service:external"/>
+ <inject property="externalService" object="engine-service:external"/>
</component-specification>
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org