bloritsch 01/05/07 08:21:17
Modified: lib Tag: xml-cocoon2 avalon-excalibur.jar
avalon-framework.jar logkit.jar
src/org/apache/cocoon/components/language/markup/xsp Tag:
xml-cocoon2 XSPGenerator.java XSPRequestHelper.java
src/org/apache/cocoon/components/language/markup/xsp/java
Tag: xml-cocoon2 log.xsl
src/org/apache/cocoon/servlet Tag: xml-cocoon2
CocoonServlet.java
Log:
updates to allow Cocoon to compile the simple-xsp and provide heirarchical
RoleManagers.
Revision Changes Path
No revision
No revision
1.1.2.9 +169 -168 xml-cocoon/lib/Attic/avalon-excalibur.jar
<<Binary file>>
1.1.2.4 +63 -63 xml-cocoon/lib/Attic/avalon-framework.jar
<<Binary file>>
1.1.2.10 +65 -65 xml-cocoon/lib/Attic/logkit.jar
<<Binary file>>
No revision
No revision
1.1.2.24 +3 -1
xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPGenerator.java
Index: XSPGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPGenerator.java,v
retrieving revision 1.1.2.23
retrieving revision 1.1.2.24
diff -u -r1.1.2.23 -r1.1.2.24
--- XSPGenerator.java 2001/05/05 21:34:44 1.1.2.23
+++ XSPGenerator.java 2001/05/07 15:20:42 1.1.2.24
@@ -21,12 +21,14 @@
* Base class for XSP-generated <code>ServerPagesGenerator</code> classes
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.23 $ $Date: 2001/05/05 21:34:44 $
+ * @version CVS $Revision: 1.1.2.24 $ $Date: 2001/05/07 15:20:42 $
*/
public abstract class XSPGenerator extends AbstractServerPage implements
CompiledComponent, Contextualizable, Poolable {
+ protected Context avalonContext = null;
/** Contextualize this class */
public void contextualize(Context context) throws ContextException {
+ this.avalonContext = context;
}
/**
1.1.2.20 +15 -1
xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPRequestHelper.java
Index: XSPRequestHelper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPRequestHelper.java,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -u -r1.1.2.19 -r1.1.2.20
--- XSPRequestHelper.java 2001/05/04 19:02:38 1.1.2.19
+++ XSPRequestHelper.java 2001/05/07 15:20:46 1.1.2.20
@@ -21,7 +21,7 @@
* The <code>Request</code> object helper
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.19 $ $Date: 2001/05/04 19:02:38 $
+ * @version CVS $Revision: 1.1.2.20 $ $Date: 2001/05/07 15:20:46 $
*/
public class XSPRequestHelper extends XSPObjectHelper {
/**
@@ -60,6 +60,20 @@
{
Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
return request.getRequestURI();
+ }
+
+ /**
+ * Output the uri associated with the given objectModel
+ *
+ * @param objectModel The Map objectModel
+ */
+ public static void getURI(
+ Map objectModel,
+ ContentHandler handler
+ )
+ throws SAXException
+ {
+ elementData(handler, "uri", getURI(objectModel));
}
/**
No revision
No revision
1.1.2.8 +10 -16
xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/log.xsl
Index: log.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/log.xsl,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- log.xsl 2001/03/22 16:10:31 1.1.2.7
+++ log.xsl 2001/05/07 15:21:01 1.1.2.8
@@ -11,7 +11,7 @@
<!--
* @author <a href="mailto:[EMAIL PROTECTED]>Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/03/22 16:10:31 $
+ * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/05/07 15:21:01 $
-->
<!-- XSP Response logicsheet for the Java language -->
@@ -32,18 +32,6 @@
<xsl:with-param name="content" select="log:name"/>
</xsl:call-template>
</xsl:when>
- <xsl:otherwise>""</xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
-
- <xsl:variable name="url">
- <xsl:choose>
- <xsl:when test="@url">"<xsl:value-of select="@url"/>"</xsl:when>
- <xsl:when test="url">
- <xsl:call-template name="get-nested-content">
- <xsl:with-param name="content" select="log:url"/>
- </xsl:call-template>
- </xsl:when>
<xsl:otherwise>""</xsl:otherwise>
</xsl:choose>
</xsl:variable>
@@ -63,9 +51,15 @@
<xsp:logic>
if (getLogger() == null) {
try {
- org.apache.log.Category logCategory =
org.apache.log.LogKit.createCategory(<xsl:value-of select="$name"/>,
-
org.apache.log.LogKit.getPriorityForName(<xsl:value-of select="$level"/>));
- setLogger(new org.apache.log.Logger(logCategory, getLogger()));
+ String category = <xsl:value-of select="$name"/>;
+ org.apache.log.Logger logger =
org.apache.log.Hierarchy.getDefaultHierarchy().getLoggerFor("cocoon" +
(("".equals(category))? category : "." + category));
+ String file =
this.avalonContext.get(org.apache.cocoon.Constants.CONTEXT_LOG_DIR) + category
+ ".log";
+ org.apache.log.LogTarget[] targets = new
org.apache.log.LogTarget[] {
+ new org.apache.log.output.FileOutputLogTarget(file)
+ };
+ logger.setLogTargets(targets);
+
logger.setPriority(org.apache.log.Priority.getPriorityForName(<xsl:value-of
select="$level"/>));
+ this.setLogger(logger);
} catch (Exception e) {
getLogger().error("Could not create logger for \"" +
<xsl:value-of select="$name"/> + "\".", e);
No revision
No revision
1.1.4.94 +2 -2
xml-cocoon/src/org/apache/cocoon/servlet/Attic/CocoonServlet.java
Index: CocoonServlet.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/servlet/Attic/CocoonServlet.java,v
retrieving revision 1.1.4.93
retrieving revision 1.1.4.94
diff -u -r1.1.4.93 -r1.1.4.94
--- CocoonServlet.java 2001/05/05 02:52:20 1.1.4.93
+++ CocoonServlet.java 2001/05/07 15:21:11 1.1.4.94
@@ -56,7 +56,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Nicola Ken Barozzi</a> Aisa
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.4.93 $ $Date: 2001/05/05 02:52:20 $
+ * @version CVS $Revision: 1.1.4.94 $ $Date: 2001/05/07 15:21:11 $
*/
public class CocoonServlet extends HttpServlet {
@@ -277,7 +277,7 @@
this.log =
Hierarchy.getDefaultHierarchy().getLoggerFor("cocoon");
this.log.setPriority(logPriority);
-
+
PriorityFilter filter = new PriorityFilter(Priority.ERROR);
filter.addTarget( new ServletOutputLogTarget(context) );
LogTarget[] targets = new LogTarget[] { new
FileOutputLogTarget(path), filter };
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
