craigmcc 2004/03/07 17:03:37
Modified: contrib/struts-faces build.properties.sample
contrib/struts-faces/src/example2/org/apache/struts/webapp/example2
FacesPlugIn.java LinkSubscriptionTag.java
LoggedOff.java LoggedOn.java
RegistrationBacking.java
Log:
Clean up compile errors in the second example webapp. It still won't run.
Revision Changes Path
1.5 +3 -3 jakarta-struts/contrib/struts-faces/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/struts-faces/build.properties.sample,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.properties.sample 28 Dec 2003 22:03:27 -0000 1.4
+++ build.properties.sample 8 Mar 2004 01:03:37 -0000 1.5
@@ -25,8 +25,8 @@
# (JWSDP) Version 1.2 or later installation directory
jwsdp.home=/usr/local/jwsdp-1.2
-# The absolute or relative pathname of the JavaServer Faces Beta Distribution
-# Directory
+# The absolute or relative pathname of the JavaServer Faces Final Release
+# Distribution Directory
jsf.home=/usr/local/jsf-1_0
# The absolute or relative pathname of the JSP Standard Tag Library 1.0 or later
1.2 +7 -6
jakarta-struts/contrib/struts-faces/src/example2/org/apache/struts/webapp/example2/FacesPlugIn.java
Index: FacesPlugIn.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-faces/src/example2/org/apache/struts/webapp/example2/FacesPlugIn.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FacesPlugIn.java 31 Dec 2003 07:17:48 -0000 1.1
+++ FacesPlugIn.java 8 Mar 2004 01:03:37 -0000 1.2
@@ -106,9 +106,10 @@
RenderKitFactory factory = (RenderKitFactory)
FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY);
RenderKit renderKit =
- factory.getRenderKit(RenderKitFactory.DEFAULT_RENDER_KIT);
+ factory.getRenderKit(null, RenderKitFactory.HTML_BASIC_RENDER_KIT);
renderKit.addRenderer
- ("LinkSubscription",
+ ("javax.faces.Output",
+ "org.apache.struts.webapp.example.LinkSubscription",
new LinkSubscriptionRenderer());
}
1.2 +6 -6
jakarta-struts/contrib/struts-faces/src/example2/org/apache/struts/webapp/example2/LinkSubscriptionTag.java
Index: LinkSubscriptionTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-faces/src/example2/org/apache/struts/webapp/example2/LinkSubscriptionTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LinkSubscriptionTag.java 31 Dec 2003 07:17:48 -0000 1.1
+++ LinkSubscriptionTag.java 8 Mar 2004 01:03:37 -0000 1.2
@@ -151,7 +151,7 @@
if (name != null) {
if (isValueReference(name)) {
ValueBinding vb =
- context.getApplication().createValueBinding(name);
+ getFacesContext().getApplication().createValueBinding(name);
component.setValueBinding("name", vb);
} else {
component.getAttributes().put("name", name);
@@ -160,7 +160,7 @@
if (page != null) {
if (isValueReference(page)) {
ValueBinding vb =
- context.getApplication().createValueBinding(page);
+ getFacesContext().getApplication().createValueBinding(page);
component.setValueBinding("page", vb);
} else {
component.getAttributes().put("page", page);
1.2 +3 -3
jakarta-struts/contrib/struts-faces/src/example2/org/apache/struts/webapp/example2/LoggedOff.java
Index: LoggedOff.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-faces/src/example2/org/apache/struts/webapp/example2/LoggedOff.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LoggedOff.java 31 Dec 2003 07:17:48 -0000 1.1
+++ LoggedOff.java 8 Mar 2004 01:03:37 -0000 1.2
@@ -132,7 +132,7 @@
private void forward(FacesContext context, String url) {
try {
- context.getExternalContext().dispatchMessage(url);
+ context.getExternalContext().dispatch(url);
} catch (IOException e) {
throw new FacesException(e);
} finally {
1.2 +3 -3
jakarta-struts/contrib/struts-faces/src/example2/org/apache/struts/webapp/example2/LoggedOn.java
Index: LoggedOn.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-faces/src/example2/org/apache/struts/webapp/example2/LoggedOn.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LoggedOn.java 31 Dec 2003 07:17:48 -0000 1.1
+++ LoggedOn.java 8 Mar 2004 01:03:37 -0000 1.2
@@ -117,7 +117,7 @@
private void forward(FacesContext context, String url) {
try {
- context.getExternalContext().dispatchMessage(url);
+ context.getExternalContext().dispatch(url);
} catch (IOException e) {
throw new FacesException(e);
} finally {
1.2 +3 -3
jakarta-struts/contrib/struts-faces/src/example2/org/apache/struts/webapp/example2/RegistrationBacking.java
Index: RegistrationBacking.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-faces/src/example2/org/apache/struts/webapp/example2/RegistrationBacking.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RegistrationBacking.java 31 Dec 2003 07:17:48 -0000 1.1
+++ RegistrationBacking.java 8 Mar 2004 01:03:37 -0000 1.2
@@ -180,7 +180,7 @@
private void forward(FacesContext context, String url) {
try {
- context.getExternalContext().dispatchMessage(url);
+ context.getExternalContext().dispatch(url);
} catch (IOException e) {
throw new FacesException(e);
} finally {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
