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/10 11:50:41 UTC
svn commit: r473310 -
/lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNode.java
Author: andreas
Date: Fri Nov 10 02:50:40 2006
New Revision: 473310
URL: http://svn.apache.org/viewvc?view=rev&rev=473310
Log:
SourceNode returns all available meta data URIs instead of only the used ones.
Modified:
lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNode.java
Modified: lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNode.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNode.java?view=diff&rev=473310&r1=473309&r2=473310
==============================================================================
--- lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNode.java (original)
+++ lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNode.java Fri Nov 10 02:50:40 2006
@@ -147,8 +147,8 @@
try {
if (!SourceUtil.exists(contentBaseUri, this.manager)) {
getLogger().info(
- "The content directory [" + contentBaseUri + "] does not exist. "
- + "It will be created as soon as documents are added.");
+ "The content directory [" + contentBaseUri + "] does not exist. "
+ + "It will be created as soon as documents are added.");
}
} catch (ServiceException e) {
throw new RuntimeException(e);
@@ -279,7 +279,7 @@
String publicationId = publicationsPath.split("/")[0];
DocumentFactory factory = DocumentUtil.createDocumentFactory(this.manager,
- getSession());
+ getSession());
Publication pub = factory.getPublication(publicationId);
String publicationPath = pub.getDirectory().getCanonicalPath();
@@ -836,15 +836,15 @@
} else {
NamespaceHelper helper = new NamespaceHelper(META_DATA_NAMESPACE, "", xml);
Element[] setElements = helper.getChildren(xml.getDocumentElement(),
- ELEMENT_SET);
+ ELEMENT_SET);
for (int setIndex = 0; setIndex < setElements.length; setIndex++) {
String namespace = setElements[setIndex].getAttribute(ATTRIBUTE_NAMESPACE);
Element[] elementElements = helper.getChildren(setElements[setIndex],
- ELEMENT_ELEMENT);
+ ELEMENT_ELEMENT);
for (int elemIndex = 0; elemIndex < elementElements.length; elemIndex++) {
String key = elementElements[elemIndex].getAttribute(ATTRIBUTE_KEY);
Element[] valueElements = helper.getChildren(
- elementElements[elemIndex], ELEMENT_VALUE);
+ elementElements[elemIndex], ELEMENT_VALUE);
for (int valueIndex = 0; valueIndex < valueElements.length; valueIndex++) {
String value = DocumentHelper
.getSimpleElementText(valueElements[valueIndex]);
@@ -987,11 +987,17 @@
}
public String[] getMetaDataNamespaceUris() throws MetaDataException {
- if (this.namespace2metamap == null) {
- loadMetaData();
+ MetaDataRegistry registry = null;
+ try {
+ registry = (MetaDataRegistry) this.manager.lookup(MetaDataRegistry.ROLE);
+ return registry.getNamespaceUris();
+ } catch (ServiceException e) {
+ throw new MetaDataException(e);
+ } finally {
+ if (registry != null) {
+ this.manager.release(registry);
+ }
}
- Set uris = this.namespace2metamap.keySet();
- return (String[]) uris.toArray(new String[uris.size()]);
}
private Set listeners = new HashSet();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org