xorio-commit Mailing List for Xorio
Status: Alpha
Brought to you by:
sklaiber
Menu
▾
▴
xorio-commit — Commit Notifications for the Xorio Project CVS
You can subscribe to this list here.
| 2006 |
Jan
(259) |
Feb
(16) |
Mar
(19) |
Apr
(7) |
May
|
Jun
|
Jul
(83) |
Aug
(59) |
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(24) |
Feb
|
Mar
|
Apr
(2) |
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <skl...@us...> - 2007-05-20 08:32:49
|
Revision: 418
http://svn.sourceforge.net/xorio/?rev=418&view=rev
Author: sklaiber
Date: 2007-05-20 01:32:48 -0700 (Sun, 20 May 2007)
Log Message:
-----------
replaced
Added Paths:
-----------
trunk/Examples/text-db/text-db/META-INF/MANIFEST.MF
Added: trunk/Examples/text-db/text-db/META-INF/MANIFEST.MF
===================================================================
--- trunk/Examples/text-db/text-db/META-INF/MANIFEST.MF (rev 0)
+++ trunk/Examples/text-db/text-db/META-INF/MANIFEST.MF 2007-05-20 08:32:48 UTC (rev 418)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <skl...@us...> - 2007-05-20 08:31:54
|
Revision: 417
http://svn.sourceforge.net/xorio/?rev=417&view=rev
Author: sklaiber
Date: 2007-05-20 01:31:53 -0700 (Sun, 20 May 2007)
Log Message:
-----------
y
Removed Paths:
-------------
trunk/Examples/text-db/text-db/META-INF/MANIFEST.MF
Deleted: trunk/Examples/text-db/text-db/META-INF/MANIFEST.MF
===================================================================
--- trunk/Examples/text-db/text-db/META-INF/MANIFEST.MF 2007-04-19 12:15:41 UTC (rev 416)
+++ trunk/Examples/text-db/text-db/META-INF/MANIFEST.MF 2007-05-20 08:31:53 UTC (rev 417)
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path:
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <skl...@us...> - 2007-04-19 12:15:41
|
Revision: 416
http://svn.sourceforge.net/xorio/?rev=416&view=rev
Author: sklaiber
Date: 2007-04-19 05:15:41 -0700 (Thu, 19 Apr 2007)
Log Message:
-----------
Migratede Chages form text-db demo
Modified Paths:
--------------
trunk/src/jsp/admin/structedit.jsp
Modified: trunk/src/jsp/admin/structedit.jsp
===================================================================
--- trunk/src/jsp/admin/structedit.jsp 2007-04-19 12:15:17 UTC (rev 415)
+++ trunk/src/jsp/admin/structedit.jsp 2007-04-19 12:15:41 UTC (rev 416)
@@ -7,7 +7,6 @@
try{
struct = Integer.parseInt(request.getQueryString());
} catch (Exception e) {
- struct = struct;
}
%>
<xa:ifmode value="UpdateStruct">
@@ -18,68 +17,68 @@
<title>Xorio Edit Structure <%=struct%></title>
<link rel="stylesheet" type="text/css" media="screen" href="/css/xorio.css"/>
</head>
- <BODY>
- <TABLE WIDTH="100%">
- <TR>
- <TD COLSPAN="2">
- <TABLE WIDTH="100%">
- <TR>
- <TD ROWSPAN="2" WIDTH="270">
- <IMG SRC="/images/xoriobanner_01.jpg" HEIGHT="150" WIDTH="270"/>
- </TD>
- <TD ALIGN="top" HEIGHT="75">
- <IMG SRC="/images/xoriobanner_02.jpg" height="75" width="152"/>
- </TD>
- </TR>
- <TR>
- <TD>
- <H1 id="main-heading"> </H1>
- </TD>
- </TR>
- </TABLE>
- </TD>
- </TR>
- <TR>
- <TD id="menupane">
- <SPAN CLASS="menu">
+ <body>
+ <table width="100%">
+ <tr>
+ <td colspan="2">
+ <table width="100%">
+ <tr>
+ <td rowspan="2" width="270">
+ <img src="/images/xoriobanner_01.jpg" height="150" width="270"/>
+ </td>
+ <td align="top" height="75">
+ <img src="/images/xoriobanner_02.jpg" height="75" width="152"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <h1 id="main-heading"> </h1>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td id="menupane">
+ <span class="menu">
Admin Menu
- </SPAN>
- <DIV CLASS="menu">
- <TABLE CLASS="menu">
- <TR CLASS="menu">
- <TD CLASS="menu">
+ </span>
+ <div class="menu">
+ <table class="menu">
+ <tr class="menu">
+ <td class="menu">
<a class="menu" href="index.jsp">
<span class="menu-item">
Admin Interface
</span>
</a>
- </TD>
- </TR>
- <TR CLASS="menu">
- <TD CLASS="menu">
+ </td>
+ </tr>
+ <tr class="menu">
+ <td class="menu">
<a class="menu" href="../">
<span class="menu-item">
Homepage
</span>
</a>
- </TD>
- </TR>
- </TABLE>
- </DIV>
- </TD>
- <TD id="contentpane">
+ </td>
+ </tr>
+ </table>
+ </div>
+ </td>
+ <td id="contentpane">
<xa:ifmode value="null">
<% if (struct != 0) { %>
<xs:edit-struct-form structid="<%=struct%>"/>
<% } %>
</xa:ifmode>
<xa:ifmode value="UpdateStruct">
- <xs:edit-struct-form structid="<%=request.getParameter(\"s-id\")%>"/>
+ <xs:edit-struct-form structid="${param['s-id']}"/>
</xa:ifmode>
- </TD>
- </TR>
- </TABLE>
+ </td>
+ </tr>
+ </table>
<xs:display-footer displayediticon="false" />
- </BODY>
-</HTML>
+ </body>
+</html>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <skl...@us...> - 2007-04-19 12:15:19
|
Revision: 415
http://svn.sourceforge.net/xorio/?rev=415&view=rev
Author: sklaiber
Date: 2007-04-19 05:15:17 -0700 (Thu, 19 Apr 2007)
Log Message:
-----------
Migratede Chages form text-db demo
Modified Paths:
--------------
trunk/src/jsp/admin/index.jsp
Modified: trunk/src/jsp/admin/index.jsp
===================================================================
--- trunk/src/jsp/admin/index.jsp 2007-01-13 14:26:33 UTC (rev 414)
+++ trunk/src/jsp/admin/index.jsp 2007-04-19 12:15:17 UTC (rev 415)
@@ -4,21 +4,21 @@
<%@taglib uri="/xorio-std" prefix="xs"%>
<%@taglib uri="/xorio-admin" prefix="xa"%>
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1" import="java.util.Map,java.util.Set,java.util.TreeMap, com.klaiber.xorio.structuredcontent.Structure,com.klaiber.xorio.structuredcontent.searcher.FieldFirstLetterSearcher,java.util.HashMap"%>
+ pageEncoding="ISO-8859-1" import=""%>
<xa:ifmode value="DelStructDef"></xa:ifmode>
<xa:ifmode value="DelFieldDef"></xa:ifmode>
<xa:ifmode value="DelStruct"></xa:ifmode>
<xa:ifmode value="AddStructDef">
- <xa:add-sdef name="${param.sd-name}" attribute="xorio-new-def" sl_read="${param.sd-sec-read}" sl_write="${param.sd-sec-write}"/>
+ <xa:add-sdef name="${param['sd-name']}" attribute="xorio_new_def" sl_read="${param['sd-sec-read']}" sl_write="${param['sd-sec-write']}"/>
</xa:ifmode>
<xa:ifmode value="ChangeStructDef">
- <xa:update-sdef defid="${param.sd-id}" name="${param.sd-name}" sl_read="${param.sd-sec-read}" sl_write="${param.sd-sec-write}"/>
+ <xa:update-sdef defid="${param['sd-id']}" name="${param['sd-name']}" sl_read="${param['sd-sec-read']}" sl_write="${param['sd-sec-write']}"/>
</xa:ifmode>
<xa:ifmode value="UpdateFieldDef">
- <xa:update-fdef defid="<%=request.getParameter(\"fd-id\")%>" field_type="<%=request.getParameter(\"fd-FieldType\")%>" name="<%=request.getParameter(\"fd-name\")%>"/>
+ <xa:update-fdef defid="${param['fd-id']}" field_type="${param['fd-FieldType']}" name="${param['fd-name']}"/>
</xa:ifmode>
<xa:ifmode value="AddFieldDef">
- <xa:add-fdef field_type="<%=request.getParameter(\"fd-FieldType\")%>" name="<%=request.getParameter(\"fd-name\")%>" sd_id="<%=request.getParameter(\"fd-sd_id\")%>"/>
+ <xa:add-fdef field_type="${param['fd-FieldType']}" name="${param['fd-name']}" sd_id="${param['fd-sd_id']}"/>
</xa:ifmode>
<xa:ifmode value="AddStruct">
<xs:add-struct/>
@@ -26,43 +26,41 @@
<xa:ifmode value="UpdateStruct">
<xs:update-struct/>
</xa:ifmode>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html>
<head>
<title>Xorio Administration</title>
<link rel="stylesheet" type="text/css" media="screen" href="/css/xorio.css"/>
</head>
- <BODY>
- <TABLE WIDTH="100%">
- <TR>
- <TD COLSPAN="2">
- <TABLE WIDTH="100%">
- <TR>
- <TD ROWSPAN="2" WIDTH="270">
- <IMG SRC="/images/xoriobanner_01.jpg" HEIGHT="150" WIDTH="270"/>
- </TD>
- <TD ALIGN="top" HEIGHT="75">
- <IMG SRC="/images/xoriobanner_02.jpg" height="75" width="152"/>
- </TD>
- </TR>
- <TR>
- <TD>
- <H1 id="main-heading"> Administration Interface</H1>
- </TD>
- </TR>
- </TABLE>
- </TD>
- </TR>
- <TR>
- <TD id="menupane">
- <SPAN CLASS="menu">
+ <body>
+ <table width="100%">
+ <tr>
+ <td colspan="2">
+ <table width="100%">
+ <tr>
+ <td rowspan="2" width="270">
+ <img src="/images/xoriobanner_01.jpg" height="150" width="270"/>
+ </td>
+ <td align="top" height="75">
+ <img src="/images/xoriobanner_02.jpg" height="75" width="152"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <h1 id="main-heading"> Administration Interface</h1>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td id="menupane">
+ <span class="menu">
Admin Menu
- </SPAN>
- <DIV CLASS="menu">
- <TABLE CLASS="menu">
- <TR CLASS="menu">
- <TD CLASS="menu">
+ </span>
+ <div class="menu">
+ <table class="menu">
+ <tr class="menu">
+ <td class="menu">
<form method="post" action="<%=request.getRequestURI()%>" name="Menue1">
<button class="menu" type="submit" name="mode" value="MenuAdminStructs">
<span class="menu-item">
@@ -70,60 +68,60 @@
</span>
</button>
</form>
- </TD>
- </TR>
- <TR CLASS="menu">
- <TD CLASS="menu">
+ </td>
+ </tr>
+ <tr class="menu">
+ <td class="menu">
Show Stats
- </TD>
- </TR>
- <TR CLASS="menu">
- <TD CLASS="menu">
+ </td>
+ </tr>
+ <tr class="menu">
+ <td class="menu">
- </TD>
- </TR>
- </TABLE>
- </DIV>
- </TD>
- <TD id="contentpane">
+ </td>
+ </tr>
+ </table>
+ </div>
+ </td>
+ <td id="contentpane">
<xa:ifmode value="ListStructs">
- <xs:new-struct-form defid="<%=request.getParameter(\"sd_id\")%>"/>
- <xs:list-structs defid="<%=request.getParameter(\"sd_id\")%>"/>
+ <xs:new-struct-form defid="${param.sd_id}"/>
+ <xs:list-structs defid="${param.sd_id}"/>
</xa:ifmode>
<xa:ifmode value="AddStruct">
- <xs:new-struct-form defid="<%=request.getParameter(\"sd-id\")%>"/>
- <xs:list-structs defid="<%=request.getParameter(\"sd-id\")%>"/>
+ <xs:new-struct-form defid="${param['sd-id']}"/>
+ <xs:list-structs defid="${param['sd-id']}"/>
</xa:ifmode>
<xa:ifmode value="UpdateStruct">
- <xs:new-struct-form defid="<%=request.getParameter(\"sd-id\")%>"/>
- <xs:list-structs defid="<%=request.getParameter(\"sd-id\")%>"/>
+ <xs:new-struct-form defid="${param['sd-id']}"/>
+ <xs:list-structs defid="${param['sd-id']}"/>
</xa:ifmode>
<xa:ifmode value="DelStruct">
- <xs:new-struct-form defid="<%=request.getParameter(\"sd-id\")%>"/>
- <xs:list-structs defid="<%=request.getParameter(\"sd-id\")%>"/>
+ <xs:new-struct-form defid="${param['sd-id']}"/>
+ <xs:list-structs defid="${param['sd-id']}"/>
</xa:ifmode>
<xa:ifmode value="EditStructDef">
- <xa:edit-sdef-form defid="<%=request.getParameter(\"sd_id\")%>"/>
- <xa:list-fdefs defid="<%=request.getParameter(\"sd_id\")%>"/>
- <xa:new-fdef-form defid="<%=request.getParameter(\"sd_id\")%>"/>
+ <xa:edit-sdef-form defid="${param.sd_id}"/>
+ <xa:list-fdefs defid="${param.sd_id}"/>
+ <xa:new-fdef-form defid="${param.sd_id}"/>
</xa:ifmode>
<xa:ifmode value="AddStructDef">
- <xa:edit-sdef-form defid="<%=(Integer)pageContext.getAttribute(\"xorio-new-def\")%>"/>
- <xa:list-fdefs defid="<%=(Integer)pageContext.getAttribute(\"xorio-new-def\")%>"/>
- <xa:new-fdef-form defid="<%=(Integer)pageContext.getAttribute(\"xorio-new-def\")%>"/>
+ <xa:edit-sdef-form defid="${pageScope.xorio_new_def}"/>
+ <xa:list-fdefs defid="${pageScope.xorio_new_def}"/>
+ <xa:new-fdef-form defid="${pageScope.xorio_new_def}"/>
</xa:ifmode>
<xa:ifmode value="AddFieldDef">
- <xa:edit-sdef-form defid="<%=request.getParameter(\"fd-sd_id\")%>"/>
- <xa:list-fdefs defid="<%=request.getParameter(\"fd-sd_id\")%>"/>
- <xa:new-fdef-form defid="<%=request.getParameter(\"fd-sd_id\")%>"/>
+ <xa:edit-sdef-form defid="${param['fd-sd_id']}"/>
+ <xa:list-fdefs defid="${param['fd-sd_id']}"/>
+ <xa:new-fdef-form defid="${param['fd-sd_id']}"/>
</xa:ifmode>
<xa:ifmode value="DelStructDef">
@@ -132,17 +130,17 @@
</xa:ifmode>
<xa:ifmode value="EditFieldDef">
- <xa:edit-fdef-form defid="<%=request.getParameter(\"fd_id\")%>"/>
+ <xa:edit-fdef-form defid="${param.fd_id}"/>
</xa:ifmode>
<xa:ifmode value="EditStruct">
- <xs:edit-struct-form structid="<%=request.getParameter(\"s-id\")%>"/>
+ <xs:edit-struct-form structid="${param['s-id']}"/>
</xa:ifmode>
<xa:ifmode value="DelFieldDef">
- <xa:edit-sdef-form defid="<%=request.getParameter(\"sd-id\")%>"/>
- <xa:list-fdefs defid="<%=request.getParameter(\"sd-id\")%>"/>
- <xa:new-fdef-form defid="<%=request.getParameter(\"sd-id\")%>"/>
+ <xa:edit-sdef-form defid="${param['sd-id']}"/>
+ <xa:list-fdefs defid="${param['sd-id']}"/>
+ <xa:new-fdef-form defid="${param['sd-id']}"/>
</xa:ifmode>
<xa:ifmode value="ChangeStructDef">
@@ -151,9 +149,9 @@
</xa:ifmode>
<xa:ifmode value="UpdateFieldDef">
- <xa:edit-sdef-form defid="<%=request.getParameter(\"sd-id\")%>"/>
- <xa:list-fdefs defid="<%=request.getParameter(\"sd-id\")%>"/>
- <xa:new-fdef-form defid="<%=request.getParameter(\"sd-id\")%>"/>
+ <xa:edit-sdef-form defid="${param['sd-id']}"/>
+ <xa:list-fdefs defid="${param['sd-id']}"/>
+ <xa:new-fdef-form defid="${param['sd-id']}"/>
</xa:ifmode>
<xa:ifmode value="MenuAdminStructs">
@@ -168,11 +166,11 @@
<tr class="xor-std-edit">
<td class="xor-std-edit">
<span class="welcome">
- <P>This is the Administration Interface of your Xorio installation.</P>
- <P>Here you can manage the Xorio "Structured Content Engine" and configure most of the other parts of Xorio</P>
- <P>Edit Structure<br/>In this part you can define structure definitions and create and edit structures for them.</p>
- <P>Show Stats<br/>In this part you can watch information about this Xorio installation and its current state. Especially about the caches. This part is not yet implemented.</p>
- <P>If you need more information please visit the <a href="http://www.xorio.org/" target="_blank" >Xorio Project Homepage</a></p>
+ <p>This is the Administration Interface of your Xorio installation.</p>
+ <p>Here you can manage the Xorio "Structured Content Engine" and configure most of the other parts of Xorio</p>
+ <p>Edit Structure<br/>In this part you can define structure definitions and create and edit structures for them.</p>
+ <p>Show Stats<br/>In this part you can watch information about this Xorio installation and its current state. Especially about the caches. This part is not yet implemented.</p>
+ <p>If you need more information please visit the <a href="http://www.xorio.org/" target="_blank" >Xorio Project Homepage</a></p>
</span>
</td>
</tr>
@@ -180,9 +178,9 @@
</div>
</xa:ifmode>
- </TD>
- </TR>
- </TABLE>
+ </td>
+ </tr>
+ </table>
<xs:display-footer displayediticon="false"/>
- </BODY>
-</HTML>
+ </body>
+</html>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <skl...@us...> - 2007-01-13 14:26:48
|
Revision: 414
http://svn.sourceforge.net/xorio/?rev=414&view=rev
Author: sklaiber
Date: 2007-01-13 06:26:33 -0800 (Sat, 13 Jan 2007)
Log Message:
-----------
Inital Version
Tag to do Performance Measurements in JSPs
Added Paths:
-----------
trunk/src/java/com/klaiber/xorio/taglibs/std/PerformanceMeasurementTag.java
Added: trunk/src/java/com/klaiber/xorio/taglibs/std/PerformanceMeasurementTag.java
===================================================================
--- trunk/src/java/com/klaiber/xorio/taglibs/std/PerformanceMeasurementTag.java (rev 0)
+++ trunk/src/java/com/klaiber/xorio/taglibs/std/PerformanceMeasurementTag.java 2007-01-13 14:26:33 UTC (rev 414)
@@ -0,0 +1,143 @@
+package com.klaiber.xorio.taglibs.std;
+
+
+import javax.servlet.jsp.tagext.TagSupport;
+import javax.servlet.jsp.JspException;
+
+import java.io.IOException;
+import java.util.Calendar;
+
+import com.klaiber.xorio.util.monitor.PerformanceMonitor;
+import com.klaiber.xorio.util.monitor.PerformanceMonitorImpl;
+
+import org.apache.log4j.Logger;
+
+
+/**
+ * <p>Title: PerformanceMeasurementTag </p>
+ *
+ * <p>Description: Does a Measurement using the PreformanceMonitor</p>
+ *
+ * <p>Copyright: Copyright (c) 2007 Klaiber IT-Consulting, Simon Klaiber,
+ * released under GPL</p>
+ *
+ */
+public class PerformanceMeasurementTag extends TagSupport{
+
+
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Log4J Logger for this Class
+ */
+ public static Logger log = Logger.getLogger(PerformanceMeasurementTag.class.getName());
+
+
+ private long _starttime;
+
+
+// --- out
+
+ /**
+ * Holds the Value of the out parameter
+ */
+ private boolean _out=false;
+
+ /**
+ * Getter method for parameter out
+ *
+ * @return boolean
+ */
+ public boolean getOut() {
+ return _out;
+ }
+
+ /**
+ * Setter method for parameter out
+ *
+ * @param structid boolean
+ */
+ public void setOut(boolean out) {
+ this._out = out;
+ }
+
+ /**
+ * String Wrapper for the Setter method for parameter boolean
+ *
+ * @param out String
+ */
+ public void setOut(String out) {
+ this.setOut(Boolean.getBoolean(out));
+ }
+
+// --- item
+
+ /**
+ * Holds the Value of the item parameter
+ */
+ private String _item=null;
+
+ /**
+ * Getter method for parameter item
+ *
+ * @return String
+ */
+ public String getItem() {
+ return _item;
+ }
+
+ /**
+ * Setter method for parameter item
+ *
+ * @param item String
+ */
+ public void setItem(String item) {
+ this._item = item;
+ }
+
+
+
+
+ /**
+ * Standard Construct calling the super-class constructor
+ */
+ public PerformanceMeasurementTag() {
+ super();
+ }
+
+
+
+ public int doStartTag() throws JspException {
+ Calendar now = Calendar.getInstance();
+ _starttime = now.getTimeInMillis();
+ return EVAL_BODY_INCLUDE;
+ }
+
+ /**
+ * Outputs the Standard HTML Representation of the Structure to the calling JSP
+ *
+ * @throws JspException
+ * @return int
+ */
+ public int doEndTag() throws JspException {
+ long endtime = Calendar.getInstance().getTimeInMillis();
+ long duration = endtime - _starttime;
+ PerformanceMonitor pm = PerformanceMonitorImpl.getInstance();
+ pm.addMeasurement(_item, duration);
+
+ if (this.getOut()){
+ float f = duration/1000;
+ try{
+ this.pageContext.getOut().write(f+"");
+ } catch (IOException e) {
+ log.error("Error while writing to JSP out",e);
+ throw new JspException("Error while writing to JSP out",e);
+ }
+ }
+ return EVAL_PAGE;
+ }
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <skl...@us...> - 2007-01-13 10:19:10
|
Revision: 413
http://svn.sourceforge.net/xorio/?rev=413&view=rev
Author: sklaiber
Date: 2007-01-13 02:19:08 -0800 (Sat, 13 Jan 2007)
Log Message:
-----------
added Get Configuration
Modified Paths:
--------------
trunk/src/tld/xorio-std.tld
Modified: trunk/src/tld/xorio-std.tld
===================================================================
--- trunk/src/tld/xorio-std.tld 2007-01-03 16:20:45 UTC (rev 412)
+++ trunk/src/tld/xorio-std.tld 2007-01-13 10:19:08 UTC (rev 413)
@@ -113,6 +113,37 @@
</attribute>
</tag>
+ <tag>
+ <name>get-configitem</name>
+ <tagclass>com.klaiber.xorio.taglibs.std.GetConfigItemTag</tagclass>
+ <bodycontent>JSP</bodycontent>
+ <info>Gets a Config Item out of a config File</info>
+ <attribute>
+ <name>configuration</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>item</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>out</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>scope</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>var</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
</taglib>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <skl...@us...> - 2007-01-03 16:20:57
|
Revision: 412
http://svn.sourceforge.net/xorio/?rev=412&view=rev
Author: sklaiber
Date: 2007-01-03 08:20:45 -0800 (Wed, 03 Jan 2007)
Log Message:
-----------
Cleanup
* Removed empty import Attribute
Modified Paths:
--------------
trunk/Examples/text-db/text-db/admin/index.jsp
Modified: trunk/Examples/text-db/text-db/admin/index.jsp
===================================================================
--- trunk/Examples/text-db/text-db/admin/index.jsp 2007-01-03 16:19:18 UTC (rev 411)
+++ trunk/Examples/text-db/text-db/admin/index.jsp 2007-01-03 16:20:45 UTC (rev 412)
@@ -4,12 +4,12 @@
<%@taglib uri="/xorio-std" prefix="xs"%>
<%@taglib uri="/xorio-admin" prefix="xa"%>
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1" import="java.util.Map,java.util.Set,java.util.TreeMap, com.klaiber.xorio.structuredcontent.Structure,com.klaiber.xorio.structuredcontent.searcher.FieldFirstLetterSearcher,java.util.HashMap"%>
+ pageEncoding="ISO-8859-1" import=""%>
<xa:ifmode value="DelStructDef"></xa:ifmode>
<xa:ifmode value="DelFieldDef"></xa:ifmode>
<xa:ifmode value="DelStruct"></xa:ifmode>
<xa:ifmode value="AddStructDef">
- <xa:add-sdef name="${param['sd-name']}" attribute="xorio-new-def" sl_read="${param['sd-sec-read']}" sl_write="${param['sd-sec-write']}"/>
+ <xa:add-sdef name="${param['sd-name']}" attribute="xorio_new_def" sl_read="${param['sd-sec-read']}" sl_write="${param['sd-sec-write']}"/>
</xa:ifmode>
<xa:ifmode value="ChangeStructDef">
<xa:update-sdef defid="${param['sd-id']}" name="${param['sd-name']}" sl_read="${param['sd-sec-read']}" sl_write="${param['sd-sec-write']}"/>
@@ -113,9 +113,9 @@
</xa:ifmode>
<xa:ifmode value="AddStructDef">
- <xa:edit-sdef-form defid="<%=(Integer)pageContext.getAttribute(\"xorio-new-def\")%>"/>
- <xa:list-fdefs defid="<%=(Integer)pageContext.getAttribute(\"xorio-new-def\")%>"/>
- <xa:new-fdef-form defid="<%=(Integer)pageContext.getAttribute(\"xorio-new-def\")%>"/>
+ <xa:edit-sdef-form defid="${pageScope.xorio_new_def}"/>
+ <xa:list-fdefs defid="${pageScope.xorio_new_def}"/>
+ <xa:new-fdef-form defid="${pageScope.xorio_new_def}"/>
</xa:ifmode>
<xa:ifmode value="AddFieldDef">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <skl...@us...> - 2007-01-03 16:19:38
|
Revision: 411
http://svn.sourceforge.net/xorio/?rev=411&view=rev
Author: sklaiber
Date: 2007-01-03 08:19:18 -0800 (Wed, 03 Jan 2007)
Log Message:
-----------
Property Changed:
----------------
trunk/Sandbox/textdb_loader/
Property changes on: trunk/Sandbox/textdb_loader
___________________________________________________________________
Name: svn:ignore
-
bin
.classpath
.project
+
bin
.classpath
.project
config
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <skl...@us...> - 2007-01-03 16:17:44
|
Revision: 410
http://svn.sourceforge.net/xorio/?rev=410&view=rev
Author: sklaiber
Date: 2007-01-03 08:17:41 -0800 (Wed, 03 Jan 2007)
Log Message:
-----------
Inital Version
Added Paths:
-----------
trunk/src/test/com/klaiber/xorio/util/monitor/TestPerformanceMonitorItem.java
Added: trunk/src/test/com/klaiber/xorio/util/monitor/TestPerformanceMonitorItem.java
===================================================================
--- trunk/src/test/com/klaiber/xorio/util/monitor/TestPerformanceMonitorItem.java (rev 0)
+++ trunk/src/test/com/klaiber/xorio/util/monitor/TestPerformanceMonitorItem.java 2007-01-03 16:17:41 UTC (rev 410)
@@ -0,0 +1,109 @@
+/**
+ *
+ */
+package com.klaiber.xorio.util.monitor;
+
+import junit.framework.TestCase;
+
+/**
+ * @author klaiber
+ *
+ */
+public class TestPerformanceMonitorItem extends TestCase {
+
+
+ PerformaceMonitorItem pmi;
+
+ /* (non-Javadoc)
+ * @see junit.framework.TestCase#setUp()
+ */
+ protected void setUp() throws Exception {
+ super.setUp();
+ pmi = new PerformanceMonitorItemImpl("TestItem", 123);
+ }
+
+ /* (non-Javadoc)
+ * @see junit.framework.TestCase#tearDown()
+ */
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+
+ /**
+ * Test method test correct Instantination}.
+ */
+ public void testCorrectlyConstructed() {
+ assertEquals("There is more then One Measurement recorded", 1, pmi.getMeasurementCount());
+ assertEquals("Max is not Correct", 123, pmi.getMax());
+ assertEquals("Min is not Correct", 123, pmi.getMin());
+ assertEquals("Avg is not Correct", 123, pmi.getAvg());
+ }
+
+
+ /**
+ * Test method for {@link com.klaiber.xorio.util.monitor.PerformanceMonitorItemImpl#addMeasurement(long)}.
+ */
+ public void testAddMeasurement() {
+ pmi.addMeasurement(77);
+ assertEquals("There is more then One Measurement recorded", 2, pmi.getMeasurementCount());
+ assertEquals("Max is not Correct", 123, pmi.getMax());
+ assertEquals("Min is not Correct", 77, pmi.getMin());
+ assertEquals("Avg is not Correct", 100, pmi.getAvg());
+
+ }
+
+ /**
+ * Test method for {@link com.klaiber.xorio.util.monitor.PerformanceMonitorItemImpl#getAvg()}.
+ */
+ public void testGetAvg() {
+ pmi.addMeasurement(33);
+ pmi.addMeasurement(10);
+ pmi.addMeasurement(3000);
+ pmi.addMeasurement(75);
+ assertEquals("Avg is not Correct", 648, pmi.getAvg());
+ }
+
+ /**
+ * Test method for {@link com.klaiber.xorio.util.monitor.PerformanceMonitorItemImpl#getMax()}.
+ */
+ public void testGetMax() {
+ pmi.addMeasurement(33);
+ pmi.addMeasurement(10);
+ pmi.addMeasurement(3000);
+ pmi.addMeasurement(75);
+ assertEquals("Max is not Correct", 3000, pmi.getMax());
+
+ }
+
+ /**
+ * Test method for {@link com.klaiber.xorio.util.monitor.PerformanceMonitorItemImpl#getMeasurementCount()}.
+ */
+ public void testGetMeasurementCount() {
+ pmi.addMeasurement(33);
+ pmi.addMeasurement(10);
+ pmi.addMeasurement(3000);
+ pmi.addMeasurement(75);
+ assertEquals("The number of recorded Measurements is not correct", 5, pmi.getMeasurementCount());
+
+ }
+
+ /**
+ * Test method for {@link com.klaiber.xorio.util.monitor.PerformanceMonitorItemImpl#getMin()}.
+ */
+ public void testGetMin() {
+ pmi.addMeasurement(33);
+ pmi.addMeasurement(10);
+ pmi.addMeasurement(3000);
+ pmi.addMeasurement(75);
+ assertEquals("Min is not Correct", 10, pmi.getMin());
+ }
+
+ /**
+ * Test method for {@link com.klaiber.xorio.util.monitor.PerformanceMonitorItemImpl#getName()}.
+ */
+ public void testGetName() {
+ assertEquals("Name is not Matching","TestItem".toLowerCase(),pmi.getName().toLowerCase());
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <skl...@us...> - 2007-01-03 14:59:43
|
Revision: 409
http://svn.sourceforge.net/xorio/?rev=409&view=rev
Author: sklaiber
Date: 2007-01-03 06:59:43 -0800 (Wed, 03 Jan 2007)
Log Message:
-----------
Inital Version
Added Paths:
-----------
trunk/src/test/com/klaiber/xorio/util/monitor/TestPerformanceMonitor.java
Added: trunk/src/test/com/klaiber/xorio/util/monitor/TestPerformanceMonitor.java
===================================================================
--- trunk/src/test/com/klaiber/xorio/util/monitor/TestPerformanceMonitor.java (rev 0)
+++ trunk/src/test/com/klaiber/xorio/util/monitor/TestPerformanceMonitor.java 2007-01-03 14:59:43 UTC (rev 409)
@@ -0,0 +1,51 @@
+package com.klaiber.xorio.util.monitor;
+
+import java.util.Set;
+
+import junit.framework.TestCase;
+
+public class TestPerformanceMonitor extends TestCase {
+
+ PerformanceMonitor pm = PerformanceMonitorImpl.getInstance();
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ }
+
+ public void testAddMeasurement() {
+ pm.addMeasurement("TestItem", 324);
+ pm.addMeasurement("Testitem", 24);
+ pm.addMeasurement("testitem", 123456789);
+ PerformaceMonitorItem pmi = pm.getItem("TestItem");
+ assertEquals("Wrong Number of Measurements", 3, pmi.getMeasurementCount());
+ }
+
+ public void testGetItemIfNonCaseSensitive() {
+ pm.addMeasurement("TestItem",34);
+ PerformaceMonitorItem pmi1 = pm.getItem("TestItem");
+ PerformaceMonitorItem pmi2 = pm.getItem("teStitEm");
+ assertNotNull("pmi1 is NULL", pmi1);
+ assertNotNull("pmi2 is NULL", pmi2);
+ assertSame("GetItemNotCaseSensitive", pmi1, pmi2);
+ }
+
+ public void testGetItemNames() {
+ pm.addMeasurement("TestItem", 324);
+ pm.addMeasurement("Testitem", 24);
+ pm.addMeasurement("TestItem2", 33);
+ Set pmiset = pm.getItemNames();
+ assertTrue("testitem not in Set", pmiset.contains("testitem"));
+ assertTrue("testitem2 not in Set", pmiset.contains("testitem2"));
+ assertEquals("Set has not the right size", 2, pmiset.size());
+
+ }
+
+ public void testGetItems() {
+ pm.addMeasurement("TestItem", 324);
+ pm.addMeasurement("Testitem", 24);
+ pm.addMeasurement("TestItem2", 33);
+ Set pmiset = pm.getItems();
+ assertEquals("Set has not the right size", 2, pmiset.size());
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <skl...@us...> - 2007-01-03 14:59:14
|
Revision: 408
http://svn.sourceforge.net/xorio/?rev=408&view=rev
Author: sklaiber
Date: 2007-01-03 06:59:11 -0800 (Wed, 03 Jan 2007)
Log Message:
-----------
Inital Version
Added Paths:
-----------
trunk/src/test/com/klaiber/xorio/util/monitor/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <skl...@us...> - 2007-01-03 14:27:28
|
Revision: 407
http://svn.sourceforge.net/xorio/?rev=407&view=rev
Author: sklaiber
Date: 2007-01-03 06:27:23 -0800 (Wed, 03 Jan 2007)
Log Message:
-----------
Inital Version
* Implementation of a Defined Performance Measurement Point
Added Paths:
-----------
trunk/src/java/com/klaiber/xorio/util/monitor/PerformanceMonitorItemImpl.java
Added: trunk/src/java/com/klaiber/xorio/util/monitor/PerformanceMonitorItemImpl.java
===================================================================
--- trunk/src/java/com/klaiber/xorio/util/monitor/PerformanceMonitorItemImpl.java (rev 0)
+++ trunk/src/java/com/klaiber/xorio/util/monitor/PerformanceMonitorItemImpl.java 2007-01-03 14:27:23 UTC (rev 407)
@@ -0,0 +1,73 @@
+/**
+ *
+ */
+package com.klaiber.xorio.util.monitor;
+
+/**
+ * @author klaiber
+ *
+ */
+public class PerformanceMonitorItemImpl implements PerformaceMonitorItem {
+
+ private String _name;
+ private long _max=-1;
+ private long _min=-1;
+ private long _sum=0;
+ private int _count=0;
+
+ protected PerformanceMonitorItemImpl(String name, long duration) {
+ this._name = name.toLowerCase();
+ this.addMeasurement(duration);
+ }
+
+
+ /* (non-Javadoc)
+ * @see com.klaiber.xorio.util.monitor.PerformaceMonitorItem#addMeasurement(int)
+ */
+ public void addMeasurement(long duration) {
+ this._sum = this._sum + duration;
+ this._count++;
+ if (duration > this._max) {
+ this._max = duration;
+ }
+ if (duration < this._min || this._min < 0) {
+ this._min = duration;
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see com.klaiber.xorio.util.monitor.PerformaceMonitorItem#getAvg()
+ */
+ public long getAvg() {
+ return this._sum/this._count;
+ }
+
+ /* (non-Javadoc)
+ * @see com.klaiber.xorio.util.monitor.PerformaceMonitorItem#getMax()
+ */
+ public long getMax() {
+ return this._max;
+ }
+
+ /* (non-Javadoc)
+ * @see com.klaiber.xorio.util.monitor.PerformaceMonitorItem#getMeasurementCount()
+ */
+ public int getMeasurementCount() {
+ return this._count;
+ }
+
+ /* (non-Javadoc)
+ * @see com.klaiber.xorio.util.monitor.PerformaceMonitorItem#getMin()
+ */
+ public long getMin() {
+ return this._min;
+ }
+
+ /* (non-Javadoc)
+ * @see com.klaiber.xorio.util.monitor.PerformaceMonitorItem#getName()
+ */
+ public String getName() {
+ return this._name;
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <skl...@us...> - 2007-01-03 14:24:36
|
Revision: 406
http://svn.sourceforge.net/xorio/?rev=406&view=rev
Author: sklaiber
Date: 2007-01-03 06:24:35 -0800 (Wed, 03 Jan 2007)
Log Message:
-----------
Inital Version
* Implementation of the Performance Monitor Management Component
Added Paths:
-----------
trunk/src/java/com/klaiber/xorio/util/monitor/PerformanceMonitorImpl.java
Added: trunk/src/java/com/klaiber/xorio/util/monitor/PerformanceMonitorImpl.java
===================================================================
--- trunk/src/java/com/klaiber/xorio/util/monitor/PerformanceMonitorImpl.java (rev 0)
+++ trunk/src/java/com/klaiber/xorio/util/monitor/PerformanceMonitorImpl.java 2007-01-03 14:24:35 UTC (rev 406)
@@ -0,0 +1,51 @@
+package com.klaiber.xorio.util.monitor;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+
+public class PerformanceMonitorImpl implements PerformanceMonitor {
+
+ private static PerformanceMonitor _instance;
+
+ public static PerformanceMonitor getInstance(){
+ if (_instance == null){
+ _instance = new PerformanceMonitorImpl();
+ }
+ return _instance;
+ }
+
+ private Map _pmis;
+
+ private PerformanceMonitorImpl(){
+ _pmis = new TreeMap();
+ }
+
+ public void addMeasurement(String itemName, long duration) {
+ PerformaceMonitorItem pmi = this.getItem(itemName);
+ if (pmi != null) {
+ pmi.addMeasurement(duration);
+ } else {
+ pmi = new PerformanceMonitorItemImpl(itemName, duration);
+ _pmis.put(pmi.getName(), pmi);
+ }
+ }
+
+ public PerformaceMonitorItem getItem(String itemName) {
+ PerformaceMonitorItem pmi = null;
+ if (_pmis.containsKey(itemName.toLowerCase())) {
+ pmi = (PerformaceMonitorItem)_pmis.get(itemName.toLowerCase());
+ }
+ return pmi;
+ }
+
+ public Set getItemNames() {
+ return _pmis.keySet();
+ }
+
+ public Set getItems() {
+ return new HashSet(_pmis.values());
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <skl...@us...> - 2007-01-03 14:23:40
|
Revision: 405
http://svn.sourceforge.net/xorio/?rev=405&view=rev
Author: sklaiber
Date: 2007-01-03 06:23:40 -0800 (Wed, 03 Jan 2007)
Log Message:
-----------
Inital Version
* Interface for the Performance Monitor Management Component
Added Paths:
-----------
trunk/src/java/com/klaiber/xorio/util/monitor/PerformanceMonitor.java
Added: trunk/src/java/com/klaiber/xorio/util/monitor/PerformanceMonitor.java
===================================================================
--- trunk/src/java/com/klaiber/xorio/util/monitor/PerformanceMonitor.java (rev 0)
+++ trunk/src/java/com/klaiber/xorio/util/monitor/PerformanceMonitor.java 2007-01-03 14:23:40 UTC (rev 405)
@@ -0,0 +1,14 @@
+package com.klaiber.xorio.util.monitor;
+
+import java.util.Set;
+
+public interface PerformanceMonitor {
+
+ public Set getItemNames();
+
+ public Set getItems();
+
+ public PerformaceMonitorItem getItem(String itemName);
+
+ public void addMeasurement(String itemName, long duration);
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <skl...@us...> - 2007-01-03 14:21:50
|
Revision: 404
http://svn.sourceforge.net/xorio/?rev=404&view=rev
Author: sklaiber
Date: 2007-01-03 06:21:49 -0800 (Wed, 03 Jan 2007)
Log Message:
-----------
Inital Version
* Interface for a Defined Performance Measurement Point
Added Paths:
-----------
trunk/src/java/com/klaiber/xorio/util/monitor/PerformaceMonitorItem.java
Added: trunk/src/java/com/klaiber/xorio/util/monitor/PerformaceMonitorItem.java
===================================================================
--- trunk/src/java/com/klaiber/xorio/util/monitor/PerformaceMonitorItem.java (rev 0)
+++ trunk/src/java/com/klaiber/xorio/util/monitor/PerformaceMonitorItem.java 2007-01-03 14:21:49 UTC (rev 404)
@@ -0,0 +1,17 @@
+package com.klaiber.xorio.util.monitor;
+
+public interface PerformaceMonitorItem {
+
+ public String getName();
+
+ public long getMax();
+
+ public long getMin();
+
+ public int getMeasurementCount();
+
+ public long getAvg();
+
+ public void addMeasurement(long duration);
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <skl...@us...> - 2007-01-03 14:21:16
|
Revision: 403
http://svn.sourceforge.net/xorio/?rev=403&view=rev
Author: sklaiber
Date: 2007-01-03 06:21:16 -0800 (Wed, 03 Jan 2007)
Log Message:
-----------
Inital Version
* Interface for a Defined Performance Measurement Point
Added Paths:
-----------
trunk/src/java/com/klaiber/xorio/util/monitor/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <skl...@us...> - 2007-01-03 14:14:50
|
Revision: 402
http://svn.sourceforge.net/xorio/?rev=402&view=rev
Author: sklaiber
Date: 2007-01-03 06:14:48 -0800 (Wed, 03 Jan 2007)
Log Message:
-----------
Added to xmlEscapes:
* hellip …
* ndash –
* mdash —
Modified Paths:
--------------
trunk/src/java/com/klaiber/xorio/util/helper/StringUtils.java
Modified: trunk/src/java/com/klaiber/xorio/util/helper/StringUtils.java
===================================================================
--- trunk/src/java/com/klaiber/xorio/util/helper/StringUtils.java 2007-01-03 14:11:27 UTC (rev 401)
+++ trunk/src/java/com/klaiber/xorio/util/helper/StringUtils.java 2007-01-03 14:14:48 UTC (rev 402)
@@ -65,7 +65,10 @@
{"\xF6","ouml"},
{"\xFC","uuml"},
{"\xDF","szlig"},
- {""+(char)146,"acute"}
+ {""+(char)146,"acute"},
+ {""+(char)133,"hellip"},
+ {""+(char)150,"ndash"},
+ {""+(char)151,"mdash"}
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <skl...@us...> - 2007-01-03 14:11:27
|
Revision: 401
http://svn.sourceforge.net/xorio/?rev=401&view=rev
Author: sklaiber
Date: 2007-01-03 06:11:27 -0800 (Wed, 03 Jan 2007)
Log Message:
-----------
Added Connection Statistic and logging
Modified Paths:
--------------
trunk/src/java/com/klaiber/xorio/util/db/ConPool.java
Modified: trunk/src/java/com/klaiber/xorio/util/db/ConPool.java
===================================================================
--- trunk/src/java/com/klaiber/xorio/util/db/ConPool.java 2007-01-03 14:09:13 UTC (rev 400)
+++ trunk/src/java/com/klaiber/xorio/util/db/ConPool.java 2007-01-03 14:11:27 UTC (rev 401)
@@ -10,6 +10,7 @@
import org.apache.log4j.Logger;
import com.klaiber.xorio.util.helper.StringUtils;
+
/**
* <p>Title: ConPool </p>
*
@@ -74,8 +75,16 @@
private String _pwd;
+ private int _internal_connections;
+
+ private int _external_connections;
+
+ private int _deleted_connections;
+
+ private int _created_connections;
+
+
-
/**
* getInstance returns the ConPool Instance indentified by Name. If no
* Instance with this Name exist null is returned.
@@ -172,13 +181,15 @@
try {
Connection con = DriverManager.getConnection(_con_url, _usr, _pwd);
_connections.put(new Date(), con);
+ _internal_connections++;
+ _created_connections++;
}
catch (SQLException e) {
log.error("Error while adding Connection to Connection Pool. " +
"SQLException: " + e.getMessage() + ", SQLState: " +
e.getSQLState() + ", VendorError: " + e.getErrorCode(), e);
- log.debug(StringUtils.stack2string(e));
+ log.info("Status: Created " + this.getCreatedConCount()+", Deleted" + this.getDeletedConCount()+", Internal"+ this.getInternalConCount()+", External"+ this.getExternalConCount() );
}
}
@@ -192,16 +203,20 @@
* @param con Connection
*/
public void returnConnection(Connection con) {
- if (_connections.size() >= _maxcons) {
+ _external_connections--;
+ if (_connections.size() >= _maxcons) {
try {
con.close();
+ _deleted_connections++;
}
catch (SQLException e) {
- log.debug(StringUtils.stack2string(e));
+ log.warn("Could not cleanly dispose Connection",e);
}
con = null;
+ _deleted_connections++;
}
else {
+ _internal_connections++;
_connections.put(new Date(), con);
}
}
@@ -227,8 +242,9 @@
try {
Connection c = (Connection)_connections.get(keyDate);
c.close();
+ _deleted_connections++;
} catch (SQLException e) {
- //##
+ log.warn("Could not cleanly dispose Connection");
}
_connections.remove(keyDate);
}
@@ -245,10 +261,29 @@
while (_connections.size() < _mincons) {
addConnection();
}
+ _internal_connections--;
+ _external_connections++;
return con;
}
+ public int getInternalConCount(){
+ return _internal_connections;
+ }
+
+ public int getExternalConCount(){
+ return _external_connections;
+ }
+
+ public int getDeletedConCount(){
+ return _deleted_connections;
+ }
+
+ public int getCreatedConCount(){
+ return _created_connections;
+ }
+
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <skl...@us...> - 2007-01-03 14:09:14
|
Revision: 400
http://svn.sourceforge.net/xorio/?rev=400&view=rev
Author: sklaiber
Date: 2007-01-03 06:09:13 -0800 (Wed, 03 Jan 2007)
Log Message:
-----------
Replaced hardcoded image directory with dir from Config file
Modified Paths:
--------------
trunk/src/java/com/klaiber/xorio/structuredcontent/Structure.java
Modified: trunk/src/java/com/klaiber/xorio/structuredcontent/Structure.java
===================================================================
--- trunk/src/java/com/klaiber/xorio/structuredcontent/Structure.java 2007-01-03 13:57:48 UTC (rev 399)
+++ trunk/src/java/com/klaiber/xorio/structuredcontent/Structure.java 2007-01-03 14:09:13 UTC (rev 400)
@@ -311,7 +311,7 @@
sb.append(sb2.toString());
sb.append("<TR CLASS=\"xor-std-display\">\n");
sb.append("<TD CLASS=\"xor-std-display xor-std-td-submit\" COLSPAN=\"2\">\n");
- sb.append("<BUTTON CLASS=\"xor-std-edit\" type=\"Submit\" name=\"mode\" value=\"AddStruct\"><IMG SRC=\"/images/icon_add.png\" alt=\"Create\"/></Button>");
+ sb.append("<BUTTON CLASS=\"xor-std-edit\" type=\"Submit\" name=\"mode\" value=\"AddStruct\"><IMG SRC=\""+ Util.getMainConfig().getConfigItem("xorio.webpath.commonimages") +"icon_add.png\" alt=\"Create\"/></Button>");
sb.append("<INPUT TYPE=\"hidden\" NAME=\"sd-name\" VALUE=\"" + sd_name + "\" ");
sb.append("<INPUT TYPE=\"hidden\" NAME=\"sd-id\" VALUE=\"" + defid + "\" ");
sb.append("</TD>\n");
@@ -581,7 +581,7 @@
sb.append("");
sb.append("<TR CLASS=\"xor-std-display\">\n");
sb.append("<TD CLASS=\"xor-std-display xor-std-td-submit\" COLSPAN=\"2\">\n");
- sb.append("<BUTTON CLASS=\"xor-std-edit\" type=\"Submit\" name=\"mode\" value=\"UpdateStruct\"><IMG SRC=\"/images/icon_edit.png\" alt=\"Update\"/></Button>");
+ sb.append("<BUTTON CLASS=\"xor-std-edit\" type=\"Submit\" name=\"mode\" value=\"UpdateStruct\"><IMG SRC=\""+ Util.getMainConfig().getConfigItem("xorio.webpath.commonimages") +"icon_edit.png\" alt=\"Update\"/></Button>");
sb.append("<INPUT TYPE=\"hidden\" NAME=\"s-id\" VALUE=\"" + this.getID() + "\" ");
sb.append("<INPUT TYPE=\"hidden\" NAME=\"sd-id\" VALUE=\"" + this.getDefID() + "\" ");
sb.append("</TD>\n");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <skl...@us...> - 2007-01-03 13:57:48
|
Revision: 399
http://svn.sourceforge.net/xorio/?rev=399&view=rev
Author: sklaiber
Date: 2007-01-03 05:57:48 -0800 (Wed, 03 Jan 2007)
Log Message:
-----------
Replaced hardcoded image directory with dir from Config file
Modified Paths:
--------------
trunk/src/java/com/klaiber/xorio/taglibs/admin/NewStructDefForm.java
Modified: trunk/src/java/com/klaiber/xorio/taglibs/admin/NewStructDefForm.java
===================================================================
--- trunk/src/java/com/klaiber/xorio/taglibs/admin/NewStructDefForm.java 2007-01-03 13:56:54 UTC (rev 398)
+++ trunk/src/java/com/klaiber/xorio/taglibs/admin/NewStructDefForm.java 2007-01-03 13:57:48 UTC (rev 399)
@@ -4,6 +4,9 @@
import javax.servlet.jsp.JspException;
import java.io.IOException;
import org.apache.log4j.Logger;
+
+import com.klaiber.xorio.util.Util;
+
import javax.servlet.http.HttpServletRequest;
@@ -76,7 +79,7 @@
this.pageContext.getOut().write("<TR CLASS=\"xor-adm-edit\">\n");
this.pageContext.getOut().write("<TD COLSPAN=\"2\" CLASS=\"xor-adm-edit xor-adm-td-submit\">\n");
- this.pageContext.getOut().write("<BUTTON CLASS=\"xor-adm-edit\" type=\"Submit\" name=\"mode\" value=\"AddStructDef\"><IMG SRC=\"/images/icon_add.png\" alt=\"Create Definition\"/></Button>\n");
+ this.pageContext.getOut().write("<BUTTON CLASS=\"xor-adm-edit\" type=\"Submit\" name=\"mode\" value=\"AddStructDef\"><IMG SRC=\""+ Util.getMainConfig().getConfigItem("xorio.webpath.commonimages") +"icon_add.png\" alt=\"Create Definition\"/></Button>\n");
this.pageContext.getOut().write("</TD>\n");
this.pageContext.getOut().write("</TR>\n");
this.pageContext.getOut().write("</TABLE>\n");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <skl...@us...> - 2007-01-03 13:56:54
|
Revision: 398
http://svn.sourceforge.net/xorio/?rev=398&view=rev
Author: sklaiber
Date: 2007-01-03 05:56:54 -0800 (Wed, 03 Jan 2007)
Log Message:
-----------
Replaced hardcoded image directory with dir from Config file
Modified Paths:
--------------
trunk/src/java/com/klaiber/xorio/taglibs/admin/NewFieldDefForm.java
Modified: trunk/src/java/com/klaiber/xorio/taglibs/admin/NewFieldDefForm.java
===================================================================
--- trunk/src/java/com/klaiber/xorio/taglibs/admin/NewFieldDefForm.java 2007-01-03 13:56:00 UTC (rev 397)
+++ trunk/src/java/com/klaiber/xorio/taglibs/admin/NewFieldDefForm.java 2007-01-03 13:56:54 UTC (rev 398)
@@ -137,7 +137,7 @@
// Submit Button
this.pageContext.getOut().write("<TR CLASS=\"CLASS=\"xor-adm-edit\">\n");
this.pageContext.getOut().write("<TD COLSPAN=\"2\" CLASS=\"xor-adm-edit xor-adm-td-submit\">\n");
- this.pageContext.getOut().write("<BUTTON CLASS=\"xor-adm-edit\" type=\"Submit\" name=\"mode\" value=\"AddFieldDef\"><IMG SRC=\"/images/icon_add.png\" alt=\"Create Definition\"/></Button>\n");
+ this.pageContext.getOut().write("<BUTTON CLASS=\"xor-adm-edit\" type=\"Submit\" name=\"mode\" value=\"AddFieldDef\"><IMG SRC=\""+ Util.getMainConfig().getConfigItem("xorio.webpath.commonimages") +"icon_add.png\" alt=\"Create Definition\"/></Button>\n");
this.pageContext.getOut().write("<INPUT TYPE=\"hidden\" NAME=\"fd-sd_id\" VALUE=\"" + this.getDefid() + "\">\n ");
this.pageContext.getOut().write("</TD>\n");
this.pageContext.getOut().write("</TR>\n");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <skl...@us...> - 2007-01-03 13:56:04
|
Revision: 397
http://svn.sourceforge.net/xorio/?rev=397&view=rev
Author: sklaiber
Date: 2007-01-03 05:56:00 -0800 (Wed, 03 Jan 2007)
Log Message:
-----------
Replaced hardcoded image directory with dir from Config file
Modified Paths:
--------------
trunk/src/java/com/klaiber/xorio/taglibs/admin/ListStructureDefs.java
Modified: trunk/src/java/com/klaiber/xorio/taglibs/admin/ListStructureDefs.java
===================================================================
--- trunk/src/java/com/klaiber/xorio/taglibs/admin/ListStructureDefs.java 2007-01-03 13:54:58 UTC (rev 396)
+++ trunk/src/java/com/klaiber/xorio/taglibs/admin/ListStructureDefs.java 2007-01-03 13:56:00 UTC (rev 397)
@@ -63,14 +63,14 @@
//List Button
this.pageContext.getOut().write("<TD CLASS=\"xor-adm-edit xor-adm-col-button\">\n");
this.pageContext.getOut().write("<FORM method=\"Post\" action=\"" + pageUrl + "\" Name=\"SD-List-"+ rs.getInt("PK_StructureDEF") +"\">\n");
- this.pageContext.getOut().write("<BUTTON CLASS=\"xor-adm-edit\" type=\"Submit\" name=\"mode\" value=\"ListStructs\"><IMG SRC=\"/images/icon_list.png\" alt=\"List Structures\"/></Button>\n");
+ this.pageContext.getOut().write("<BUTTON CLASS=\"xor-adm-edit\" type=\"Submit\" name=\"mode\" value=\"ListStructs\"><IMG SRC=\""+ Util.getMainConfig().getConfigItem("xorio.webpath.commonimages") +"icon_list.png\" alt=\"List Structures\"/></Button>\n");
this.pageContext.getOut().write("<INPUT TYPE=\"hidden\" NAME=\"sd_id\" VALUE=\"" + rs.getInt("PK_StructureDEF") + "\" >\n");
this.pageContext.getOut().write("</FORM>\n");
this.pageContext.getOut().write("</TD>\n");
//Edit Button
this.pageContext.getOut().write("<TD CLASS=\"xor-adm-edit xor-adm-col-button\">");
this.pageContext.getOut().write("<FORM method=\"Post\" action=\"" + pageUrl + "\" Name=\"SD-Edit-"+ rs.getInt("PK_StructureDEF") +"\">");
- this.pageContext.getOut().write("<BUTTON CLASS=\"xor-adm-edit\" type=\"Submit\" name=\"mode\" value=\"EditStructDef\"><IMG SRC=\"/images/icon_edit.png\" alt=\"Edit Definition\"/></Button>");
+ this.pageContext.getOut().write("<BUTTON CLASS=\"xor-adm-edit\" type=\"Submit\" name=\"mode\" value=\"EditStructDef\"><IMG SRC=\""+ Util.getMainConfig().getConfigItem("xorio.webpath.commonimages") +"icon_edit.png\" alt=\"Edit Definition\"/></Button>");
this.pageContext.getOut().write("<INPUT TYPE=\"hidden\" NAME=\"sd_id\" VALUE=\"" + rs.getInt("PK_StructureDEF") + "\" ");
this.pageContext.getOut().write("</FORM>\n");
this.pageContext.getOut().write("</TD>\n");
@@ -78,7 +78,7 @@
//Delete Button
this.pageContext.getOut().write("<TD CLASS=\"xor-adm-edit xor-adm-col-button\">");
this.pageContext.getOut().write("<FORM method=\"Post\" action=\"" + pageUrl + "\" Name=\"SD-Delete-"+ rs.getInt("PK_StructureDEF") +"\">");
- this.pageContext.getOut().write("<BUTTON CLASS=\"xor-adm-edit\" type=\"Submit\" name=\"mode\" value=\"DelStructDef\"><IMG SRC=\"/images/icon_delete.png\" alt=\"Delete Definition\"/></Button>");
+ this.pageContext.getOut().write("<BUTTON CLASS=\"xor-adm-edit\" type=\"Submit\" name=\"mode\" value=\"DelStructDef\"><IMG SRC=\""+ Util.getMainConfig().getConfigItem("xorio.webpath.commonimages") +"icon_delete.png\" alt=\"Delete Definition\"/></Button>");
this.pageContext.getOut().write("<INPUT TYPE=\"hidden\" NAME=\"sd_id\" VALUE=\"" + rs.getInt("PK_StructureDEF") + "\" ");
this.pageContext.getOut().write("</FORM>\n");
this.pageContext.getOut().write("</TD>\n");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <skl...@us...> - 2007-01-03 13:55:12
|
Revision: 396
http://svn.sourceforge.net/xorio/?rev=396&view=rev
Author: sklaiber
Date: 2007-01-03 05:54:58 -0800 (Wed, 03 Jan 2007)
Log Message:
-----------
Replaced hardcoded image directory with dir from Config file
Modified Paths:
--------------
trunk/src/java/com/klaiber/xorio/taglibs/admin/ListFieldDefs.java
Modified: trunk/src/java/com/klaiber/xorio/taglibs/admin/ListFieldDefs.java
===================================================================
--- trunk/src/java/com/klaiber/xorio/taglibs/admin/ListFieldDefs.java 2007-01-03 13:50:48 UTC (rev 395)
+++ trunk/src/java/com/klaiber/xorio/taglibs/admin/ListFieldDefs.java 2007-01-03 13:54:58 UTC (rev 396)
@@ -85,14 +85,14 @@
//Edit Button
this.pageContext.getOut().write("<TD CLASS=\"xor-adm-edit xor-adm-col-button\">\n");
this.pageContext.getOut().write("<FORM method=\"Post\" action=\"" + pageUrl + "\" Name=\"FD-Edit-" + rs.getInt("PK_FieldDef") + "\">\n");
- this.pageContext.getOut().write("<BUTTON CLASS=\"xor-adm-edit\" type=\"Submit\" name=\"mode\" value=\"EditFieldDef\"><IMG SRC=\"/images/icon_edit.png\" alt=\"Edit Definition\"/></Button>\n");
+ this.pageContext.getOut().write("<BUTTON CLASS=\"xor-adm-edit\" type=\"Submit\" name=\"mode\" value=\"EditFieldDef\"><IMG SRC=\""+ Util.getMainConfig().getConfigItem("xorio.webpath.commonimages") +"icon_edit.png\" alt=\"Edit Definition\"/></Button>\n");
this.pageContext.getOut().write("<INPUT TYPE=\"hidden\" NAME=\"fd_id\" VALUE=\"" + rs.getInt("PK_FieldDef") + "\">\n ");
this.pageContext.getOut().write("</FORM>\n");
this.pageContext.getOut().write("</TD>\n");
//Delete Button
this.pageContext.getOut().write("<TD CLASS=\"xor-adm-edit xor-adm-col-button\">\n");
this.pageContext.getOut().write("<FORM method=\"Post\" action=\"" + pageUrl + "\" Name=\"FD-Delete-" + rs.getInt("PK_FieldDef") + "\">\n");
- this.pageContext.getOut().write("<BUTTON CLASS=\"xor-adm-edit\" type=\"Submit\" name=\"mode\" value=\"DelFieldDef\"><IMG SRC=\"/images/icon_delete.png\" alt=\"Delete Definition\"/></Button>\n");
+ this.pageContext.getOut().write("<BUTTON CLASS=\"xor-adm-edit\" type=\"Submit\" name=\"mode\" value=\"DelFieldDef\"><IMG SRC=\""+ Util.getMainConfig().getConfigItem("xorio.webpath.commonimages") +"icon_delete.png\" alt=\"Delete Definition\"/></Button>\n");
this.pageContext.getOut().write("<INPUT TYPE=\"hidden\" NAME=\"fd_id\" VALUE=\"" + rs.getInt("PK_FieldDef") + "\" >\n");
this.pageContext.getOut().write("<INPUT TYPE=\"hidden\" NAME=\"fd_id\" VALUE=\"" + rs.getInt("PK_FieldDef") + "\" >\n");
this.pageContext.getOut().write("</FORM>\n");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <skl...@us...> - 2007-01-03 13:50:48
|
Revision: 395
http://svn.sourceforge.net/xorio/?rev=395&view=rev
Author: sklaiber
Date: 2007-01-03 05:50:48 -0800 (Wed, 03 Jan 2007)
Log Message:
-----------
Replaced hardcoded image directory with dir from Config file
Modified Paths:
--------------
trunk/src/java/com/klaiber/xorio/taglibs/admin/EditStructDefForm.java
Modified: trunk/src/java/com/klaiber/xorio/taglibs/admin/EditStructDefForm.java
===================================================================
--- trunk/src/java/com/klaiber/xorio/taglibs/admin/EditStructDefForm.java 2007-01-03 13:44:08 UTC (rev 394)
+++ trunk/src/java/com/klaiber/xorio/taglibs/admin/EditStructDefForm.java 2007-01-03 13:50:48 UTC (rev 395)
@@ -119,7 +119,7 @@
this.pageContext.getOut().write("<TR CLASS=\"xor-adm-edit\">\n");
this.pageContext.getOut().write("<TD COLSPAN=\"2\" CLASS=\"xor-adm-edit xor-adm-td-submit\">\n");
- this.pageContext.getOut().write("<BUTTON CLASS=\"xor-adm-edit\" type=\"Submit\" name=\"mode\" value=\"ChangeStructDef\"><IMG SRC=\"/images/icon_edit.png\" alt=\"Update Definition\"/></Button>\n");
+ this.pageContext.getOut().write("<BUTTON CLASS=\"xor-adm-edit\" type=\"Submit\" name=\"mode\" value=\"ChangeStructDef\"><IMG SRC=\""+ Util.getMainConfig().getConfigItem("xorio.webpath.commonimages") +"icon_edit.png\" alt=\"Update Definition\"/></Button>\n");
this.pageContext.getOut().write("<INPUT TYPE=\"hidden\" NAME=\"sd-id\" VALUE=\"" + this.getDefid() +"\" >\n");
this.pageContext.getOut().write("</TD>\n");
this.pageContext.getOut().write("</TR>\n");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <skl...@us...> - 2007-01-03 13:44:08
|
Revision: 394
http://svn.sourceforge.net/xorio/?rev=394&view=rev
Author: sklaiber
Date: 2007-01-03 05:44:08 -0800 (Wed, 03 Jan 2007)
Log Message:
-----------
Replaced hardcoded image directory with dir from Config file
Modified Paths:
--------------
trunk/src/java/com/klaiber/xorio/taglibs/admin/EditFieldDefForm.java
Modified: trunk/src/java/com/klaiber/xorio/taglibs/admin/EditFieldDefForm.java
===================================================================
--- trunk/src/java/com/klaiber/xorio/taglibs/admin/EditFieldDefForm.java 2007-01-03 13:41:40 UTC (rev 393)
+++ trunk/src/java/com/klaiber/xorio/taglibs/admin/EditFieldDefForm.java 2007-01-03 13:44:08 UTC (rev 394)
@@ -157,7 +157,7 @@
//Submit Button
this.pageContext.getOut().write("<TR CLASS=\"xor-adm-edit\">\n");
this.pageContext.getOut().write("<TD COLSPAN=\"2\" CLASS=\"xor-adm-edit xor-adm-td-submit\">\n");
- this.pageContext.getOut().write("<BUTTON CLASS=\"xor-adm-edit\" type=\"Submit\" name=\"mode\" value=\"UpdateFieldDef\"><IMG SRC=\"/images/icon_edit.png\" alt=\"Update Definition\"/></Button>\n");
+ this.pageContext.getOut().write("<BUTTON CLASS=\"xor-adm-edit\" type=\"Submit\" name=\"mode\" value=\"UpdateFieldDef\"><IMG SRC=\""+ Util.getMainConfig().getConfigItem("xorio.webpath.commonimages") +"icon_edit.png\" alt=\"Update Definition\"/></Button>\n");
this.pageContext.getOut().write(
"<INPUT TYPE=\"hidden\" NAME=\"fd-id\" VALUE=\"" + this.getDefid() +"\"/>\n");
this.pageContext.getOut().write(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
