You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by cm...@apache.org on 2002/02/24 15:19:26 UTC
cvs commit: jakarta-slide/src/taglib/struts/org/apache/slide/taglib/tag/struts StrutsTagUtils.java
cmlenz 02/02/24 06:19:26
Modified: web/admin/WEB-INF web.xml
web/taglib-examples/WEB-INF web.xml
src/admin/org/apache/slide/admin AdminAction.java
src/taglib/jstl/org/apache/slide/taglib/tag/jstl
JstlTagUtils.java
src/taglib/struts/org/apache/slide/taglib/tag/struts
StrutsTagUtils.java
Log:
- Fix bug 6398 by unifying the name under which the namespace name is
stored in the servlet-context attributes and init-parameters
Revision Changes Path
1.4 +1 -1 jakarta-slide/web/admin/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/web/admin/WEB-INF/web.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- web.xml 24 Sep 2001 16:16:39 -0000 1.3
+++ web.xml 24 Feb 2002 14:19:25 -0000 1.4
@@ -13,7 +13,7 @@
specify the namespace parameter, the default namespace will be used, if
available. -->
<context-param>
- <param-name>namespace</param-name>
+ <param-name>org.apache.slide.NamespaceName</param-name>
<param-value>slide</param-value>
</context-param>
1.2 +1 -1 jakarta-slide/web/taglib-examples/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/web/taglib-examples/WEB-INF/web.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- web.xml 28 Jan 2002 12:33:58 -0000 1.1
+++ web.xml 24 Feb 2002 14:19:25 -0000 1.2
@@ -13,7 +13,7 @@
specify the namespace parameter, the default namespace will be used, if
available. -->
<context-param>
- <param-name>namespace</param-name>
+ <param-name>org.apache.slide.NamespaceName</param-name>
<param-value>slide</param-value>
</context-param>
1.2 +12 -6 jakarta-slide/src/admin/org/apache/slide/admin/AdminAction.java
Index: AdminAction.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/admin/org/apache/slide/admin/AdminAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AdminAction.java 23 Sep 2001 20:23:54 -0000 1.1
+++ AdminAction.java 24 Feb 2002 14:19:25 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/admin/org/apache/slide/admin/AdminAction.java,v 1.1 2001/09/23 20:23:54 cmlenz Exp $
- * $Revision: 1.1 $
- * $Date: 2001/09/23 20:23:54 $
+ * $Header: /home/cvs/jakarta-slide/src/admin/org/apache/slide/admin/AdminAction.java,v 1.2 2002/02/24 14:19:25 cmlenz Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/02/24 14:19:25 $
*
* ====================================================================
*
@@ -92,7 +92,7 @@
* Adminstration Webapp.
*
* @author <a href="mailto:cmlenz@apache.org">Christopher Lenz</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public abstract class AdminAction extends Action {
@@ -138,10 +138,16 @@
credentials = new CredentialsToken("");
}
st = new SlideTokenImpl(credentials);
-
+
// get the namespace access token
String namespaceName =
- getServlet().getServletContext().getInitParameter("namespace");
+ (String)getServlet().getServletContext().getAttribute
+ ("org.apache.slide.NamespaceName");
+ if (namespaceName == null) {
+ namespaceName =
+ getServlet().getServletContext().getInitParameter
+ ("org.apache.slide.NamespaceName");
+ }
if (namespaceName == null) {
// the default namespace
namespaceName = Domain.getDefaultNamespace();
1.3 +6 -5 jakarta-slide/src/taglib/jstl/org/apache/slide/taglib/tag/jstl/JstlTagUtils.java
Index: JstlTagUtils.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/taglib/jstl/org/apache/slide/taglib/tag/jstl/JstlTagUtils.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JstlTagUtils.java 27 Jan 2002 21:13:11 -0000 1.2
+++ JstlTagUtils.java 24 Feb 2002 14:19:25 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/taglib/jstl/org/apache/slide/taglib/tag/jstl/JstlTagUtils.java,v 1.2 2002/01/27 21:13:11 cmlenz Exp $
- * $Revision: 1.2 $
- * $Date: 2002/01/27 21:13:11 $
+ * $Header: /home/cvs/jakarta-slide/src/taglib/jstl/org/apache/slide/taglib/tag/jstl/JstlTagUtils.java,v 1.3 2002/02/24 14:19:25 cmlenz Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/02/24 14:19:25 $
*
* ====================================================================
*
@@ -90,7 +90,7 @@
* tag.
*
* @author <a href="mailto:cmlenz@apache.org">Christopher Lenz</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class JstlTagUtils {
@@ -227,7 +227,8 @@
("org.apache.slide.NamespaceName");
if (namespaceName == null) {
namespaceName =
- context.getServletContext().getInitParameter("namespace");
+ context.getServletContext().getInitParameter
+ ("org.apache.slide.NamespaceName");
}
if (namespaceName != null) {
bean = domain.getNamespace(namespaceName);
1.7 +6 -5 jakarta-slide/src/taglib/struts/org/apache/slide/taglib/tag/struts/StrutsTagUtils.java
Index: StrutsTagUtils.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/taglib/struts/org/apache/slide/taglib/tag/struts/StrutsTagUtils.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- StrutsTagUtils.java 12 Nov 2001 14:14:26 -0000 1.6
+++ StrutsTagUtils.java 24 Feb 2002 14:19:26 -0000 1.7
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/taglib/struts/org/apache/slide/taglib/tag/struts/StrutsTagUtils.java,v 1.6 2001/11/12 14:14:26 cmlenz Exp $
- * $Revision: 1.6 $
- * $Date: 2001/11/12 14:14:26 $
+ * $Header: /home/cvs/jakarta-slide/src/taglib/struts/org/apache/slide/taglib/tag/struts/StrutsTagUtils.java,v 1.7 2002/02/24 14:19:26 cmlenz Exp $
+ * $Revision: 1.7 $
+ * $Date: 2002/02/24 14:19:26 $
*
* ====================================================================
*
@@ -86,7 +86,7 @@
* Struts tag library, especially the <code><logic:iterate></code> tag.
*
* @author <a href="mailto:cmlenz@apache.org">Christopher Lenz</a>
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public class StrutsTagUtils {
@@ -170,7 +170,8 @@
("org.apache.slide.NamespaceName");
if (namespaceName == null) {
namespaceName =
- context.getServletContext().getInitParameter("namespace");
+ context.getServletContext().getInitParameter
+ ("org.apache.slide.NamespaceName");
}
if (namespaceName != null) {
bean = domain.getNamespace(namespaceName);
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>