You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by re...@locus.apache.org on 2000/12/05 06:17:27 UTC
cvs commit: jakarta-slide/src/share/org/apache/slide/common Namespace.java
remm 00/12/04 21:17:26
Modified: src/share/org/apache/slide/common Namespace.java
Log:
- Fix a config file parsing bug when using store references.
Revision Changes Path
1.12 +11 -9 jakarta-slide/src/share/org/apache/slide/common/Namespace.java
Index: Namespace.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/Namespace.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Namespace.java 2000/11/25 01:34:49 1.11
+++ Namespace.java 2000/12/05 05:17:25 1.12
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/Namespace.java,v 1.11 2000/11/25 01:34:49 remm Exp $
- * $Revision: 1.11 $
- * $Date: 2000/11/25 01:34:49 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/Namespace.java,v 1.12 2000/12/05 05:17:25 remm Exp $
+ * $Revision: 1.12 $
+ * $Date: 2000/12/05 05:17:25 $
*
* ====================================================================
*
@@ -85,7 +85,7 @@
* Namespace class.
*
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.12 $
*/
public final class Namespace {
@@ -691,7 +691,7 @@
storeDefinition.getConfiguration(SECURITY_STORE);
try {
Configuration referenceDefinition =
- storeDefinition.getConfiguration(REFERENCE);
+ securityStoreDefinition.getConfiguration(REFERENCE);
currentStoreChildStores.put
(SECURITY_STORE,
referenceDefinition.getAttribute("store"));
@@ -711,7 +711,7 @@
storeDefinition.getConfiguration(LOCK_STORE);
try {
Configuration referenceDefinition =
- storeDefinition.getConfiguration(REFERENCE);
+ lockStoreDefinition.getConfiguration(REFERENCE);
currentStoreChildStores.put
(LOCK_STORE, referenceDefinition.getAttribute("store"));
} catch (ConfigurationException ex) {
@@ -731,7 +731,8 @@
(REVISION_DESCRIPTORS_STORE);
try {
Configuration referenceDefinition =
- storeDefinition.getConfiguration(REFERENCE);
+ revisionDescriptorsStoreDefinition
+ .getConfiguration(REFERENCE);
currentStoreChildStores.put
(REVISION_DESCRIPTORS_STORE,
referenceDefinition.getAttribute("store"));
@@ -753,7 +754,8 @@
storeDefinition.getConfiguration(REVISION_DESCRIPTOR_STORE);
try {
Configuration referenceDefinition =
- storeDefinition.getConfiguration(REFERENCE);
+ revisionDescriptorStoreDefinition
+ .getConfiguration(REFERENCE);
currentStoreChildStores.put
(REVISION_DESCRIPTOR_STORE,
referenceDefinition.getAttribute("store"));
@@ -775,7 +777,7 @@
storeDefinition.getConfiguration(CONTENT_STORE);
try {
Configuration referenceDefinition =
- storeDefinition.getConfiguration(REFERENCE);
+ contentStoreDefinition.getConfiguration(REFERENCE);
currentStoreChildStores.put
(CONTENT_STORE, referenceDefinition.getAttribute("store"));
} catch (ConfigurationException ex) {