Revision: 18180
Author: wko
Date: 2009-05-20 19:36:05 +0200 (Wed, 20 May 2009)
Log Message:
-----------
HSTTWO-544: Fixing FileNotFileException on trace tool jsp files in the
archetype-generated webapp.
Modified Paths:
--------------
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/pom.xml
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/web.xml
Added Paths:
-----------
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/tracetool-level.jsp
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/tracetool-log.jsp
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/tracetool.jsp
Modified:
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/pom.xml
===================================================================
---
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/pom.xml
2009-05-20 16:23:52 UTC (rev 18179)
+++
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/pom.xml
2009-05-20 17:36:05 UTC (rev 18180)
@@ -221,6 +221,33 @@
<wtpversion>1.5</wtpversion>
</configuration>
</plugin>
+ <!-- Include DOJO Library -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.dojotoolkit</groupId>
+ <artifactId>dojo</artifactId>
+ <version>1.3.0</version>
+ <type>zip</type>
+ <overWrite>false</overWrite>
+
<outputDirectory>${project.build.directory}/${project.build.finalName}/javascript</outputDirectory>
+ <includes>**/*</includes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Added:
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/tracetool-level.jsp
===================================================================
---
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/tracetool-level.jsp
(rev 0)
+++
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/tracetool-level.jsp
2009-05-20 17:36:05 UTC (rev 18180)
@@ -0,0 +1,32 @@
+<%--
+ Copyright 2008 Hippo
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS"
+ BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+--%>
+<%@ page language="java" import="java.util.*, org.hippoecm.hst.logging.*,
org.hippoecm.hst.site.HstServices" %>
+<%
+String status = "OK";
+String message = "";
+
+try {
+ LogEventBuffer traceLogEventBuffer = (LogEventBuffer)
HstServices.getComponentManager().getComponent("hstTraceToolLogEventBuffer");
+ String logLevel = request.getParameter("level");
+ if (logLevel != null) {
+ traceLogEventBuffer.setLevelByName(logLevel);
+ }
+} catch (Exception e) {
+ status = "FAIL";
+ message = e.toString();
+}
+%>
+[ "<%=status%>", "<%=message%>" ]
Property changes on:
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/tracetool-level.jsp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added:
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/tracetool-log.jsp
===================================================================
---
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/tracetool-log.jsp
(rev 0)
+++
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/tracetool-log.jsp
2009-05-20 17:36:05 UTC (rev 18180)
@@ -0,0 +1,31 @@
+<%--
+ Copyright 2008 Hippo
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS"
+ BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. --%><%@ page language="java"
import="java.util.*, java.text.*, org.slf4j.helpers.MessageFormatter,
org.hippoecm.hst.logging.*, org.hippoecm.hst.site.HstServices" %><%
+LogEventBuffer traceLogEventBuffer = (LogEventBuffer)
HstServices.getComponentManager().getComponent("hstTraceToolLogEventBuffer");
+List logEventList = new LinkedList();
+synchronized (traceLogEventBuffer) {
+ for (Iterator it = traceLogEventBuffer.iterator(); it.hasNext(); ) {
+ logEventList.add(it.next());
+ }
+}
+DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss,SSS");
+for (Iterator it = logEventList.iterator(); it.hasNext(); ) {
+ LogEvent logEvent = (LogEvent) it.next();
+ Date ts = new Date(logEvent.getTimestamp());
+ String level = logEvent.getLevel().toString();
+ String threadName = logEvent.getThreadName();
+ Object [] args = new Object [] { df.format(ts), level, threadName,
logEvent.getMessage() };
+ out.println(MessageFormatter.arrayFormat("{} {} {} {}", args));
+}
+%>
\ No newline at end of file
Property changes on:
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/tracetool-log.jsp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added:
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/tracetool.jsp
===================================================================
---
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/tracetool.jsp
(rev 0)
+++
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/tracetool.jsp
2009-05-20 17:36:05 UTC (rev 18180)
@@ -0,0 +1,108 @@
+<%--
+ Copyright 2008 Hippo
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS"
+ BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. --%>
+
+<%@ page language="java" import="org.hippoecm.hst.logging.*,
org.hippoecm.hst.site.HstServices" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/xml"; prefix="x" %>
+<%@ taglib uri="http://www.hippoecm.org/jsp/hst/core"; prefix='hst'%>
+<%
+LogEventBuffer traceLogEventBuffer = (LogEventBuffer)
HstServices.getComponentManager().getComponent("hstTraceToolLogEventBuffer");
+String traceLogLevelName = traceLogEventBuffer.getLevelName();
+%>
+
+<hst:link var="dojoPath" path="/staticresource/javascript/dojo-1.3.0"/>
+
+<hst:element var="hstTraceToolStyles" name="style">
+ <hst:attribute name="type" value="text/css" />
+ @import url("${dojoPath}/dijit/themes/tundra/tundra.css");
+ @import url("${dojoPath}/dojox/layout/resources/FloatingPane.css");
+ @import url("${dojoPath}/dojox/layout/resources/ResizeHandle.css");
+</hst:element>
+<hst:head-contribution keyHint="hstTraceToolStyles"
element="${hstTraceToolStyles}" />
+
+<hst:element var="hstTraceToolDojoInclude" name="script">
+ <hst:attribute name="language" value="javascript" />
+ <hst:attribute name="type" value="text/javascript" />
+ <hst:attribute name="src" value="${dojoPath}/dojo/dojo.js" />
+ <hst:attribute name="djConfig" value="parseOnLoad: true" />
+</hst:element>
+<hst:head-contribution keyHint="hstTraceToolDojoInclude"
element="${hstTraceToolDojoInclude}" />
+
+<hst:element var="hstTraceToolDojoRequires" name="script">
+ <hst:attribute name="language" value="javascript" />
+ <hst:attribute name="type" value="text/javascript" />
+ dojo.require("dojo.parser");
+ dojo.require("dojox.layout.FloatingPane");
+ dojo.require("dijit.layout.TabContainer");
+ dojo.require("dijit.layout.ContentPane");
+</hst:element>
+<hst:head-contribution keyHint="hstTraceToolDojoRequires"
element="${hstTraceToolDojoRequires}" />
+
+<hst:resourceURL var="logResourcePath" resourceId="log" />
+
+<div dojoType="dojox.layout.FloatingPane" id="hstTrace" title="HST Trace"
class="tundra"
+ resizable="true" dockable="true" maxable="true" closable="true"
+ style="width: 600px; height: 400px; visibility: hidden;">
+ <div id="tabContainer" dojoType="dijit.layout.TabContainer">
+ <div dojoType="dijit.layout.ContentPane" title="Logs"
+ href="${logResourcePath}" preventCache="true" refreshOnShow="true"
+ style="font-size: 10px; white-space: pre">
+ </div>
+ <div dojoType="dijit.layout.ContentPane" title="Settings">
+ <form name="theForm">
+ <div>
+ Log Level:
+ <select id="<hst:namespace/>logLevel">
+ <option value="DEBUG" <%=("DEBUG".equals(traceLogLevelName) ?
"selected" : "")%>>DEBUG</option>
+ <option value="INFO" <%=("INFO".equals(traceLogLevelName) ?
"selected" : "")%>>INFO</option>
+ <option value="WARN" <%=("WARN".equals(traceLogLevelName) ?
"selected" : "")%>>WARN</option>
+ <option value="ERROR" <%=("ERROR".equals(traceLogLevelName) ?
"selected" : "")%>>ERROR</option>
+ </select>
+ <input id="<hst:namespace/>logLevelSave" type="button" value="Save"/>
+ </div>
+ </form>
+ </div>
+ </div>
+</div>
+
+<hst:resourceURL var="logLevelUrl" resourceId="level" />
+
+<script type="text/javascript" language="javascript">
+dojo.addOnLoad(function() {
+ var btnSaveNode = dojo.byId("<hst:namespace/>logLevelSave");
+ dojo.connect(btnSaveNode, "onclick", function() {
+ var logLevel = dojo.byId("<hst:namespace/>logLevel").value;
+ var logLevelUrl = "${logLevelUrl}" + ("${logLevelUrl}".indexOf("?") >=
0 ? "&" : "?") + "level=" + logLevel;
+
+ var xhrArgs = {
+ url: logLevelUrl,
+ handleAs: "text",
+ load: function(data) {
+ var arr = eval(data.replace(/^\s+/g, ""));
+ if (arr[0] != "OK") {
+ alert("Failed to apply the log level. " + arr[1]);
+ } else {
+ alert("The log level has been applied.");
+ }
+ },
+ error: function(error) {
+ alert("An unexpected error occurred: " + error);
+ }
+ };
+
+ var deferred = dojo.xhrGet(xhrArgs);
+ });
+});
+</script>
Property changes on:
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/jsp/tracetool.jsp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Modified:
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/web.xml
===================================================================
---
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/web.xml
2009-05-20 16:23:52 UTC (rev 18179)
+++
ecm/site-toolkit/trunk/maven/archetype/src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/web.xml
2009-05-20 17:36:05 UTC (rev 18180)
@@ -71,35 +71,36 @@
<load-on-startup>2</load-on-startup>
</servlet>
- <servlet>
- <servlet-name>BinariesServlet</servlet-name>
-
<servlet-class>org.hippoecm.hst.servlet.BinariesServlet</servlet-class>
- </servlet>
- <!--
- <servlet> <servlet-name>StaticResourceServlet</servlet-name>
-
<servlet-class>${package}.servlet.StaticResourceServlet</servlet-class>
- </servlet>
- -->
- <servlet-mapping>
+ <servlet>
+ <servlet-name>BinariesServlet</servlet-name>
+ <servlet-class>org.hippoecm.hst.servlet.BinariesServlet</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>StaticResourceServlet</servlet-name>
+
<servlet-class>org.hippoecm.hst.servlet.StaticResourceServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
<servlet-name>HstContainerServlet</servlet-name>
<url-pattern>/preview/*</url-pattern>
- </servlet-mapping>
+ </servlet-mapping>
- <servlet-mapping>
- <servlet-name>HstContainerServlet</servlet-name>
- <url-pattern>/live/*</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>HstContainerServlet</servlet-name>
+ <url-pattern>/live/*</url-pattern>
+ </servlet-mapping>
- <servlet-mapping>
- <servlet-name>BinariesServlet</servlet-name>
- <url-pattern>/binaries/*</url-pattern>
- </servlet-mapping>
-
- <!--
- <servlet-mapping>
<servlet-name>StaticResourceServlet</servlet-name>
- <url-pattern>/staticresource</url-pattern> </servlet-mapping>
- -->
+ <servlet-mapping>
+ <servlet-name>BinariesServlet</servlet-name>
+ <url-pattern>/binaries/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>StaticResourceServlet</servlet-name>
+ <url-pattern>/staticresource/*</url-pattern>
+ </servlet-mapping>
<error-page>
<error-code>404</error-code>
_______________________________________________
Hippocms-svn mailing list
[email protected]
http://lists.hippo.nl/mailman/listinfo/hippocms-svn
