User: user57
Date: 02/04/03 20:35:06
Modified: src/main/org/jboss/mq/pm/file CacheStore.java
PersistenceManager.java
Removed: src/main/org/jboss/mq/pm/file CacheStoreMBean.java
PersistenceManagerMBean.java
Log:
o Using ServerConfigLocator instead of ServerConfigImplMBean
o Using XDoclet to generate some *MBean interfaces
Revision Changes Path
1.7 +22 -8 jbossmq/src/main/org/jboss/mq/pm/file/CacheStore.java
Index: CacheStore.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/pm/file/CacheStore.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CacheStore.java 27 Feb 2002 09:24:25 -0000 1.6
+++ CacheStore.java 4 Apr 2002 04:35:06 -0000 1.7
@@ -20,13 +20,16 @@
import org.jboss.mq.SpyMessage;
import org.jboss.mq.server.MessageReference;
import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.system.server.ServerConfigImplMBean;
+
+import org.jboss.system.server.ServerConfigLocator;
/**
* This class manages the persistence needs of the MessageCache
*
+ * @jmx:mbean extends="org.jboss.system.ServiceMBean,
org.jboss.mq.pm.CacheStoreMBean"
+ *
* @author Hiram Chirino
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public class CacheStore
extends ServiceMBeanSupport
@@ -75,14 +78,26 @@
}
/**
- * @see CacheStoreMBean#getDataDirectory()
+ * Gets the DataDirectory attribute of the CacheStoreMBean object
+ *
+ * @return The DataDirectory value
+ *
+ * @see CacheStoreMBean#getDataDirectory
+ *
+ * @jmx:managed-attribute
*/
public String getDataDirectory() {
- return null;
+ return dataDirectory;
}
/**
- * @see CacheStoreMBean#setDataDirectory(String)
+ * Sets the DataDirectory attribute of the CacheStoreMBean object
+ *
+ * @param newDataDirectory The new DataDirectory value
+ *
+ * @see CacheStoreMBean#setDataDirectory
+ *
+ * @jmx:managed-attribute
*/
public void setDataDirectory(String newDataDirectory) {
dataDirectory = newDataDirectory;
@@ -94,9 +109,8 @@
protected void startService() throws Exception {
boolean debug = log.isDebugEnabled();
- // Get the system home directory (may want to use dataDir or tempDir)
- File systemHomeDir = (File)
- server.getAttribute(ServerConfigImplMBean.OBJECT_NAME, "ServerHomeDir");
+ // Get the system home directory
+ File systemHomeDir = ServerConfigLocator.locate().getServerHomeDir();
dataDir = new File(systemHomeDir, dataDirectory);
if (debug)
1.22 +12 -5 jbossmq/src/main/org/jboss/mq/pm/file/PersistenceManager.java
Index: PersistenceManager.java
===================================================================
RCS file:
/cvsroot/jboss/jbossmq/src/main/org/jboss/mq/pm/file/PersistenceManager.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- PersistenceManager.java 9 Mar 2002 15:32:34 -0000 1.21
+++ PersistenceManager.java 4 Apr 2002 04:35:06 -0000 1.22
@@ -33,15 +33,19 @@
import org.jboss.mq.server.PersistentQueue;
import org.jboss.mq.server.MessageReference;
import org.jboss.mq.server.MessageCache;
+
import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.system.server.ServerConfigImplMBean;
+
+import org.jboss.system.server.ServerConfigLocator;
/**
* This class manages all persistence related services for file based
* persistence.
*
+ * @jmx:mbean extends="org.jboss.system.ServiceMBean,
org.jboss.mq.pm.PersistenceManagerMBean"
+ *
* @author Paul Kendall ([EMAIL PROTECTED])
- * @version $Revision: 1.21 $
+ * @version $Revision: 1.22 $
*/
public class PersistenceManager
extends ServiceMBeanSupport
@@ -109,6 +113,8 @@
* Sets the DataDirectory attribute of the PersistenceManager object
*
* @param newDataDirectory The new DataDirectory value
+ *
+ * @jmx:managed-attribute
*/
public void setDataDirectory(String newDataDirectory)
{
@@ -119,6 +125,8 @@
* Gets the DataDirectory attribute of the PersistenceManager object
*
* @return The DataDirectory value
+ *
+ * @jmx:managed-attribute
*/
public String getDataDirectory()
{
@@ -141,9 +149,8 @@
*/
public void startService() throws Exception
{
- // Get the system home directory (may want to use dataDir)
- File systemHomeDir = (File)
- server.getAttribute(ServerConfigImplMBean.OBJECT_NAME, "ServerHomeDir");
+ // Get the system home directory
+ File systemHomeDir = ServerConfigLocator.locate().getServerHomeDir();
dataDir = new File(systemHomeDir, dataDirectory);
if (log.isDebugEnabled()) {
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
