cziegeler 2004/05/01 03:49:41
Modified: tools/src/anttasks SitemapTask.java DocumentCache.java
Added: tools/src/anttasks PoolSetterTask.java
Log:
Fixing doctype handling
Adding poolsetter task
Revision Changes Path
1.2 +2 -1 cocoon-2.1/tools/src/anttasks/SitemapTask.java
Index: SitemapTask.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/tools/src/anttasks/SitemapTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SitemapTask.java 30 Apr 2004 07:20:34 -0000 1.1
+++ SitemapTask.java 1 May 2004 10:49:41 -0000 1.2
@@ -35,6 +35,7 @@
import com.thoughtworks.qdox.model.JavaClass;
/**
+ * @since 2.1.5
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
* @version CVS $Revision$ $Date$
*/
1.2 +6 -3 cocoon-2.1/tools/src/anttasks/DocumentCache.java
Index: DocumentCache.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/tools/src/anttasks/DocumentCache.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DocumentCache.java 30 Apr 2004 07:20:34 -0000 1.1
+++ DocumentCache.java 1 May 2004 10:49:41 -0000 1.2
@@ -18,6 +18,7 @@
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
+import java.util.Properties;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -99,10 +100,12 @@
// Set the DOCTYPE output option on the transformer
// if we have any DOCTYPE declaration in the input xml document
final DocumentType doctype = document.getDoctype();
+ Properties props = new Properties();
if (null != doctype && null != doctype.getPublicId()) {
- transformer.setOutputProperty(OutputKeys.DOCTYPE_PUBLIC,
doctype.getPublicId());
- transformer.setOutputProperty(OutputKeys.DOCTYPE_SYSTEM,
doctype.getSystemId());
+ props.put(OutputKeys.DOCTYPE_PUBLIC, doctype.getPublicId());
+ props.put(OutputKeys.DOCTYPE_SYSTEM, doctype.getSystemId());
}
+ transformer.setOutputProperties(props);
try {
transformer.transform(new DOMSource(document),
1.1 cocoon-2.1/tools/src/anttasks/PoolSetterTask.java
Index: PoolSetterTask.java
===================================================================
/*
* Copyright 2003-2004 The Apache Software Foundation
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
* implied.
*
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import java.io.IOException;
import java.util.StringTokenizer;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
import org.apache.xpath.XPathAPI;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
/**
* Set the special attributes for the pooling
*
* @since 2.1.5
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
* @version CVS $Revision: 1.1 $ $Date: 2004/05/01 10:49:41 $
*/
public final class PoolSetterTask extends Task {
private String file;
private String element;
private boolean isSitemap = true;
private int poolMax = 32;
private int poolMin = 16;
private int poolGrow = 4;
public void setFile(String file) {
this.file = file;
}
public void setElement(String element) {
this.element = element;
}
public void setIsSitemap(boolean value) {
this.isSitemap = value;
}
public void setPoolMax(int value) {
this.poolMax = value;
}
public void setPoolMin(int value) {
this.poolMin = value;
}
public void setPoolGrow(int value) {
this.poolGrow = value;
}
public void execute() throws BuildException {
if (this.file == null) {
throw new BuildException("file attribute is required",
this.getLocation());
}
if (this.element == null) {
throw new BuildException("element attribute is required",
this.getLocation());
}
try {
final DocumentBuilder builder =
DocumentBuilderFactory.newInstance().newDocumentBuilder();
final Transformer transformer =
TransformerFactory.newInstance().newTransformer();
// load xml
String fileName =
this.getProject().resolveFile(this.file).getCanonicalPath();
System.out.println("Reading: " + fileName);
final Document configuration = builder.parse(fileName);
// process recursive
boolean changed = false;
StringTokenizer st = new StringTokenizer(this.element);
while ( st.hasMoreTokens() ) {
String componentName = st.nextToken();
NodeList nodes;
if (this.isSitemap) {
int pos = componentName.indexOf(":");
nodes = XPathAPI.selectNodeList(configuration,
"*/*[local-name()='components']/*/*[local-name()='"+componentName.substring(0,pos)+"'
and @name='"+componentName.substring(pos+1)+"']");
} else {
nodes = XPathAPI.selectNodeList(configuration,
"*/"+componentName);
}
if (nodes != null && nodes.getLength() > 0) {
for(int i=0; i < nodes.getLength(); i++) {
final Element e = (Element)nodes.item(i);
e.setAttributeNS(null, "pool-max", ""+this.poolMax);
e.setAttributeNS(null, "pool-min", ""+this.poolMin);
e.setAttributeNS(null, "pool-grow", ""+this.poolGrow);
changed = true;
}
} else {
System.out.println("Component not found: " +
componentName);
}
}
if ( changed ) {
// save xml
System.out.println("Writing: " + file);
transformer.transform(new DOMSource(configuration), new
StreamResult(file));
} else {
System.out.println("No Changes: " + file);
}
} catch (TransformerException e) {
throw new BuildException("TransformerException: " + e);
} catch (SAXException e) {
throw new BuildException("SAXException: " + e);
} catch (ParserConfigurationException e) {
throw new BuildException("ParserConfigurationException: " + e);
} catch (IOException ioe) {
throw new BuildException("IOException: " + ioe);
}
}
}
