cziegeler 2003/01/30 00:37:36
Modified: src/scratchpad/src/org/apache/cocoon/components/source/impl
SlideSource.java XPathSourceInspector.java
XMLDBSourceFactory.java SourceInspectorManager.java
GIFSourceInspector.java XMLDBSource.java
SlideSourceFactory.java BlobSource.java
JPEGSourceInspector.java BlobSourceFactory.java
src/scratchpad/src/org/apache/cocoon/transformation/pagination
Paginator.java
src/blocks/chaperon/java/org/apache/cocoon/generation
TextParserGenerator.java
src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components
AuthenticationManager.java
src/scratchpad/src/org/apache/cocoon/transformation
CastorTransformer.java
src/blocks/html/java/org/apache/cocoon/generation
HTMLGenerator.java
src/deprecated/java/org/apache/cocoon/components/xslt
XSLTProcessorImpl.java
src/blocks/bsf/java/org/apache/cocoon/generation
ScriptGenerator.java
src/scratchpad/src/org/apache/cocoon/generation
SourceDescriptionGenerator.java
src/scratchpad/src/org/apache/cocoon/generation/asciiart
AsciiArtSVGGenerator.java
src/blocks/chaperon/java/org/apache/cocoon/transformation
TextFragmentParserTransformer.java
src/blocks/bsf/java/org/apache/cocoon/acting
ScriptAction.java
src/scratchpad/src/org/apache/cocoon/reading
DirectoryZipArchiver.java
src/blocks/swf/java/org/apache/cocoon/generation
SWFGenerator.java
Log:
Updating to latest excalibur source resolve
Revision Changes Path
1.29 +6 -7
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/SlideSource.java
Index: SlideSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/SlideSource.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- SlideSource.java 29 Jan 2003 10:55:17 -0000 1.28
+++ SlideSource.java 30 Jan 2003 08:37:34 -0000 1.29
@@ -78,7 +78,6 @@
import org.apache.cocoon.components.source.ModifiableTraversableSource;
import org.apache.cocoon.components.source.MoveableSource;
import org.apache.cocoon.components.source.RestrictableSource;
-import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.components.source.VersionableSource;
import org.apache.cocoon.components.source.WriteableSource;
import org.apache.cocoon.components.source.helpers.GroupSourcePermission;
@@ -323,7 +322,7 @@
*
* @return System identifier for the source.
*/
- public String getSystemId() {
+ public String getURI() {
return this.systemid;
}
@@ -353,7 +352,7 @@
* Refresh the content of this object after the underlying data
* content has changed.
*/
- public void discardValidity() {
+ public void refresh() {
this.validity = null;
}
@@ -642,7 +641,7 @@
throw new SourceException("Could not move source.", se);
}
} else {
- SourceUtil.move(this, source);
+ org.apache.excalibur.source.SourceUtil.move(this, source);
}
}
@@ -665,7 +664,7 @@
throw new SourceException("Could not move source.", se);
}
} else {
- SourceUtil.copy(this, source);
+ org.apache.excalibur.source.SourceUtil.copy(this, source);
}
}
@@ -1880,7 +1879,7 @@
*
* @return Scheme of the source.
*/
- public String getProtocol() {
+ public String getScheme() {
return this.scheme;
}
}
1.9 +3 -3
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/XPathSourceInspector.java
Index: XPathSourceInspector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/XPathSourceInspector.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XPathSourceInspector.java 22 Jan 2003 05:19:19 -0000 1.8
+++ XPathSourceInspector.java 30 Jan 2003 08:37:34 -0000 1.9
@@ -107,7 +107,7 @@
throws SourceException {
if ((namespace.equals(propertynamespace)) && (name.equals(propertyname)) &&
- (source.getSystemId().endsWith(extension))) {
+ (source.getURI().endsWith(extension))) {
DOMParser parser = null;
Document doc = null;
@@ -116,7 +116,7 @@
doc = parser.parseDocument(new
InputSource(source.getInputStream()));
} catch (SAXException se) {
- this.getLogger().error(source.getSystemId()
+ this.getLogger().error(source.getURI()
+ " is not a valid XML file");
} catch (IOException ioe) {
this.getLogger().error("Could not read file", ioe);
1.7 +2 -2
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/XMLDBSourceFactory.java
Index: XMLDBSourceFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/XMLDBSourceFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XMLDBSourceFactory.java 25 Jan 2003 03:02:11 -0000 1.6
+++ XMLDBSourceFactory.java 30 Jan 2003 08:37:34 -0000 1.7
@@ -170,7 +170,7 @@
public void release( Source source ) {
if ( null != source ) {
if ( this.getLogger().isDebugEnabled() ) {
- this.getLogger().debug("Releasing source " + source.getSystemId());
+ this.getLogger().debug("Releasing source " + source.getURI());
}
// simply do nothing
}
1.6 +2 -2
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/SourceInspectorManager.java
Index: SourceInspectorManager.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/SourceInspectorManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SourceInspectorManager.java 7 Jan 2003 23:56:14 -0000 1.5
+++ SourceInspectorManager.java 30 Jan 2003 08:37:34 -0000 1.6
@@ -248,7 +248,7 @@
list.add(properties[j]);
}
} catch (SourceException se) {
- getLogger().warn("Couldn't get properties from
'"+source.getSystemId()+"'", se);
+ getLogger().warn("Couldn't get properties from
'"+source.getURI()+"'", se);
}
}
1.4 +3 -3
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/GIFSourceInspector.java
Index: GIFSourceInspector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/GIFSourceInspector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GIFSourceInspector.java 7 Jan 2003 23:56:14 -0000 1.3
+++ GIFSourceInspector.java 30 Jan 2003 08:37:34 -0000 1.4
@@ -86,7 +86,7 @@
if ((namespace.equals(PROPERTY_NS)) &&
((name.equals(IMAGE_WIDTH_PROPERTY_NAME)) ||
(name.equals(IMAGE_HEIGHT_PROPERTY_NAME))) &&
- (source.getSystemId().endsWith(".gif")) && (isGIFFile(source))) {
+ (source.getURI().endsWith(".gif")) && (isGIFFile(source))) {
if (name.equals(IMAGE_WIDTH_PROPERTY_NAME))
return new SourceProperty(PROPERTY_NS, IMAGE_WIDTH_PROPERTY_NAME,
@@ -100,7 +100,7 @@
public SourceProperty[] getSourceProperties(Source source) throws
SourceException {
- if ((source.getSystemId().endsWith(".gif")) &&
+ if ((source.getURI().endsWith(".gif")) &&
(isGIFFile(source))) {
int[] size = getGifSize(source);
1.6 +15 -5
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/XMLDBSource.java
Index: XMLDBSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/XMLDBSource.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XMLDBSource.java 14 Jan 2003 09:56:01 -0000 1.5
+++ XMLDBSource.java 30 Jan 2003 08:37:34 -0000 1.6
@@ -196,7 +196,7 @@
} catch (ComponentException cme) {
throw new SourceException("could not lookup pipeline components", cme);
} catch (Exception e) {
- throw new SourceException("Exception during processing of " +
this.getSystemId(), e);
+ throw new SourceException("Exception during processing of " +
this.getURI(), e);
} finally {
if (serializer != null) serializerSelector.release(serializer);
if (serializerSelector != null)
this.manager.release(serializerSelector);
@@ -206,7 +206,7 @@
/**
* Get the protocol
*/
- public String getProtocol() {
+ public String getScheme() {
return this.protocol;
}
@@ -240,7 +240,7 @@
* Refresh the content of this object after the underlying data
* content has changed.
*/
- public void discardValidity() {
+ public void refresh() {
}
/**
@@ -461,7 +461,17 @@
this.query = null;
}
- public String getSystemId() {
+ public String getURI() {
return url;
}
+
+ /**
+ *
+ * @see org.apache.excalibur.source.Source#exists()
+ */
+ public boolean exists() {
+ // FIXME
+ return true;
+ }
+
}
1.7 +2 -2
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/SlideSourceFactory.java
Index: SlideSourceFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/SlideSourceFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SlideSourceFactory.java 29 Jan 2003 13:06:11 -0000 1.6
+++ SlideSourceFactory.java 30 Jan 2003 08:37:34 -0000 1.7
@@ -204,7 +204,7 @@
public void release( Source source ) {
if ( null != source ) {
if ( this.getLogger().isDebugEnabled() ) {
- this.getLogger().debug("Releasing source " + source.getSystemId());
+ this.getLogger().debug("Releasing source " + source.getURI());
}
// simply do nothing
}
1.7 +13 -4
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/BlobSource.java
Index: BlobSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/BlobSource.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BlobSource.java 15 Jan 2003 15:59:32 -0000 1.6
+++ BlobSource.java 30 Jan 2003 08:37:34 -0000 1.7
@@ -181,14 +181,14 @@
/**
* Return the protocol
*/
- public String getProtocol() {
+ public String getScheme() {
return URL_PREFIX;
}
/**
* Return the unique identifer for this source
*/
- public String getSystemId() {
+ public String getURI() {
return this.systemId;
}
@@ -277,7 +277,16 @@
* Refresh the content of this object after the underlying data
* content has changed.
*/
- public void discardValidity() {
+ public void refresh() {
+ }
+
+ /**
+ *
+ * @see org.apache.excalibur.source.Source#exists()
+ */
+ public boolean exists() {
+ // FIXME
+ return true;
}
/**
1.3 +3 -3
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/JPEGSourceInspector.java
Index: JPEGSourceInspector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/JPEGSourceInspector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JPEGSourceInspector.java 7 Jan 2003 23:56:14 -0000 1.2
+++ JPEGSourceInspector.java 30 Jan 2003 08:37:34 -0000 1.3
@@ -93,7 +93,7 @@
if ((namespace.equals(PROPERTY_NS)) &&
((name.equals(IMAGE_WIDTH_PROPERTY_NAME)) ||
(name.equals(IMAGE_HEIGHT_PROPERTY_NAME))) &&
- (source.getSystemId().endsWith(".jpg")) && (isJPEGFile(source))) {
+ (source.getURI().endsWith(".jpg")) && (isJPEGFile(source))) {
if (name.equals(IMAGE_WIDTH_PROPERTY_NAME))
return new SourceProperty(PROPERTY_NS, IMAGE_WIDTH_PROPERTY_NAME,
@@ -107,7 +107,7 @@
public SourceProperty[] getSourceProperties(Source source) throws
SourceException {
- if ((source.getSystemId().endsWith(".jpg")) &&
+ if ((source.getURI().endsWith(".jpg")) &&
(isJPEGFile(source))) {
int[] size = getJpegSize(source);
return new SourceProperty[] {
1.4 +2 -2
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/BlobSourceFactory.java
Index: BlobSourceFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/BlobSourceFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BlobSourceFactory.java 9 Jan 2003 14:58:35 -0000 1.3
+++ BlobSourceFactory.java 30 Jan 2003 08:37:34 -0000 1.4
@@ -100,7 +100,7 @@
public void release( Source source ) {
if ( null != source ) {
if ( this.getLogger().isDebugEnabled() ) {
- this.getLogger().debug("Releasing source " + source.getSystemId());
+ this.getLogger().debug("Releasing source " + source.getURI());
}
// simply do nothing
}
1.17 +3 -3
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/pagination/Paginator.java
Index: Paginator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/pagination/Paginator.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Paginator.java 22 Jan 2003 05:19:20 -0000 1.16
+++ Paginator.java 30 Jan 2003 08:37:35 -0000 1.17
@@ -160,7 +160,7 @@
this.objectModel = objectModel;
this.inputSource = resolver.resolveURI(src);
this.resolver = resolver;
- getLogger().debug("Using pagesheet: '" + this.inputSource.getSystemId()
+ "' in " + this + ", last modified: " +
+ getLogger().debug("Using pagesheet: '" + this.inputSource.getURI() + "'
in " + this + ", last modified: " +
this.inputSource.getLastModified());
this.page = par.getParameterAsInteger("page", 1);
this.item = par.getParameterAsInteger("item", 0);
@@ -202,7 +202,7 @@
*/
public Serializable generateKey() {
if (this.inputSource.getLastModified() != 0) {
- return this.inputSource.getSystemId() + page;
+ return this.inputSource.getURI() + page;
} else {
return null;
}
1.4 +6 -6
xml-cocoon2/src/blocks/chaperon/java/org/apache/cocoon/generation/TextParserGenerator.java
Index: TextParserGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/chaperon/java/org/apache/cocoon/generation/TextParserGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TextParserGenerator.java 13 Jan 2003 13:12:29 -0000 1.3
+++ TextParserGenerator.java 30 Jan 2003 08:37:35 -0000 1.4
@@ -178,13 +178,13 @@
// Retrieve the parser table from the transient store
store = (Store)this.manager.lookup(Store.TRANSIENT_STORE);
- ParserTableEntry entry =
(ParserTableEntry)store.get(this.grammarSource.getSystemId());
+ ParserTableEntry entry =
(ParserTableEntry)store.get(this.grammarSource.getURI());
// If the parser table has changed, rebuild the parser table
if ((entry==null) ||
(entry.getValidity()==null) ||
(entry.getValidity().isValid(this.grammarSource.getValidity()) !=
1)) {
- getLogger().debug("(Re)building the parsertable from
'"+this.grammarSource.getSystemId()+"'");
+ getLogger().debug("(Re)building the parsertable from
'"+this.grammarSource.getURI()+"'");
SAXGrammarGenerator grammargenerator = new SAXGrammarGenerator();
SourceUtil.toSAX(this.grammarSource, grammargenerator,
this.manager);
@@ -199,10 +199,10 @@
ParserTableGenerator parsertablegenerator = new
ParserTableGenerator(grammar);
this.parsertable = parsertablegenerator.getParserTable();
- store.store(this.grammarSource.getSystemId(), new
ParserTableEntry(this.parsertable,
+ store.store(this.grammarSource.getURI(), new
ParserTableEntry(this.parsertable,
this.grammarSource.getValidity()));
} else {
- getLogger().debug("Getting parsertable from store for
'"+this.grammarSource.getSystemId()+"'");
+ getLogger().debug("Getting parsertable from store for
'"+this.grammarSource.getURI()+"'");
this.parsertable = entry.getParserTable();
}
@@ -235,7 +235,7 @@
* is currently not cacheable.
*/
public Serializable generateKey() {
- return
"TPG("+this.inputSource.getSystemId()+";"+this.grammarSource.getSystemId()+")";
+ return "TPG("+this.inputSource.getURI()+";"+this.grammarSource.getURI()+")";
}
/**
1.8 +2 -2
xml-cocoon2/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components/AuthenticationManager.java
Index: AuthenticationManager.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components/AuthenticationManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AuthenticationManager.java 7 Jan 2003 20:48:35 -0000 1.7
+++ AuthenticationManager.java 30 Jan 2003 08:37:35 -0000 1.8
@@ -844,12 +844,12 @@
Document doc =
org.apache.cocoon.components.source.SourceUtil.toDOM(source, this.manager);
fragment = doc.createDocumentFragment();
fragment.appendChild(doc.getDocumentElement());
+ } catch (SourceException se) {
+ throw org.apache.cocoon.components.source.SourceUtil.handle(se);
} catch (IOException se) {
throw new ProcessingException(se);
} catch (SAXException se) {
throw new ProcessingException(se);
- } catch (SourceException se) {
- throw org.apache.cocoon.components.source.SourceUtil.handle(se);
} finally {
this.resolver.release(source);
}
1.5 +1 -1
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/CastorTransformer.java
Index: CastorTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/CastorTransformer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CastorTransformer.java 25 Jan 2003 03:02:11 -0000 1.4
+++ CastorTransformer.java 30 Jan 2003 08:37:35 -0000 1.5
@@ -243,7 +243,7 @@
public String getFile(SourceResolver sr, String FileName) {
try{
- String path = sr.resolveURI(FileName).getSystemId();
+ String path = sr.resolveURI(FileName).getURI();
if(path.startsWith(FILE_PREFIX)){
path = path.substring(FILE_PREFIX.length());
}
1.3 +4 -4
xml-cocoon2/src/blocks/html/java/org/apache/cocoon/generation/HTMLGenerator.java
Index: HTMLGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/html/java/org/apache/cocoon/generation/HTMLGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HTMLGenerator.java 22 Jan 2003 05:19:15 -0000 1.2
+++ HTMLGenerator.java 30 Jan 2003 08:37:36 -0000 1.3
@@ -199,11 +199,11 @@
*/
public java.io.Serializable generateKey() {
if (this.xpath != null) {
- StringBuffer buffer = new StringBuffer(this.inputSource.getSystemId());
+ StringBuffer buffer = new StringBuffer(this.inputSource.getURI());
buffer.append(':').append(this.xpath);
return buffer.toString();
} else {
- return this.inputSource.getSystemId();
+ return this.inputSource.getURI();
}
}
@@ -277,7 +277,7 @@
}
} catch (IOException e){
throw new ResourceNotFoundException("Could not get resource "
- + this.inputSource.getSystemId(), e);
+ + this.inputSource.getURI(), e);
} catch (SAXException e){
throw e;
} catch (Exception e){
1.2 +5 -5
xml-cocoon2/src/deprecated/java/org/apache/cocoon/components/xslt/XSLTProcessorImpl.java
Index: XSLTProcessorImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/deprecated/java/org/apache/cocoon/components/xslt/XSLTProcessorImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XSLTProcessorImpl.java 26 Dec 2002 18:38:57 -0000 1.1
+++ XSLTProcessorImpl.java 30 Jan 2003 08:37:36 -0000 1.2
@@ -454,17 +454,17 @@
if (this.getLogger().isDebugEnabled()) {
getLogger().debug("xslSource = " + xslSource
- + ", system id = " + xslSource.getSystemId());
+ + ", system id = " + xslSource.getURI());
}
- return new StreamSource(xslSource.getInputStream(),
xslSource.getSystemId());
+ return new StreamSource(xslSource.getInputStream(), xslSource.getURI());
} catch (java.net.MalformedURLException mue) {
return null;
- } catch (IOException ioe) {
- return null;
} catch (SourceException pe) {
throw new TransformerException(pe);
+ } catch (IOException ioe) {
+ return null;
} finally {
this.resolver.release( xslSource );
}
1.5 +5 -5
xml-cocoon2/src/blocks/bsf/java/org/apache/cocoon/generation/ScriptGenerator.java
Index: ScriptGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/bsf/java/org/apache/cocoon/generation/ScriptGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ScriptGenerator.java 22 Jan 2003 05:19:15 -0000 1.4
+++ ScriptGenerator.java 30 Jan 2003 08:37:36 -0000 1.5
@@ -158,7 +158,7 @@
getLogger().debug("processing file [" + super.source + "]");
this.inputSource = this.resolver.resolveURI(super.source);
- getLogger().debug("file resolved to [" + this.inputSource.getSystemId()
+ "]");
+ getLogger().debug("file resolved to [" + this.inputSource.getURI() +
"]");
// TODO: why doesn't this work?
// Reader in = src.getCharacterStream();
@@ -194,8 +194,8 @@
// Execute the script
- mgr.exec(BSFManager.getLangFromFilename(this.inputSource.getSystemId()),
- this.inputSource.getSystemId(), 0, 0,
IOUtils.getStringFromReader(in));
+ mgr.exec(BSFManager.getLangFromFilename(this.inputSource.getURI()),
+ this.inputSource.getURI(), 0, 0,
IOUtils.getStringFromReader(in));
getLogger().debug("BSFManager execution complete");
getLogger().debug("output = [" + output.toString() + "]");
@@ -210,7 +210,7 @@
throw SourceUtil.handle(se);
} catch (FileNotFoundException e) {
throw new ResourceNotFoundException(
- "Could not load script " + this.inputSource.getSystemId(), e);
+ "Could not load script " + this.inputSource.getURI(), e);
} catch (BSFException e) {
throw new ProcessingException(
"Exception in ScriptGenerator.generate()", e);
1.18 +4 -4
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/generation/SourceDescriptionGenerator.java
Index: SourceDescriptionGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/generation/SourceDescriptionGenerator.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- SourceDescriptionGenerator.java 30 Jan 2003 07:17:55 -0000 1.17
+++ SourceDescriptionGenerator.java 30 Jan 2003 08:37:36 -0000 1.18
@@ -225,7 +225,7 @@
for (Enumeration e = cachedsources.elements(); e.hasMoreElements(); ) {
source = (Source) e.nextElement();
- key.append(source.getSystemId());
+ key.append(source.getURI());
if (e.hasMoreElements()) {
key.append(";");
}
@@ -343,9 +343,9 @@
attributes.addAttribute(SOURCE_NS, SYSTEMID_ATTR_NAME,
SYSTEMID_ATTR_NAME, "CDATA",
- source.getSystemId());
+ source.getURI());
- String name = source.getSystemId();
+ String name = source.getURI();
if (name.endsWith("://")) {
attributes.addAttribute(SOURCE_NS, NAME_ATTR_NAME,
1.2 +4 -4
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/generation/asciiart/AsciiArtSVGGenerator.java
Index: AsciiArtSVGGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/generation/asciiart/AsciiArtSVGGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AsciiArtSVGGenerator.java 6 Jan 2003 21:52:49 -0000 1.1
+++ AsciiArtSVGGenerator.java 30 Jan 2003 08:37:36 -0000 1.2
@@ -167,7 +167,7 @@
*@return The generated key hashes the src
*/
public java.io.Serializable generateKey() {
- return this.inputSource.getSystemId();
+ return this.inputSource.getURI();
}
@@ -194,7 +194,7 @@
try {
if (this.getLogger().isDebugEnabled()) {
this.getLogger().debug("processing asciiart file " + super.source);
- this.getLogger().debug("asciiart file resolved to " +
this.inputSource.getSystemId());
+ this.getLogger().debug("asciiart file resolved to " +
this.inputSource.getURI());
}
// read the ascii art
@@ -253,7 +253,7 @@
throw (SAXException) cause;
}
throw new ProcessingException("Could not read resource "
- + this.inputSource.getSystemId(), cause);
+ + this.inputSource.getURI(), cause);
}
throw e;
}
1.4 +6 -6
xml-cocoon2/src/blocks/chaperon/java/org/apache/cocoon/transformation/TextFragmentParserTransformer.java
Index: TextFragmentParserTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/chaperon/java/org/apache/cocoon/transformation/TextFragmentParserTransformer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TextFragmentParserTransformer.java 13 Jan 2003 13:12:29 -0000 1.3
+++ TextFragmentParserTransformer.java 30 Jan 2003 08:37:36 -0000 1.4
@@ -151,13 +151,13 @@
// Retrieve the parser table from the transient store
store = (Store)this.manager.lookup(Store.TRANSIENT_STORE);
- ParserTableEntry entry =
(ParserTableEntry)store.get(this.grammarSource.getSystemId());
+ ParserTableEntry entry =
(ParserTableEntry)store.get(this.grammarSource.getURI());
// If the parser table has changed, rebuild the parser table
if ((entry==null) ||
(entry.getValidity()==null) ||
(entry.getValidity().isValid(this.grammarSource.getValidity()) !=
1)) {
- getLogger().debug("(Re)building the parsertable from
'"+this.grammarSource.getSystemId()+"'");
+ getLogger().debug("(Re)building the parsertable from
'"+this.grammarSource.getURI()+"'");
SAXGrammarGenerator grammargenerator = new SAXGrammarGenerator();
SourceUtil.toSAX(this.grammarSource, grammargenerator,
this.manager);
@@ -172,10 +172,10 @@
ParserTableGenerator parsertablegenerator = new
ParserTableGenerator(grammar);
this.parsertable = parsertablegenerator.getParserTable();
- store.store(this.grammarSource.getSystemId(), new
ParserTableEntry(this.parsertable,
+ store.store(this.grammarSource.getURI(), new
ParserTableEntry(this.parsertable,
this.grammarSource.getValidity()));
} else {
- getLogger().debug("Getting parsertable from store for
'"+this.grammarSource.getSystemId()+"'");
+ getLogger().debug("Getting parsertable from store for
'"+this.grammarSource.getURI()+"'");
this.parsertable = entry.getParserTable();
}
@@ -204,7 +204,7 @@
* @return The generated key hashes the src
*/
public Serializable generateKey() {
- return this.grammarSource.getSystemId();
+ return this.grammarSource.getURI();
}
/**
1.3 +2 -2
xml-cocoon2/src/blocks/bsf/java/org/apache/cocoon/acting/ScriptAction.java
Index: ScriptAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/bsf/java/org/apache/cocoon/acting/ScriptAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ScriptAction.java 13 Jan 2003 13:47:27 -0000 1.2
+++ ScriptAction.java 30 Jan 2003 08:37:36 -0000 1.3
@@ -93,7 +93,7 @@
// Locate the appropriate file on the filesytem
src = resolver.resolveURI(scriptName);
- String systemID = src.getSystemId();
+ String systemID = src.getURI();
if (this.getLogger().isDebugEnabled()) {
getLogger().debug("script source [" + scriptName + "]");
1.6 +2 -2
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/reading/DirectoryZipArchiver.java
Index: DirectoryZipArchiver.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/reading/DirectoryZipArchiver.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DirectoryZipArchiver.java 2 Aug 2002 09:21:00 -0000 1.5
+++ DirectoryZipArchiver.java 30 Jan 2003 08:37:36 -0000 1.6
@@ -106,7 +106,7 @@
throw new ProcessingException("Could not retrieve source
'"+super.source+"'", se);
}
- String systemId = inputSource.getSystemId();
+ String systemId = inputSource.getURI();
if (!systemId.startsWith("file:")) {
throw new ResourceNotFoundException(systemId + " does not denote a
directory");
}
1.2 +3 -3
xml-cocoon2/src/blocks/swf/java/org/apache/cocoon/generation/SWFGenerator.java
Index: SWFGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/swf/java/org/apache/cocoon/generation/SWFGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SWFGenerator.java 26 Dec 2002 14:25:13 -0000 1.1
+++ SWFGenerator.java 30 Jan 2003 08:37:36 -0000 1.2
@@ -103,7 +103,7 @@
try {
if (this.getLogger().isDebugEnabled()) {
this.getLogger().debug("processing file " + super.source);
- this.getLogger().debug("file resolved to " +
this.inputSource.getSystemId());
+ this.getLogger().debug("file resolved to " +
this.inputSource.getURI());
}
this.parser.setContentHandler(super.xmlConsumer);
@@ -111,7 +111,7 @@
} catch (SourceException e) {
throw new ProcessingException("Could not read resource "
- + this.inputSource.getSystemId(), e);
+ + this.inputSource.getURI(), e);
} catch (SAXException e) {
final Exception cause = e.getException();
if( cause != null ) {
@@ -123,7 +123,7 @@
if ( cause instanceof SAXException )
throw (SAXException)cause;
throw new ProcessingException("Could not read resource "
- + this.inputSource.getSystemId(),
cause);
+ + this.inputSource.getURI(), cause);
}
throw e;
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
