unico 2004/03/29 04:35:34
Modified: src/share/org/apache/slide/common Tag:
SLIDE_2_0_RELEASE_BRANCH XMLUnmarshaller.java
Domain.java Slide.java
Log:
access statics in a static way and cleanup unused variables
Revision Changes Path
No revision
No revision
1.26.2.3 +4 -13
jakarta-slide/src/share/org/apache/slide/common/XMLUnmarshaller.java
Index: XMLUnmarshaller.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/XMLUnmarshaller.java,v
retrieving revision 1.26.2.2
retrieving revision 1.26.2.3
diff -u -r1.26.2.2 -r1.26.2.3
--- XMLUnmarshaller.java 5 Feb 2004 16:05:05 -0000 1.26.2.2
+++ XMLUnmarshaller.java 29 Mar 2004 12:35:33 -0000 1.26.2.3
@@ -34,7 +34,6 @@
import org.apache.slide.content.NodeRevisionContent;
import org.apache.slide.content.NodeRevisionDescriptor;
import org.apache.slide.content.NodeRevisionDescriptors;
-import org.apache.slide.content.NodeRevisionNumber;
import org.apache.slide.content.RevisionAlreadyExistException;
import org.apache.slide.content.RevisionContentNotFoundException;
import org.apache.slide.content.RevisionDescriptorNotFoundException;
@@ -69,11 +68,6 @@
private final static String LOG_CHANNEL = XMLUnmarshaller.class.getName();
- private static UriPath
- usersPath,
- rolesPath,
- groupsPath;
-
// --------------------------------------------------------- Public Methods
@@ -358,9 +352,6 @@
// Retrieving the list of properties
Enumeration propertyDefinitions =
revisionDefinition.getConfigurations("property");
-
- // Retrieving the revision number, if any
- NodeRevisionNumber revisionNumber = null;
// Now creating the new revision descriptor object
NodeRevisionDescriptor revisionDescriptor = null;
1.42.2.3 +8 -8 jakarta-slide/src/share/org/apache/slide/common/Domain.java
Index: Domain.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/Domain.java,v
retrieving revision 1.42.2.2
retrieving revision 1.42.2.3
diff -u -r1.42.2.2 -r1.42.2.3
--- Domain.java 3 Feb 2004 21:36:50 -0000 1.42.2.2
+++ Domain.java 29 Mar 2004 12:35:33 -0000 1.42.2.3
@@ -558,7 +558,7 @@
* logging.
*/
public static boolean isDebugEnabled() {
- return isEnabled(LOG_CHANNEL,logger.DEBUG);
+ return isEnabled(LOG_CHANNEL,Logger.DEBUG);
}
@@ -567,7 +567,7 @@
* logging.
*/
public static boolean isWarningEnabled() {
- return isEnabled(LOG_CHANNEL,logger.WARNING);
+ return isEnabled(LOG_CHANNEL,Logger.WARNING);
}
@@ -575,7 +575,7 @@
* Check if the default channel with the INFO level is enabled for logging.
*/
public static boolean isInfoEnabled() {
- return isEnabled(LOG_CHANNEL,logger.INFO);
+ return isEnabled(LOG_CHANNEL,Logger.INFO);
}
@@ -584,7 +584,7 @@
* logging.
*/
public static boolean isErrorEnabled() {
- return isEnabled(LOG_CHANNEL,logger.ERROR);
+ return isEnabled(LOG_CHANNEL,Logger.ERROR);
}
1.7.2.2 +13 -19 jakarta-slide/src/share/org/apache/slide/common/Slide.java
Index: Slide.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/Slide.java,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -r1.7.2.1 -r1.7.2.2
--- Slide.java 5 Feb 2004 16:05:04 -0000 1.7.2.1
+++ Slide.java 29 Mar 2004 12:35:33 -0000 1.7.2.2
@@ -51,13 +51,7 @@
implements SlideMBean, MBeanRegistration {
- // ----------------------------------------------------- Instance Variables
-
-
- /**
- * Slide domain.
- */
- private Domain domain = new Domain();
+ // ----------------------------------------------------- Instance Variables
/**
@@ -175,7 +169,7 @@
if (configFile == null) {
- domain.selfInit();
+ Domain.selfInit();
} else {
@@ -191,9 +185,9 @@
new ConfigurationElement(pop.load(new InputSource(is),
parser.getXMLReader()));
- domain.init(slideConfiguration);
+ Domain.init(slideConfiguration);
- domain.start();
+ Domain.start();
}
@@ -236,7 +230,7 @@
try {
- domain.stop();
+ Domain.stop();
} catch (Throwable t) {
@@ -276,7 +270,7 @@
*/
public NamespaceAccessToken accessNamespace(SecurityToken token,
String namespaceName) {
- return domain.accessNamespace(token, namespaceName);
+ return Domain.accessNamespace(token, namespaceName);
}
@@ -286,7 +280,7 @@
* @param token Namespace access token
*/
public void closeNamespace(NamespaceAccessToken token) {
- domain.closeNamespace(token);
+ Domain.closeNamespace(token);
}
@@ -297,7 +291,7 @@
* @param namespaceName Name of the namespace
*/
public void closeNamespace(SecurityToken token, String namespaceName) {
- domain.closeNamespace(token, namespaceName);
+ Domain.closeNamespace(token, namespaceName);
}
@@ -308,7 +302,7 @@
* @return DomainAccessToken Access token to the domain
*/
public DomainAccessToken accessDomain(SecurityToken token) {
- return domain.accessDomain(token);
+ return Domain.accessDomain(token);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
