You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2006/11/28 16:33:34 UTC
svn commit: r480092 - in /lenya/trunk/src/modules-core/linking:
config/cocoon-xconf/linkmanager.xconf
java/src/org/apache/lenya/cms/linking/ContentLinkManager.java
java/test/org/apache/lenya/cms/linking/LinkTest.java
Author: andreas
Date: Tue Nov 28 07:33:33 2006
New Revision: 480092
URL: http://svn.apache.org/viewvc?view=rev&rev=480092
Log:
Fixed handling of non-XML resource types in link manager
Modified:
lenya/trunk/src/modules-core/linking/config/cocoon-xconf/linkmanager.xconf
lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/linking/ContentLinkManager.java
lenya/trunk/src/modules-core/linking/java/test/org/apache/lenya/cms/linking/LinkTest.java
Modified: lenya/trunk/src/modules-core/linking/config/cocoon-xconf/linkmanager.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/linking/config/cocoon-xconf/linkmanager.xconf?view=diff&rev=480092&r1=480091&r2=480092
==============================================================================
--- lenya/trunk/src/modules-core/linking/config/cocoon-xconf/linkmanager.xconf (original)
+++ lenya/trunk/src/modules-core/linking/config/cocoon-xconf/linkmanager.xconf Tue Nov 28 07:33:33 2006
@@ -21,6 +21,6 @@
<xconf xpath="/cocoon" unless="/cocoon/component[@role = 'org.apache.lenya.cms.linking.LinkManager']">
<component logger="" role="org.apache.lenya.cms.linking.LinkManager"
- class="org.apache.lenya.cms.linking.LinkManagerImpl"/>
+ class="org.apache.lenya.cms.linking.ContentLinkManager"/>
</xconf>
Modified: lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/linking/ContentLinkManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/linking/ContentLinkManager.java?view=diff&rev=480092&r1=480091&r2=480092
==============================================================================
--- lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/linking/ContentLinkManager.java (original)
+++ lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/linking/ContentLinkManager.java Tue Nov 28 07:33:33 2006
@@ -46,15 +46,17 @@
try {
String[] xPaths = source.getResourceType().getLinkAttributeXPaths();
- org.w3c.dom.Document xml = SourceUtil.readDOM(source.getSourceURI(), this.manager);
- for (int i = 0; i < xPaths.length; i++) {
- NodeIterator iter = XPathAPI.selectNodeIterator(xml, xPaths[i]);
- Node node;
- while ((node = iter.nextNode()) != null) {
- Attr attr = (Attr) node;
- String uri = attr.getValue();
- if (isLinkUri(uri)) {
- links.add(new Link(uri));
+ if (xPaths.length > 0) {
+ org.w3c.dom.Document xml = SourceUtil.readDOM(source.getSourceURI(), this.manager);
+ for (int i = 0; i < xPaths.length; i++) {
+ NodeIterator iter = XPathAPI.selectNodeIterator(xml, xPaths[i]);
+ Node node;
+ while ((node = iter.nextNode()) != null) {
+ Attr attr = (Attr) node;
+ String uri = attr.getValue();
+ if (isLinkUri(uri)) {
+ links.add(new Link(uri));
+ }
}
}
}
Modified: lenya/trunk/src/modules-core/linking/java/test/org/apache/lenya/cms/linking/LinkTest.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/linking/java/test/org/apache/lenya/cms/linking/LinkTest.java?view=diff&rev=480092&r1=480091&r2=480092
==============================================================================
--- lenya/trunk/src/modules-core/linking/java/test/org/apache/lenya/cms/linking/LinkTest.java (original)
+++ lenya/trunk/src/modules-core/linking/java/test/org/apache/lenya/cms/linking/LinkTest.java Tue Nov 28 07:33:33 2006
@@ -54,7 +54,7 @@
boolean matched = false;
for (int i = 0; i < links.length; i++) {
LinkTarget linkTarget = resolver.resolve(source, links[i].getUri());
- if (linkTarget.getDocument().equals(target)) {
+ if (linkTarget.exists() && linkTarget.getDocument().equals(target)) {
matched = true;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org