Author: cziegeler
Date: Fri Feb 11 05:52:19 2005
New Revision: 153399
URL: http://svn.apache.org/viewcvs?view=rev&rev=153399
Log:
Move XSP logicsheets from the databases block to the xsp block.
Added:
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/AbstractEsqlConnection.java
- copied unchanged from r153377,
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/AbstractEsqlConnection.java
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/AbstractEsqlQuery.java
- copied, changed from r153377,
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/AbstractEsqlQuery.java
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/Cocoon2EsqlConnection.java
- copied, changed from r153377,
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/Cocoon2EsqlConnection.java
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/EsqlHelper.java
- copied, changed from r153377,
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/EsqlHelper.java
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/JdbcEsqlQuery.java
- copied, changed from r153377,
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/JdbcEsqlQuery.java
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/MysqlEsqlQuery.java
- copied, changed from r153377,
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/MysqlEsqlQuery.java
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/OracleEsqlQuery.java
- copied, changed from r153377,
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/OracleEsqlQuery.java
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/PervasiveEsqlQuery.java
- copied, changed from r153377,
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/PervasiveEsqlQuery.java
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/PostgresEsqlQuery.java
- copied, changed from r153377,
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/PostgresEsqlQuery.java
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/PostgresOldEsqlQuery.java
- copied, changed from r153377,
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/PostgresOldEsqlQuery.java
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/SybaseEsqlQuery.java
- copied, changed from r153377,
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/SybaseEsqlQuery.java
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl
- copied unchanged from r153377,
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl
Removed:
cocoon/trunk/src/blocks/databases/conf/esql.xconf
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/AbstractEsqlConnection.java
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/AbstractEsqlQuery.java
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/Cocoon2EsqlConnection.java
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/EsqlHelper.java
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/JdbcEsqlQuery.java
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/MysqlEsqlQuery.java
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/OracleEsqlQuery.java
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/PervasiveEsqlQuery.java
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/PostgresEsqlQuery.java
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/PostgresOldEsqlQuery.java
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/SybaseEsqlQuery.java
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/java/
Modified:
cocoon/trunk/blocks.properties
cocoon/trunk/gump.xml
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.java
cocoon/trunk/src/blocks/xsp/conf/xsp-markup.xconf
cocoon/trunk/status.xml
Modified: cocoon/trunk/blocks.properties
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/blocks.properties?view=diff&r1=153398&r2=153399
==============================================================================
--- cocoon/trunk/blocks.properties (original)
+++ cocoon/trunk/blocks.properties Fri Feb 11 05:52:19 2005
@@ -50,10 +50,8 @@
#-----[dependency]: "batik" is needed by "fop", "scratchpad", "tour".
#include.block.batik=false
#include.block.bsf=false
-#-----[dependency]: "chaperon" depends on "xsp" (for samples).
#include.block.chaperon=false
-#-----[dependency]: "databases" depends on "xsp".
-#-----[dependency]: "databases" is needed by "hsqldb", "jms", "ojb",
"petstore", "repository", "xmldb".
+#-----[dependency]: "databases" is needed by "hsqldb", "jms", "ojb",
"petstore", "repository", "xmldb", "xsp".
#include.block.databases=false
#-----[dependency]: "fop" depends on "batik".
#-----[dependency]: "fop" is needed by "tour".
@@ -61,34 +59,32 @@
#-----[dependency]: "hsqldb" depends on "databases".
#-----[dependency]: "hsqldb" is needed by "jms", "ojb", "petstore".
#include.block.hsqldb=false
-#-----[dependency]: "html" is needed by "portal".
#include.block.html=false
#include.block.itext=false
#include.block.jfor=false
#include.block.jsp=false
#include.block.linkrewriter=false
-#-----[dependency]: "lucene" depends on "xsp" (for samples).
+#-----[dependency]: "lucene" depends on "forms" (for samples), "xsp" (for
samples).
#-----[dependency]: "lucene" is needed by "querybean".
#include.block.lucene=false
#include.block.naming=false
#include.block.paranoid=false
#include.block.poi=false
-#-----[dependency]: "portal" depends on "authentication-fw", "html",
"session-fw".
+#-----[dependency]: "portal" depends on "authentication-fw", "cron", "forms",
"session-fw".
#-----[dependency]: "portal" is needed by "faces".
#include.block.portal=false
-#-----[dependency]: "profiler" is needed by "forms".
#include.block.profiler=false
#-----[dependency]: "python" depends on "xsp".
#include.block.python=false
-#-----[dependency]: "session-fw" depends on "xsp".
-#-----[dependency]: "session-fw" is needed by "authentication-fw", "portal".
+#-----[dependency]: "session-fw" is needed by "authentication-fw", "portal",
"xsp".
#include.block.session-fw=false
#-----[dependency]: "velocity" is needed by "petstore", "scratchpad".
#include.block.velocity=false
#include.block.web3=false
#-----[dependency]: "xmldb" depends on "databases".
#include.block.xmldb=false
-#-----[dependency]: "xsp" is needed by "chaperon", "databases", "eventcache",
"lucene", "python", "scratchpad", "session-fw".
+#-----[dependency]: "xsp" depends on "databases", "session-fw".
+#-----[dependency]: "xsp" is needed by "eventcache", "lucene", "python",
"scratchpad".
#include.block.xsp=false
# Unstable blocks
--------------------------------------------------------------
@@ -107,7 +103,7 @@
#include.block.asciiart=false
#-----[dependency]: "axis" is needed by "scratchpad".
#include.block.axis=false
-#-----[dependency]: "cron" is needed by "scratchpad".
+#-----[dependency]: "cron" is needed by "portal", "scratchpad".
#include.block.cron=false
#include.block.deli=false
#-----[dependency]: "eventcache" depends on "jms", "xsp" (for samples).
@@ -116,10 +112,8 @@
#-----[dependency]: "faces" depends on "portal", "taglib".
#-----[dependency]: "faces" is needed by "scratchpad".
#include.block.faces=false
-#-----[dependency]: "forms" depends on "profiler" (for samples).
-#-----[dependency]: "forms" is needed by "apples", "javaflow", "lucene",
"ojb", "petstore", "querybean", "tour".
+#-----[dependency]: "forms" is needed by "apples", "lucene", "ojb",
"petstore", "portal", "querybean", "tour".
#include.block.forms=false
-#-----[dependency]: "javaflow" depends on "forms", "ojb" (for samples).
#-----[dependency]: "javaflow" is needed by "scratchpad".
#include.block.javaflow=false
#-----[dependency]: "jms" depends on "databases" (for samples), "hsqldb" (for
samples).
@@ -130,7 +124,7 @@
#include.block.mail=false
#include.block.midi=false
#-----[dependency]: "ojb" depends on "databases" (for samples), "forms" (for
samples), "hsqldb" (for samples).
-#-----[dependency]: "ojb" is needed by "javaflow", "querybean".
+#-----[dependency]: "ojb" is needed by "querybean".
#include.block.ojb=false
#-----[dependency]: "petstore" depends on "databases", "forms", "hsqldb",
"velocity".
#include.block.petstore=false
@@ -157,10 +151,3 @@
#include.block.tour=false
#-----[dependency]: "webdav" depends on "repository".
#include.block.webdav=false
-
-# Deprecated blocks
------------------------------------------------------------
-
-# Although some of these blocks may have been stable, they are now deprecated
-# in favour of other blocks and therefore are excluded by default from the
build.
-# For including one of them you have to set the exclude property into comment
in
-# blocks.properties.
Modified: cocoon/trunk/gump.xml
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/gump.xml?view=diff&r1=153398&r2=153399
==============================================================================
--- cocoon/trunk/gump.xml (original)
+++ cocoon/trunk/gump.xml Fri Feb 11 05:52:19 2005
@@ -317,7 +317,6 @@
<depend project="cocoon" inherit="all"/>
<depend project="excalibur-datasource"/>
- <depend project="cocoon-block-xsp"/>
<library name="excalibur-datasource"/>
@@ -1182,6 +1181,7 @@
<depend project="cocoon" inherit="all"/>
<depend project="cocoon-block-session-fw"/>
+ <depend project="cocoon-block-databases"/>
<depend project="concurrent"/>
<depend project="pizza"/>
<depend project="jdtcore"/>
Modified:
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.java?view=diff&r1=153398&r2=153399
==============================================================================
---
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.java
(original)
+++
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.java
Fri Feb 11 05:52:19 2005
@@ -19,7 +19,7 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.components.language.markup.xsp.XSPCookieHelper;
+import org.apache.cocoon.environment.Cookie;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
@@ -264,7 +264,7 @@
* but not the value, we exit immediately do
* that authorization fails authomatically
*/
- cookie_value = XSPCookieHelper.getCookie(objectModel,
cookie_name, -1).getValue();
+ cookie_value = getCookie(objectModel, cookie_name,
-1).getValue();
if (cookie_value == null || cookie_value.trim().equals("")) {
// value is null
@@ -349,4 +349,58 @@
}
return null;
}
+
+ /**
+ * Method used to return a cookie object based on the name or the index
that was passed
+ *
+ * If both name and index of cookie to be extracted is passed in, name
will take
+ * precedence. Basic thing followed is that, when name is passed, index
should be -1 and
+ * when index is passed name should null
+ *
+ * @param objectModel
+ * @param cookieName Name of the cookie which is to be found and returned
back
+ * @param cookieIndex Index of the cookie which is to be found and returned
+ * @return cookie object is returned
+ */
+ public static Cookie getCookie(Map objectModel,
+ String cookieName,
+ int cookieIndex)
+ {
+ boolean retrieveByName = false;
+ boolean retrieveByIndex = false;
+ boolean matchFound = false;
+
+ int count = 0;
+
+ Request request = ObjectModelHelper.getRequest(objectModel);
+ Cookie currentCookie = null;
+
+ if (cookieName != null) {
+ retrieveByName = true;
+ } else if (cookieIndex >=0) {
+ retrieveByIndex = true;
+ }
+
+ Cookie[] cookies = request.getCookies();
+ if (cookies != null && retrieveByName) {
+ for(count = 0; count < cookies.length; count++) {
+ currentCookie = cookies[count];
+ if (currentCookie.getName().equals(cookieName)) {
+ matchFound = true;
+ break;
+ }
+ }
+ } else if(cookies != null && retrieveByIndex) {
+ if(cookies.length > cookieIndex) {
+ currentCookie = cookies[cookieIndex];
+ matchFound = true;
+ }
+ }
+
+ if (matchFound)
+ return currentCookie;
+ else
+ return null;
+ }
+
}
Modified: cocoon/trunk/src/blocks/xsp/conf/xsp-markup.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xsp/conf/xsp-markup.xconf?view=diff&r1=153398&r2=153399
==============================================================================
--- cocoon/trunk/src/blocks/xsp/conf/xsp-markup.xconf (original)
+++ cocoon/trunk/src/blocks/xsp/conf/xsp-markup.xconf Fri Feb 11 05:52:19 2005
@@ -152,6 +152,15 @@
<parameter name="uri" value="http://apache.org/xsp/session-fw/1.0"/>
<parameter name="href"
value="resource://org/apache/cocoon/components/language/markup/xsp/java/session-fw.xsl"/>
</builtin-logicsheet>
+
+ <!-- The ESQL logicsheet is an XSP logicsheet that performs sql
queries and
+ serializes their results as XML. This allows you to work with
data from a
+ wide variety of different sources when using Apache Cocoon. -->
+ <builtin-logicsheet>
+ <parameter name="prefix" value="esql"/>
+ <parameter name="uri" value="http://apache.org/cocoon/SQL/v2"/>
+ <parameter name="href"
value="resource://org/apache/cocoon/components/language/markup/xsp/java/esql.xsl"/>
+ </builtin-logicsheet>
</target-language>
<!--+
Copied:
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/AbstractEsqlQuery.java
(from r153377,
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/AbstractEsqlQuery.java)
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/AbstractEsqlQuery.java?view=diff&rev=153399&p1=cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/AbstractEsqlQuery.java&r1=153377&p2=cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/AbstractEsqlQuery.java&r2=153399
==============================================================================
---
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/AbstractEsqlQuery.java
(original)
+++
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/AbstractEsqlQuery.java
Fri Feb 11 05:52:19 2005
@@ -29,7 +29,7 @@
* This is base class for all EsqlQueries
*
* @author <a href="mailto:[EMAIL PROTECTED]">Torsten Curdt</a>
- * @version CVS $Id: AbstractEsqlQuery.java,v 1.8 2004/03/05 13:01:53
bdelacretaz Exp $
+ * @version CVS $Id$
*/
public abstract class AbstractEsqlQuery extends AbstractLogEnabled {
private int maxRows = -1;
Copied:
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/Cocoon2EsqlConnection.java
(from r153377,
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/Cocoon2EsqlConnection.java)
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/Cocoon2EsqlConnection.java?view=diff&rev=153399&p1=cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/Cocoon2EsqlConnection.java&r1=153377&p2=cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/Cocoon2EsqlConnection.java&r2=153399
==============================================================================
---
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/Cocoon2EsqlConnection.java
(original)
+++
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/Cocoon2EsqlConnection.java
Fri Feb 11 05:52:19 2005
@@ -25,7 +25,7 @@
* This is the Cocoon2 specific part of an AbstractEsqlConnection.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Torsten Curdt</a>
- * @version CVS $Id: Cocoon2EsqlConnection.java,v 1.4 2004/03/05 13:01:53
bdelacretaz Exp $
+ * @version CVS $Id$
*/
final public class Cocoon2EsqlConnection extends AbstractEsqlConnection {
Copied:
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/EsqlHelper.java
(from r153377,
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/EsqlHelper.java)
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/EsqlHelper.java?view=diff&rev=153399&p1=cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/EsqlHelper.java&r1=153377&p2=cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/EsqlHelper.java&r2=153399
==============================================================================
---
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/EsqlHelper.java
(original)
+++
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/EsqlHelper.java
Fri Feb 11 05:52:19 2005
@@ -33,7 +33,7 @@
*
* based on the orginal esql.xsl
* @author <a href="mailto:[EMAIL PROTECTED]">Torsten Curdt</a>
- * @version CVS $Id: EsqlHelper.java,v 1.4 2004/03/05 13:01:53 bdelacretaz Exp
$
+ * @version CVS $Id$
*/
public class EsqlHelper {
Copied:
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/JdbcEsqlQuery.java
(from r153377,
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/JdbcEsqlQuery.java)
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/JdbcEsqlQuery.java?view=diff&rev=153399&p1=cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/JdbcEsqlQuery.java&r1=153377&p2=cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/JdbcEsqlQuery.java&r2=153399
==============================================================================
---
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/JdbcEsqlQuery.java
(original)
+++
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/JdbcEsqlQuery.java
Fri Feb 11 05:52:19 2005
@@ -30,7 +30,7 @@
* Unfortunately it seems NOT to work with mssql
*
* @author <a href="mailto:[EMAIL PROTECTED]">Torsten Curdt</a>
- * @version CVS $Id: JdbcEsqlQuery.java,v 1.6 2004/03/05 13:01:53 bdelacretaz
Exp $
+ * @version CVS $Id$
*/
final public class JdbcEsqlQuery extends AbstractEsqlQuery {
Copied:
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/MysqlEsqlQuery.java
(from r153377,
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/MysqlEsqlQuery.java)
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/MysqlEsqlQuery.java?view=diff&rev=153399&p1=cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/MysqlEsqlQuery.java&r1=153377&p2=cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/MysqlEsqlQuery.java&r2=153399
==============================================================================
---
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/MysqlEsqlQuery.java
(original)
+++
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/MysqlEsqlQuery.java
Fri Feb 11 05:52:19 2005
@@ -24,7 +24,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Torsten Curdt</a>
- * @version CVS $Id: MysqlEsqlQuery.java,v 1.5 2004/03/05 13:01:53 bdelacretaz
Exp $
+ * @version CVS $Id$
*/
final public class MysqlEsqlQuery extends AbstractEsqlQuery {
Copied:
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/OracleEsqlQuery.java
(from r153377,
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/OracleEsqlQuery.java)
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/OracleEsqlQuery.java?view=diff&rev=153399&p1=cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/OracleEsqlQuery.java&r1=153377&p2=cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/OracleEsqlQuery.java&r2=153399
==============================================================================
---
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/OracleEsqlQuery.java
(original)
+++
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/OracleEsqlQuery.java
Fri Feb 11 05:52:19 2005
@@ -22,7 +22,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Torsten Curdt</a>
- * @version CVS $Id: OracleEsqlQuery.java,v 1.5 2004/03/05 13:01:53
bdelacretaz Exp $
+ * @version CVS $Id$
*/
final public class OracleEsqlQuery extends AbstractEsqlQuery {
Copied:
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/PervasiveEsqlQuery.java
(from r153377,
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/PervasiveEsqlQuery.java)
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/PervasiveEsqlQuery.java?view=diff&rev=153399&p1=cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/PervasiveEsqlQuery.java&r1=153377&p2=cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/PervasiveEsqlQuery.java&r2=153399
==============================================================================
---
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/PervasiveEsqlQuery.java
(original)
+++
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/PervasiveEsqlQuery.java
Fri Feb 11 05:52:19 2005
@@ -25,7 +25,7 @@
/**
* Database specific EsqlQuery
* @author <a href="mailto:[EMAIL PROTECTED]">Torsten Curdt</a>
- * @version CVS $Id: PervasiveEsqlQuery.java,v 1.5 2004/03/05 13:01:53
bdelacretaz Exp $
+ * @version CVS $Id$
*/
final public class PervasiveEsqlQuery extends AbstractEsqlQuery {
Copied:
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/PostgresEsqlQuery.java
(from r153377,
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/PostgresEsqlQuery.java)
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/PostgresEsqlQuery.java?view=diff&rev=153399&p1=cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/PostgresEsqlQuery.java&r1=153377&p2=cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/PostgresEsqlQuery.java&r2=153399
==============================================================================
---
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/PostgresEsqlQuery.java
(original)
+++
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/PostgresEsqlQuery.java
Fri Feb 11 05:52:19 2005
@@ -23,7 +23,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Torsten Curdt</a>
- * @version CVS $Id: PostgresEsqlQuery.java,v 1.5 2004/03/05 13:01:53
bdelacretaz Exp $
+ * @version CVS $Id$
*/
final public class PostgresEsqlQuery extends AbstractEsqlQuery {
Copied:
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/PostgresOldEsqlQuery.java
(from r153377,
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/PostgresOldEsqlQuery.java)
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/PostgresOldEsqlQuery.java?view=diff&rev=153399&p1=cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/PostgresOldEsqlQuery.java&r1=153377&p2=cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/PostgresOldEsqlQuery.java&r2=153399
==============================================================================
---
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/PostgresOldEsqlQuery.java
(original)
+++
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/PostgresOldEsqlQuery.java
Fri Feb 11 05:52:19 2005
@@ -22,7 +22,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Torsten Curdt</a>
- * @version CVS $Id: PostgresOldEsqlQuery.java,v 1.5 2004/03/05 13:01:53
bdelacretaz Exp $
+ * @version CVS $Id$
*/
final public class PostgresOldEsqlQuery extends AbstractEsqlQuery {
Copied:
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/SybaseEsqlQuery.java
(from r153377,
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/SybaseEsqlQuery.java)
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/SybaseEsqlQuery.java?view=diff&rev=153399&p1=cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/SybaseEsqlQuery.java&r1=153377&p2=cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/SybaseEsqlQuery.java&r2=153399
==============================================================================
---
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/SybaseEsqlQuery.java
(original)
+++
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/SybaseEsqlQuery.java
Fri Feb 11 05:52:19 2005
@@ -25,7 +25,7 @@
/**
* Database specific EsqlQuery
* @author <a href="mailto:[EMAIL PROTECTED]">Torsten Curdt</a>
- * @version CVS $Id: SybaseEsqlQuery.java,v 1.5 2004/03/05 13:01:53
bdelacretaz Exp $
+ * @version CVS $Id$
*/
final public class SybaseEsqlQuery extends AbstractEsqlQuery {
Modified: cocoon/trunk/status.xml
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/status.xml?view=diff&r1=153398&r2=153399
==============================================================================
--- cocoon/trunk/status.xml (original)
+++ cocoon/trunk/status.xml Fri Feb 11 05:52:19 2005
@@ -203,6 +203,9 @@
<changes>
<release version="@version@" date="@date@">
<action dev="CZ" type="update">
+ Move XSP logicsheets from the databases block to the xsp block.
+ </action>
+ <action dev="CZ" type="update">
Move XSP logicsheets from the session-fw block to the xsp block.
</action>
<action dev="TC" type="add">
