bloritsch 01/09/06 13:04:13
Modified: src/org/apache/cocoon/acting Tag: cocoon_20_branch
AbstractDatabaseAction.java
src/org/apache/cocoon/components/language/markup/xsp/java
Tag: cocoon_20_branch esql.xsl
src/org/apache/cocoon/reading Tag: cocoon_20_branch
DatabaseReader.java
src/org/apache/cocoon/transformation Tag: cocoon_20_branch
SQLTransformer.java
Log:
Remove necessity of Roles file
Revision Changes Path
No revision
No revision
1.7.2.6 +21 -22
xml-cocoon2/src/org/apache/cocoon/acting/AbstractDatabaseAction.java
Index: AbstractDatabaseAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/AbstractDatabaseAction.java,v
retrieving revision 1.7.2.5
retrieving revision 1.7.2.6
diff -u -r1.7.2.5 -r1.7.2.6
--- AbstractDatabaseAction.java 2001/08/20 14:07:24 1.7.2.5
+++ AbstractDatabaseAction.java 2001/09/06 20:04:13 1.7.2.6
@@ -158,7 +158,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Donald Ball</a>
- * @version CVS $Revision: 1.7.2.5 $ $Date: 2001/08/20 14:07:24 $
+ * @version CVS $Revision: 1.7.2.6 $ $Date: 2001/09/06 20:04:13 $
*/
public abstract class AbstractDatabaseAction extends
AbstractComplementaryConfigurableAction implements Configurable, Disposable {
protected Map files = new HashMap();
@@ -167,7 +167,7 @@
static {
/** Initialize the map of type names to jdbc column types.
- Note that INTEGER, BLOB, and VARCHAR column types map to more than
+ Note that INTEGER, BLOB, and VARCHAR column types map to more than
one type name. **/
Map constants = new HashMap();
constants.put("ascii", new Integer(Types.CLOB));
@@ -201,8 +201,7 @@
* Compose the Actions so that we can select our databases.
*/
public void compose(ComponentManager manager) throws ComponentException {
- //this.dbselector = (ComponentSelector)
manager.lookup(DataSourceComponent.ROLE);
- this.dbselector = (ComponentSelector)
manager.lookup(org.apache.cocoon.Roles.DB_CONNECTION);
+ this.dbselector = (ComponentSelector)
manager.lookup(DataSourceComponent.ROLE + "Selector");
super.compose(manager);
}
@@ -317,7 +316,7 @@
/**
* Set the Statement column so that the results are mapped correctly. The
* value of the column is retrieved from the request object. If the
- * named parameter exists in the request object's parameters, that value
+ * named parameter exists in the request object's parameters, that value
* is used. Otherwise if the named parameter exists in the request object's
* attributes, that value is used. Otherwise the request object is
* retrieved using Request.get(attribute), which is documented to be the
@@ -537,8 +536,8 @@
file = (File) request.get(imageAttr);
synchronized (this.files) {
Parameters parameters = (Parameters) this.files.get(file);
- String imageMimeType =
parameters.getParameter("image-mime-type",
- (String)
settings.get("image-mime-type",""));
+ String imageMimeType = parameters.getParameter("image-mime-type",
+ (String) settings.get("image-mime-type",""));
statement.setString(position, imageMimeType);
/** Store the image mime type in the request attributes.
Why do we do this? **/
@@ -590,14 +589,14 @@
file = (File) request.get(imageAttr);
synchronized (this.files) {
Parameters parameters = (Parameters) this.files.get(file);
- statement.setInt(position,
parameters.getParameterAsInteger("image-width",
-
Integer.parseInt((String)settings.get("image-width","-1"))));
+ statement.setInt(position,
parameters.getParameterAsInteger("image-width",
+
Integer.parseInt((String)settings.get("image-width","-1"))));
/** Store the image width in the request attributes.
Why do we do this? **/
setRequestAttribute(request,
- param,
- parameters.getParameter("image-width",
- (String)
settings.get("image-width","")));
+ param,
+ parameters.getParameter("image-width",
+ (String) settings.get("image-width","")));
}
break;
} else if ("image-height".equals(typeName)) {
@@ -606,12 +605,12 @@
file = (File) request.get(imageAttr);
synchronized (this.files) {
Parameters parameters = (Parameters) this.files.get(file);
- statement.setInt(position,
parameters.getParameterAsInteger("image-height",
-
Integer.parseInt((String)settings.get("image-height","-1"))));
+ statement.setInt(position,
parameters.getParameterAsInteger("image-height",
+
Integer.parseInt((String)settings.get("image-height","-1"))));
setRequestAttribute(request,
- param,
- parameters.getParameter("image-height",
- (String)
settings.get("image-height","")));
+ param,
+ parameters.getParameter("image-height",
+ (String) settings.get("image-height","")));
}
break;
} else if ("image-size".equals(typeName)) {
@@ -620,12 +619,12 @@
file = (File) request.get(imageAttr);
synchronized (this.files) {
Parameters parameters = (Parameters) this.files.get(file);
- statement.setInt(position,
parameters.getParameterAsInteger("image-size",
-
Integer.parseInt((String)settings.get("image-height","-1"))));
+ statement.setInt(position,
parameters.getParameterAsInteger("image-size",
+
Integer.parseInt((String)settings.get("image-height","-1"))));
setRequestAttribute(request,
- param,
- parameters.getParameter("image-size",
- (String)
settings.get("image-size","")));
+ param,
+ parameters.getParameter("image-size",
+ (String) settings.get("image-size","")));
}
break;
} else if ("row-index".equals(typeName)) {
No revision
No revision
1.4.2.12 +27 -27
xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl
Index: esql.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl,v
retrieving revision 1.4.2.11
retrieving revision 1.4.2.12
diff -u -r1.4.2.11 -r1.4.2.12
--- esql.xsl 2001/08/16 10:06:21 1.4.2.11
+++ esql.xsl 2001/09/06 20:04:13 1.4.2.12
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: esql.xsl,v 1.4.2.11 2001/08/16 10:06:21 cziegeler Exp $-->
+<!-- $Id: esql.xsl,v 1.4.2.12 2001/09/06 20:04:13 bloritsch Exp $-->
<!--
============================================================================
@@ -258,7 +258,7 @@
super.compose(manager);
if (_esql_selector == null) {
try {
- _esql_selector = (ComponentSelector)
manager.lookup(org.apache.cocoon.Roles.DB_CONNECTION);
+ _esql_selector = (ComponentSelector)
manager.lookup(DataSourceComponent.ROLE + "Selector");
} catch (ComponentException cme) {
getLogger().error("Could not look up the datasource component",
cme);
}
@@ -337,32 +337,32 @@
protected void _esql_printObject ( Object obj, AttributesImpl xspAttr)
throws SAXException
{
if ( obj instanceof List) {
- ListIterator j=((List)obj).listIterator();
- <xsp:element name="sql-list">
- <xsp:logic>
- while (j.hasNext()){
- <xsp:element name="sql-list-item">
- <xsp:attribute
name="pos"><xsp:expr>j.nextIndex()</xsp:expr></xsp:attribute>
-
<xsp:logic>this._esql_printObject(j.next(),xspAttr);</xsp:logic>
- </xsp:element>
- };
- </xsp:logic>
- </xsp:element>
+ ListIterator j=((List)obj).listIterator();
+ <xsp:element name="sql-list">
+ <xsp:logic>
+ while (j.hasNext()){
+ <xsp:element name="sql-list-item">
+ <xsp:attribute
name="pos"><xsp:expr>j.nextIndex()</xsp:expr></xsp:attribute>
+
<xsp:logic>this._esql_printObject(j.next(),xspAttr);</xsp:logic>
+ </xsp:element>
+ };
+ </xsp:logic>
+ </xsp:element>
} else if ( obj instanceof Set ) {
- Iterator j=((Set)obj).iterator();
- <xsp:element name="sql-set">
- <xsp:logic>
- while (j.hasNext()){
- <xsp:element name="sql-set-item">
-
<xsp:logic>this._esql_printObject(j.next(),xspAttr);</xsp:logic>
- </xsp:element>
- };
- </xsp:logic>
- </xsp:element>
- } else {
- <xsp:content><xsp:expr>obj</xsp:expr></xsp:content>;
- }
- }
+ Iterator j=((Set)obj).iterator();
+ <xsp:element name="sql-set">
+ <xsp:logic>
+ while (j.hasNext()){
+ <xsp:element name="sql-set-item">
+ <xsp:logic>this._esql_printObject(j.next(),xspAttr);</xsp:logic>
+ </xsp:element>
+ };
+ </xsp:logic>
+ </xsp:element>
+ } else {
+ <xsp:content><xsp:expr>obj</xsp:expr></xsp:content>;
+ }
+ }
</xsl:when>
</xsl:choose>
</xsp:logic>
No revision
No revision
1.2.2.5 +1 -2 xml-cocoon2/src/org/apache/cocoon/reading/DatabaseReader.java
Index: DatabaseReader.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/reading/DatabaseReader.java,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -u -r1.2.2.4 -r1.2.2.5
--- DatabaseReader.java 2001/08/20 14:07:32 1.2.2.4
+++ DatabaseReader.java 2001/09/06 20:04:13 1.2.2.5
@@ -69,8 +69,7 @@
*/
public void compose(ComponentManager manager) throws ComponentException {
this.manager = manager;
- //this.dbselector = (ComponentSelector)
manager.lookup(DataSourceComponent.ROLE + "Selector");
- this.dbselector = (ComponentSelector)
manager.lookup(org.apache.cocoon.Roles.DB_CONNECTION);
+ this.dbselector = (ComponentSelector)
manager.lookup(DataSourceComponent.ROLE + "Selector");
}
/**
No revision
No revision
1.5.2.11 +2 -3
xml-cocoon2/src/org/apache/cocoon/transformation/SQLTransformer.java
Index: SQLTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/SQLTransformer.java,v
retrieving revision 1.5.2.10
retrieving revision 1.5.2.11
diff -u -r1.5.2.10 -r1.5.2.11
--- SQLTransformer.java 2001/08/20 17:20:26 1.5.2.10
+++ SQLTransformer.java 2001/09/06 20:04:13 1.5.2.11
@@ -51,7 +51,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* (PWR Organisation & Entwicklung)
* @author <a href="mailto:[EMAIL PROTECTED]";>Sven Beauprez</a>
- * @version CVS $Revision: 1.5.2.10 $ $Date: 2001/08/20 17:20:26 $ $Author: dims $
+ * @version CVS $Revision: 1.5.2.11 $ $Date: 2001/09/06 20:04:13 $ $Author:
bloritsch $
*/
public class SQLTransformer extends AbstractTransformer implements Composable,
Recyclable, Disposable, Configurable {
@@ -131,8 +131,7 @@
public void compose(ComponentManager manager) {
try {
this.manager = manager;
- //this.dbSelector = (ComponentSelector)
manager.lookup(DataSourceComponent.ROLE + "Selector");
- this.dbSelector = (ComponentSelector)
manager.lookup(org.apache.cocoon.Roles.DB_CONNECTION);
+ this.dbSelector = (ComponentSelector)
manager.lookup(DataSourceComponent.ROLE + "Selector");
} catch (ComponentException cme) {
getLogger().warn("Could not get the DataSource Selector", cme);
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
