remm 01/11/11 20:53:33
Modified: src/share/org/apache/slide/common EmbeddedDomain.java
Namespace.java NamespaceConfig.java
Log:
- Add some toString methods.
Revision Changes Path
1.5 +41 -4
jakarta-slide/src/share/org/apache/slide/common/EmbeddedDomain.java
Index: EmbeddedDomain.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/EmbeddedDomain.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- EmbeddedDomain.java 2001/09/25 07:34:45 1.4
+++ EmbeddedDomain.java 2001/11/12 04:53:33 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/EmbeddedDomain.java,v 1.4
2001/09/25 07:34:45 cmlenz Exp $
- * $Revision: 1.4 $
- * $Date: 2001/09/25 07:34:45 $
+ * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/EmbeddedDomain.java,v 1.5
2001/11/12 04:53:33 remm Exp $
+ * $Revision: 1.5 $
+ * $Date: 2001/11/12 04:53:33 $
*
* ====================================================================
*
@@ -75,7 +75,7 @@
* Alternate domain designed to ease embedding.
*
* @author Remy Maucherat
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class EmbeddedDomain {
@@ -110,10 +110,36 @@
private String defaultNamespace;
+ /**
+ * Namespace name.
+ */
+ private String name = "slide-domain";
+
+
// --------------------------------------------------------- Public Methods
/**
+ * Sets the qualified name of the namespace.
+ *
+ * @param name Name of the namespace
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+
+ /**
+ * Gets the qulified name of the namespace.
+ *
+ * @return String Namespace name
+ */
+ public String getName() {
+ return name;
+ }
+
+
+ /**
* Return the default namespace of this domain.
*
* @return the name of the default namespace
@@ -268,6 +294,17 @@
((Namespace) active.nextElement()).disconnectServices();
}
+ }
+
+
+ // --------------------------------------------------------- Object Methods
+
+
+ /**
+ * Get a String representation of this domain.
+ */
+ public String toString() {
+ return getName();
}
1.42 +25 -13 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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- Namespace.java 2001/10/23 13:03:27 1.41
+++ Namespace.java 2001/11/12 04:53:33 1.42
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/Namespace.java,v 1.41
2001/10/23 13:03:27 cmlenz Exp $
- * $Revision: 1.41 $
- * $Date: 2001/10/23 13:03:27 $
+ * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/Namespace.java,v 1.42
2001/11/12 04:53:33 remm Exp $
+ * $Revision: 1.42 $
+ * $Date: 2001/11/12 04:53:33 $
*
* ====================================================================
*
@@ -125,7 +125,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
* @author Dirk Verbeeck
- * @version $Revision: 1.41 $
+ * @version $Revision: 1.42 $
*/
public final class Namespace {
@@ -144,6 +144,12 @@
public static final String CONTENT_STORE = "contentstore";
+ /**
+ * Log channel for logger
+ */
+ private static final String LOG_CHANNEL = Namespace.class.getName();
+
+
// ----------------------------------------------------- Instance Variables
@@ -191,10 +197,6 @@
private TransactionManager transactionManager =
new SlideTransactionManager();
- /**
- * Log channel for logger
- */
- private final static String LOG_CHANNEL = Namespace.class.getName();
/**
* Logger.
@@ -255,12 +257,11 @@
}
-
/**
- ** Enumerate all scopes managed by this namespace.
- **
- ** @return return an enumeration of all scopes
- **/
+ * Enumerate all scopes managed by this namespace.
+ *
+ * @return return an enumeration of all scopes
+ */
public Enumeration enumerateScopes() {
return stores.keys();
}
@@ -1166,6 +1167,17 @@
+ " on scope " + match,LOG_CHANNEL,Logger.INFO);
}
+ }
+
+
+ // --------------------------------------------------------- Object Methods
+
+
+ /**
+ * Get a String representation of this namespace.
+ */
+ public String toString() {
+ return getName();
}
1.16 +25 -4
jakarta-slide/src/share/org/apache/slide/common/NamespaceConfig.java
Index: NamespaceConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/NamespaceConfig.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- NamespaceConfig.java 2001/06/14 00:41:55 1.15
+++ NamespaceConfig.java 2001/11/12 04:53:33 1.16
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/NamespaceConfig.java,v 1.15
2001/06/14 00:41:55 remm Exp $
- * $Revision: 1.15 $
- * $Date: 2001/06/14 00:41:55 $
+ * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/NamespaceConfig.java,v 1.16
2001/11/12 04:53:33 remm Exp $
+ * $Revision: 1.16 $
+ * $Date: 2001/11/12 04:53:33 $
*
* ====================================================================
*
@@ -81,7 +81,7 @@
* Configuration of the Namespace.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
- * @version $Revision: 1.15 $
+ * @version $Revision: 1.16 $
*/
public final class NamespaceConfig {
@@ -103,6 +103,12 @@
/**
+ * Namespace name.
+ */
+ protected String name;
+
+
+ /**
* Default action.
*/
protected ActionNode defaultAction;
@@ -584,6 +590,8 @@
void initializeNamespaceConfig(Namespace namespace, Configuration config)
throws InvalidNamespaceConfigurationException, SlideException {
+ name = namespace.getName();
+
try {
defaultAction =
getActionNode(namespace, config.getConfiguration
@@ -927,6 +935,8 @@
void initializeAsDummyConfig(Namespace namespace)
throws InvalidNamespaceConfigurationException {
+ name = namespace.getName();
+
try {
Uri tempActionUri = namespace.getUri("/tempaction");
@@ -1040,6 +1050,17 @@
return result;
+ }
+
+
+ // --------------------------------------------------------- Object Methods
+
+
+ /**
+ * Get a String representation of this domain.
+ */
+ public String toString() {
+ return name;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
