Author: michiel Date: 2009-05-17 15:24:06 +0200 (Sun, 17 May 2009) New Revision: 35211
Added: mmweb/trunk/src/ mmweb/trunk/src/main/ mmweb/trunk/src/main/webapp/ mmweb/trunk/src/main/webapp/WEB-INF/ mmweb/trunk/src/main/webapp/applications/ mmweb/trunk/src/main/webapp/css/ mmweb/trunk/src/main/webapp/editors/ mmweb/trunk/src/main/webapp/example_template.jsp mmweb/trunk/src/main/webapp/favicon.ico mmweb/trunk/src/main/webapp/includes/ mmweb/trunk/src/main/webapp/index.jsp mmweb/trunk/src/main/webapp/login/ mmweb/trunk/src/main/webapp/media/ mmweb/trunk/src/main/webapp/mmbase-taglib-1.0/ mmweb/trunk/src/main/webapp/mmbase-taglib-2.0/ mmweb/trunk/src/main/webapp/mmbase/ mmweb/trunk/src/main/webapp/mmbaseweb/ mmweb/trunk/src/main/webapp/mmevent4./ mmweb/trunk/src/main/webapp/presentations/ mmweb/trunk/src/main/webapp/rss/ mmweb/trunk/src/main/webapp/scripts/ mmweb/trunk/src/main/webapp/search.jsp mmweb/trunk/src/main/webapp/search_protal_style.jsp mmweb/trunk/src/main/webapp/showsession.jsp Removed: mmweb/trunk/WEB-INF/ mmweb/trunk/applications/ mmweb/trunk/css/ mmweb/trunk/editors/ mmweb/trunk/example_template.jsp mmweb/trunk/favicon.ico mmweb/trunk/includes/ mmweb/trunk/index.jsp mmweb/trunk/login/ mmweb/trunk/media/ mmweb/trunk/mmbase-taglib-1.0/ mmweb/trunk/mmbase-taglib-2.0/ mmweb/trunk/mmbase/ mmweb/trunk/mmbaseweb/ mmweb/trunk/mmevent4./ mmweb/trunk/presentations/ mmweb/trunk/rss/ mmweb/trunk/scripts/ mmweb/trunk/search.jsp mmweb/trunk/search_protal_style.jsp mmweb/trunk/showsession.jsp Log: converted to standard maven structure Deleted: mmweb/trunk/example_template.jsp =================================================================== --- mmweb/trunk/example_template.jsp 2009-05-17 13:20:24 UTC (rev 35210) +++ mmweb/trunk/example_template.jsp 2009-05-17 13:24:06 UTC (rev 35211) @@ -1,16 +0,0 @@ -<%...@taglib uri="http://www.mmbase.org/mmbase-taglib-1.0"; prefix="mm" -%><%...@page language="java" contentType="text/html; charset=utf-8" - -%><mm:cloud -><%...@include file="/includes/getids.jsp" -%><%...@include file="/includes/header.jsp" - -%><td class="white" colspan="2" valign="top"> -hier komt de content - - - -</td> - -<%...@include file="/includes/footer.jsp" -%></mm:cloud> Deleted: mmweb/trunk/favicon.ico =================================================================== --- mmweb/trunk/favicon.ico 2009-05-17 13:20:24 UTC (rev 35210) +++ mmweb/trunk/favicon.ico 2009-05-17 13:24:06 UTC (rev 35211) @@ -1 +0,0 @@ - h ( . . ������������������������������������������������������������������������������������������������������N4 N4 ������vc,q\/zg1�����}N4 Q7 ���������������N4 N4 ��l���R9 N4 R9 ��ꦚvN4 N4 ���������������N4 N4 ��c�uDR9 iTR9 �uE��jN4 N4 ���������������N4 N4 nY N4 cL ���cL N4 p\"N4 N4 ���������������N4 N4 N4 O5 �xI����zKR9 N4 N4 N4 ���������������N4 N4 R9 \D ���������[D R9 N4 N4 ���������������N4 N4 ��[����tCcU&�rA�����aN4 N4 ���������������N4 N4 ��t���R9 N4 R9 ��ꪝ{N4 N4 ���������������N4 N4 ��a�p>R9 mX R9 �r?��hN4 N4 ���������������N4 N4 kWN4 dN�ǴdNN4 mX N4 N4 ���������������N4 N4 N4 R9 �zL����|OR9 N4 N4 N4 ���������������N4 N4 R9 ^G���������^GR9 N4 N4 ��������������������������������������������������������������������������������������������������������� \ No newline at end of file Deleted: mmweb/trunk/index.jsp =================================================================== --- mmweb/trunk/index.jsp 2009-05-17 13:20:24 UTC (rev 35210) +++ mmweb/trunk/index.jsp 2009-05-17 13:24:06 UTC (rev 35211) @@ -1,39 +0,0 @@ -<%@ taglib uri="http://www.mmbase.org/mmbase-taglib-1.0"; prefix="mm" -%><%@ page language="java" contentType="text/html; charset=utf-8" session="true" -%><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> -<mm:content postprocessor="reducespace"> -<mm:cloud> - <mm:import externid="template" /> - - <mm:present referid="template"><%-- template url explicity specified --%> - <mm:include page="$template" /> - </mm:present> - - <mm:notpresent referid="template"><%-- no template specified, using 'page' en 'portal' arguments' --%> - - <%@ include file="includes/getids.jsp" %> - - <mm:node number="$page" notfound="skipbody"> - - <mm:relatednodes type="templates"> - <mm:field name="url" id="templatefound"> - <mm:include page="$_" /> - </mm:field> - </mm:relatednodes> - - <mm:notpresent referid="templatefound"><%-- still not found? then show error-page --%> - <%@ include file="/includes/header.jsp"%> - <td colspan="2"> - <strong><font color="#CC0000">Error:</font></strong> - <p> - A template should be added to page '<mm:field name="title" />'. - </p> - </td> - <%@ include file="/includes/footer.jsp"%> - </mm:notpresent> - - </mm:node> - </mm:notpresent> -</mm:cloud> -</mm:content> Deleted: mmweb/trunk/search.jsp =================================================================== --- mmweb/trunk/search.jsp 2009-05-17 13:20:24 UTC (rev 35210) +++ mmweb/trunk/search.jsp 2009-05-17 13:24:06 UTC (rev 35211) @@ -1,71 +0,0 @@ -<%...@page language="java" contentType="text/html;charset=utf-8" %> -<%@ taglib uri="http://www.mmbase.org/mmbase-taglib-1.0"; prefix="mm" %> -<jsp:useBean id="search" class="net.sf.mmapps.applications.htdigsearch.HTDigBean" scope="page"/> -<jsp:setProperty name="search" property="*" /> - -<mm:import externid="keywords"/> -<mm:import externid="restrict"/> -<form id="searchform"> - <input type="text" name="keywords" value="<mm:write referid="keywords"/>"/> - <input type="submit" name="zoeken" value="zoeken"/> - <select name="restrict"> - <option value="">full site</option> - <option value="mmdocs" <mm:compare referid="restrict" value="mmdocs">selected="true"</mm:compare>>in documentation</option> - <option value="mmdocs/reference/taglib/" <mm:compare referid="restrict" value="mmdocs/reference/taglib/">selected="true"</mm:compare>>in taglib documentation</option> - <option value="lists.mmbase.org" <mm:compare referid="restrict" value="lists.mmbase.org">selected="true"</mm:compare>>mailing lists</option> - </select> -</form> -<mm:present referid="keywords"> - <mm:isnotempty referid="keywords"> -<mm:formatter> - <mm:xslt> - <xsl:output method="html" encoding="ISO-8859-1"/> - <xsl:template match="htdig"> - <xsl:apply-templates select="search"/> - <ul> - <xsl:apply-templates select="result"/> - </ul> - </xsl:template> - <xsl:template match="result"> - <li> - <div class="result"> - <div class="score">score: <xsl:value-of select="percent"/> %</div> - <a href="{url}"> - <xsl:value-of select="title"/> - </a> - <br/> - <xsl:value-of select="excerpt" disable-output-escaping="yes"/> - <br/> - </div> - </li> - </xsl:template> - - <xsl:template match="search"> - <div class="documentXYZ">Documents <xsl:value-of select="firstdisplayed"/> - <xsl:value-of select="lastdisplayed"/> of <xsl:value-of select="matches"/> </div> - <xsl:apply-templates select="pagelist"/> - </xsl:template> - - <xsl:template match="pagelist"> - <table> - <tr> - <xsl:for-each select="page"> - <td> - <a> - <xsl:attribute name="href"> - <xsl:apply-templates select="a" mode="pagelist"/> - </xsl:attribute> - <xsl:value-of select="position()"/> - </a> - </td> - </xsl:for-each> - </tr> - </table> - </xsl:template> - <xsl:template match="a" mode="pagelist"> - <xsl:value-of select="translate(@href,';','&')"/> - </xsl:template> - </mm:xslt> - <jsp:getProperty name="search" property="result" /> -</mm:formatter> - </mm:isnotempty> -</mm:present> Deleted: mmweb/trunk/search_protal_style.jsp =================================================================== --- mmweb/trunk/search_protal_style.jsp 2009-05-17 13:20:24 UTC (rev 35210) +++ mmweb/trunk/search_protal_style.jsp 2009-05-17 13:24:06 UTC (rev 35211) @@ -1,10 +0,0 @@ -<%...@taglib uri="http://www.mmbase.org/mmbase-taglib-1.0"; prefix="mm" %> -<%...@page language="java" contentType="text/html; charset=iso8859-1" %> -<mm:cloud> -<%...@include file="/includes/getids.jsp" %> -<%...@include file="/includes/header.jsp" %> -<td> -<mm:include page="search2.jsp"/> -</td> -<%...@include file="/includes/footer.jsp" %> -</mm:cloud> Deleted: mmweb/trunk/showsession.jsp =================================================================== --- mmweb/trunk/showsession.jsp 2009-05-17 13:20:24 UTC (rev 35210) +++ mmweb/trunk/showsession.jsp 2009-05-17 13:24:06 UTC (rev 35211) @@ -1,34 +0,0 @@ -<table> -<% -if(request.getSession() == null) { -%>Session is null<% -} else { -for(java.util.Enumeration e = request.getSession().getAttributeNames(); e.hasMoreElements(); ) { -String name = (String) e.nextElement(); -Object attr = request.getAttribute(name); -String cname = attr == null ? "null" : attr.getClass().getName(); -%><tr><td><%=name%></td><td><%=cname%></td></tr><% -} -} -%> -</table> -<table> -<tr><th>name</th><th>version</th><th>maxage</th><th>domain</th><th>secure</th><th>path</th><th>comment</th><th>value</th></tr> -<% -Cookie[] c = request.getCookies(); -for(int i=0; i < c.length; i++) { -Cookie cook = c[i]; -%><tr> -<td><%=cook.getName()%></td> -<td><%=cook.getVersion()%></td> -<td><%=cook.getMaxAge()%></td> -<td><%=cook.getDomain()%></td> -<td><%=cook.getSecure()%></td> -<td><%=cook.getPath()%></td> -<td><%=cook.getComment()%></td> -<td><%=cook.getValue()%></td> -</tr><% -} -%> -</table> - Copied: mmweb/trunk/src/main/webapp/WEB-INF (from rev 34897, mmweb/trunk/WEB-INF) Copied: mmweb/trunk/src/main/webapp/applications (from rev 34897, mmweb/trunk/applications) Copied: mmweb/trunk/src/main/webapp/css (from rev 34897, mmweb/trunk/css) Copied: mmweb/trunk/src/main/webapp/editors (from rev 34897, mmweb/trunk/editors) Copied: mmweb/trunk/src/main/webapp/example_template.jsp (from rev 34897, mmweb/trunk/example_template.jsp) =================================================================== --- mmweb/trunk/src/main/webapp/example_template.jsp (rev 0) +++ mmweb/trunk/src/main/webapp/example_template.jsp 2009-05-17 13:24:06 UTC (rev 35211) @@ -0,0 +1,16 @@ +<%...@taglib uri="http://www.mmbase.org/mmbase-taglib-1.0"; prefix="mm" +%><%...@page language="java" contentType="text/html; charset=utf-8" + +%><mm:cloud +><%...@include file="/includes/getids.jsp" +%><%...@include file="/includes/header.jsp" + +%><td class="white" colspan="2" valign="top"> +hier komt de content + + + +</td> + +<%...@include file="/includes/footer.jsp" +%></mm:cloud> Copied: mmweb/trunk/src/main/webapp/favicon.ico (from rev 34897, mmweb/trunk/favicon.ico) =================================================================== --- mmweb/trunk/src/main/webapp/favicon.ico (rev 0) +++ mmweb/trunk/src/main/webapp/favicon.ico 2009-05-17 13:24:06 UTC (rev 35211) @@ -0,0 +1 @@ + h ( . . ������������������������������������������������������������������������������������������������������N4 N4 ������vc,q\/zg1�����}N4 Q7 ���������������N4 N4 ��l���R9 N4 R9 ��ꦚvN4 N4 ���������������N4 N4 ��c�uDR9 iTR9 �uE��jN4 N4 ���������������N4 N4 nY N4 cL ���cL N4 p\"N4 N4 ���������������N4 N4 N4 O5 �xI����zKR9 N4 N4 N4 ���������������N4 N4 R9 \D ���������[D R9 N4 N4 ���������������N4 N4 ��[����tCcU&�rA�����aN4 N4 ���������������N4 N4 ��t���R9 N4 R9 ��ꪝ{N4 N4 ���������������N4 N4 ��a�p>R9 mX R9 �r?��hN4 N4 ���������������N4 N4 kWN4 dN�ǴdNN4 mX N4 N4 ���������������N4 N4 N4 R9 �zL����|OR9 N4 N4 N4 ���������������N4 N4 R9 ^G���������^GR9 N4 N4 ��������������������������������������������������������������������������������������������������������� \ No newline at end of file Copied: mmweb/trunk/src/main/webapp/includes (from rev 34897, mmweb/trunk/includes) Copied: mmweb/trunk/src/main/webapp/index.jsp (from rev 34897, mmweb/trunk/index.jsp) =================================================================== --- mmweb/trunk/src/main/webapp/index.jsp (rev 0) +++ mmweb/trunk/src/main/webapp/index.jsp 2009-05-17 13:24:06 UTC (rev 35211) @@ -0,0 +1,39 @@ +<%@ taglib uri="http://www.mmbase.org/mmbase-taglib-1.0"; prefix="mm" +%><%@ page language="java" contentType="text/html; charset=utf-8" session="true" +%><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> +<mm:content postprocessor="reducespace"> +<mm:cloud> + <mm:import externid="template" /> + + <mm:present referid="template"><%-- template url explicity specified --%> + <mm:include page="$template" /> + </mm:present> + + <mm:notpresent referid="template"><%-- no template specified, using 'page' en 'portal' arguments' --%> + + <%@ include file="includes/getids.jsp" %> + + <mm:node number="$page" notfound="skipbody"> + + <mm:relatednodes type="templates"> + <mm:field name="url" id="templatefound"> + <mm:include page="$_" /> + </mm:field> + </mm:relatednodes> + + <mm:notpresent referid="templatefound"><%-- still not found? then show error-page --%> + <%@ include file="/includes/header.jsp"%> + <td colspan="2"> + <strong><font color="#CC0000">Error:</font></strong> + <p> + A template should be added to page '<mm:field name="title" />'. + </p> + </td> + <%@ include file="/includes/footer.jsp"%> + </mm:notpresent> + + </mm:node> + </mm:notpresent> +</mm:cloud> +</mm:content> Copied: mmweb/trunk/src/main/webapp/login (from rev 34897, mmweb/trunk/login) Copied: mmweb/trunk/src/main/webapp/media (from rev 34897, mmweb/trunk/media) Copied: mmweb/trunk/src/main/webapp/mmbase (from rev 34897, mmweb/trunk/mmbase) Copied: mmweb/trunk/src/main/webapp/mmbase-taglib-1.0 (from rev 34897, mmweb/trunk/mmbase-taglib-1.0) Copied: mmweb/trunk/src/main/webapp/mmbase-taglib-2.0 (from rev 34897, mmweb/trunk/mmbase-taglib-2.0) Copied: mmweb/trunk/src/main/webapp/mmbaseweb (from rev 34897, mmweb/trunk/mmbaseweb) Copied: mmweb/trunk/src/main/webapp/mmevent4. (from rev 34897, mmweb/trunk/mmevent4.) Copied: mmweb/trunk/src/main/webapp/presentations (from rev 35210, mmweb/trunk/presentations) Property changes on: mmweb/trunk/src/main/webapp/presentations ___________________________________________________________________ Name: svn:mergeinfo + Copied: mmweb/trunk/src/main/webapp/rss (from rev 34897, mmweb/trunk/rss) Copied: mmweb/trunk/src/main/webapp/scripts (from rev 34897, mmweb/trunk/scripts) Copied: mmweb/trunk/src/main/webapp/search.jsp (from rev 34897, mmweb/trunk/search.jsp) =================================================================== --- mmweb/trunk/src/main/webapp/search.jsp (rev 0) +++ mmweb/trunk/src/main/webapp/search.jsp 2009-05-17 13:24:06 UTC (rev 35211) @@ -0,0 +1,71 @@ +<%...@page language="java" contentType="text/html;charset=utf-8" %> +<%@ taglib uri="http://www.mmbase.org/mmbase-taglib-1.0"; prefix="mm" %> +<jsp:useBean id="search" class="net.sf.mmapps.applications.htdigsearch.HTDigBean" scope="page"/> +<jsp:setProperty name="search" property="*" /> + +<mm:import externid="keywords"/> +<mm:import externid="restrict"/> +<form id="searchform"> + <input type="text" name="keywords" value="<mm:write referid="keywords"/>"/> + <input type="submit" name="zoeken" value="zoeken"/> + <select name="restrict"> + <option value="">full site</option> + <option value="mmdocs" <mm:compare referid="restrict" value="mmdocs">selected="true"</mm:compare>>in documentation</option> + <option value="mmdocs/reference/taglib/" <mm:compare referid="restrict" value="mmdocs/reference/taglib/">selected="true"</mm:compare>>in taglib documentation</option> + <option value="lists.mmbase.org" <mm:compare referid="restrict" value="lists.mmbase.org">selected="true"</mm:compare>>mailing lists</option> + </select> +</form> +<mm:present referid="keywords"> + <mm:isnotempty referid="keywords"> +<mm:formatter> + <mm:xslt> + <xsl:output method="html" encoding="ISO-8859-1"/> + <xsl:template match="htdig"> + <xsl:apply-templates select="search"/> + <ul> + <xsl:apply-templates select="result"/> + </ul> + </xsl:template> + <xsl:template match="result"> + <li> + <div class="result"> + <div class="score">score: <xsl:value-of select="percent"/> %</div> + <a href="{url}"> + <xsl:value-of select="title"/> + </a> + <br/> + <xsl:value-of select="excerpt" disable-output-escaping="yes"/> + <br/> + </div> + </li> + </xsl:template> + + <xsl:template match="search"> + <div class="documentXYZ">Documents <xsl:value-of select="firstdisplayed"/> - <xsl:value-of select="lastdisplayed"/> of <xsl:value-of select="matches"/> </div> + <xsl:apply-templates select="pagelist"/> + </xsl:template> + + <xsl:template match="pagelist"> + <table> + <tr> + <xsl:for-each select="page"> + <td> + <a> + <xsl:attribute name="href"> + <xsl:apply-templates select="a" mode="pagelist"/> + </xsl:attribute> + <xsl:value-of select="position()"/> + </a> + </td> + </xsl:for-each> + </tr> + </table> + </xsl:template> + <xsl:template match="a" mode="pagelist"> + <xsl:value-of select="translate(@href,';','&')"/> + </xsl:template> + </mm:xslt> + <jsp:getProperty name="search" property="result" /> +</mm:formatter> + </mm:isnotempty> +</mm:present> Copied: mmweb/trunk/src/main/webapp/search_protal_style.jsp (from rev 34897, mmweb/trunk/search_protal_style.jsp) =================================================================== --- mmweb/trunk/src/main/webapp/search_protal_style.jsp (rev 0) +++ mmweb/trunk/src/main/webapp/search_protal_style.jsp 2009-05-17 13:24:06 UTC (rev 35211) @@ -0,0 +1,10 @@ +<%...@taglib uri="http://www.mmbase.org/mmbase-taglib-1.0"; prefix="mm" %> +<%...@page language="java" contentType="text/html; charset=iso8859-1" %> +<mm:cloud> +<%...@include file="/includes/getids.jsp" %> +<%...@include file="/includes/header.jsp" %> +<td> +<mm:include page="search2.jsp"/> +</td> +<%...@include file="/includes/footer.jsp" %> +</mm:cloud> Copied: mmweb/trunk/src/main/webapp/showsession.jsp (from rev 34897, mmweb/trunk/showsession.jsp) =================================================================== --- mmweb/trunk/src/main/webapp/showsession.jsp (rev 0) +++ mmweb/trunk/src/main/webapp/showsession.jsp 2009-05-17 13:24:06 UTC (rev 35211) @@ -0,0 +1,34 @@ +<table> +<% +if(request.getSession() == null) { +%>Session is null<% +} else { +for(java.util.Enumeration e = request.getSession().getAttributeNames(); e.hasMoreElements(); ) { +String name = (String) e.nextElement(); +Object attr = request.getAttribute(name); +String cname = attr == null ? "null" : attr.getClass().getName(); +%><tr><td><%=name%></td><td><%=cname%></td></tr><% +} +} +%> +</table> +<table> +<tr><th>name</th><th>version</th><th>maxage</th><th>domain</th><th>secure</th><th>path</th><th>comment</th><th>value</th></tr> +<% +Cookie[] c = request.getCookies(); +for(int i=0; i < c.length; i++) { +Cookie cook = c[i]; +%><tr> +<td><%=cook.getName()%></td> +<td><%=cook.getVersion()%></td> +<td><%=cook.getMaxAge()%></td> +<td><%=cook.getDomain()%></td> +<td><%=cook.getSecure()%></td> +<td><%=cook.getPath()%></td> +<td><%=cook.getComment()%></td> +<td><%=cook.getValue()%></td> +</tr><% +} +%> +</table> + _______________________________________________ Cvs mailing list [email protected] http://lists.mmbase.org/mailman/listinfo/cvs
