[JBoss-dev] CVS update: jbossmq/src/main/org/jboss/mq/pm/file CacheStore.java PersistenceManager.java CacheStoreMBean.java PersistenceManagerMBean.java
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 ChangesPath
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 - 1.6
+++ CacheStore.java 4 Apr 2002 04:35:06 - 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
+*
+* @returnThe 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 - 1.21
+++ PersistenceManager.java 4 Apr 2002 04:35:06 - 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
*
* @returnThe 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
+
[JBoss-dev] CVS update: jbossmq/src/main/org/jboss/mq/pm/file CacheStore.java PersistenceManager.java
User: user57
Date: 02/02/27 01:24:25
Modified:src/main/org/jboss/mq/pm/file CacheStore.java
PersistenceManager.java
Log:
o Release structure and server config changes
Revision ChangesPath
1.6 +2 -2 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CacheStore.java 24 Feb 2002 10:24:30 - 1.5
+++ CacheStore.java 27 Feb 2002 09:24:25 - 1.6
@@ -26,7 +26,7 @@
* This class manages the persistence needs of the MessageCache
*
* @author Hiram Chirino
- * @version$Revision: 1.5 $
+ * @version$Revision: 1.6 $
*/
public class CacheStore
extends ServiceMBeanSupport
@@ -96,7 +96,7 @@
// Get the system home directory (may want to use dataDir or tempDir)
File systemHomeDir = (File)
- server.getAttribute(ServerConfigImplMBean.OBJECT_NAME, HomeDir);
+ server.getAttribute(ServerConfigImplMBean.OBJECT_NAME, ServerHomeDir);
dataDir = new File(systemHomeDir, dataDirectory);
if (debug)
1.20 +2 -2 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- PersistenceManager.java 24 Feb 2002 10:24:30 - 1.19
+++ PersistenceManager.java 27 Feb 2002 09:24:25 - 1.20
@@ -41,7 +41,7 @@
* persistence.
*
* @author Paul Kendall ([EMAIL PROTECTED])
- * @version$Revision: 1.19 $
+ * @version$Revision: 1.20 $
*/
public class PersistenceManager
extends ServiceMBeanSupport
@@ -143,7 +143,7 @@
{
// Get the system home directory (may want to use dataDir)
File systemHomeDir = (File)
- server.getAttribute(ServerConfigImplMBean.OBJECT_NAME, HomeDir);
+ server.getAttribute(ServerConfigImplMBean.OBJECT_NAME, ServerHomeDir);
dataDir = new File(systemHomeDir, dataDirectory);
if (log.isDebugEnabled()) {
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jbossmq/src/main/org/jboss/mq/pm/file CacheStore.java PersistenceManager.java
User: user57
Date: 02/02/24 02:24:30
Modified:src/main/org/jboss/mq/pm/file CacheStore.java
PersistenceManager.java
Log:
o moved core system from server to system (includes
all of org.jboss.system, some of org.jboss.deployment +
Main, Shutdown Version)
o finished the integration of ServerLoader, Server and
ServerConfig are now interfaces so had to update refering
classes to use ServerConfigImplMBean
o ServerLoader changes effectivly remove the need for lib/ + lib/ext
seperation, updated build to use lib for lib/ext and updated
config files
Revision ChangesPath
1.5 +3 -3 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CacheStore.java 13 Feb 2002 04:26:37 - 1.4
+++ CacheStore.java 24 Feb 2002 10:24:30 - 1.5
@@ -20,13 +20,13 @@
import org.jboss.mq.SpyMessage;
import org.jboss.mq.server.MessageReference;
import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.system.ServerConfigMBean;
+import org.jboss.system.server.ServerConfigImplMBean;
/**
* This class manages the persistence needs of the MessageCache
*
* @author Hiram Chirino
- * @version$Revision: 1.4 $
+ * @version$Revision: 1.5 $
*/
public class CacheStore
extends ServiceMBeanSupport
@@ -96,7 +96,7 @@
// Get the system home directory (may want to use dataDir or tempDir)
File systemHomeDir = (File)
- server.getAttribute(ServerConfigMBean.OBJECT_NAME, HomeDir);
+ server.getAttribute(ServerConfigImplMBean.OBJECT_NAME, HomeDir);
dataDir = new File(systemHomeDir, dataDirectory);
if (debug)
1.19 +3 -3 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- PersistenceManager.java 15 Feb 2002 20:59:52 - 1.18
+++ PersistenceManager.java 24 Feb 2002 10:24:30 - 1.19
@@ -34,14 +34,14 @@
import org.jboss.mq.server.MessageReference;
import org.jboss.mq.server.MessageCache;
import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.system.ServerConfigMBean;
+import org.jboss.system.server.ServerConfigImplMBean;
/**
* This class manages all persistence related services for file based
* persistence.
*
* @author Paul Kendall ([EMAIL PROTECTED])
- * @version$Revision: 1.18 $
+ * @version$Revision: 1.19 $
*/
public class PersistenceManager
extends ServiceMBeanSupport
@@ -143,7 +143,7 @@
{
// Get the system home directory (may want to use dataDir)
File systemHomeDir = (File)
- server.getAttribute(ServerConfigMBean.OBJECT_NAME, HomeDir);
+ server.getAttribute(ServerConfigImplMBean.OBJECT_NAME, HomeDir);
dataDir = new File(systemHomeDir, dataDirectory);
if (log.isDebugEnabled()) {
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: jbossmq/src/main/org/jboss/mq/pm/file CacheStore.java PersistenceManager.java
User: ejort
Date: 02/01/04 22:38:13
Modified:src/main/org/jboss/mq/pm/file CacheStore.java
PersistenceManager.java
Log:
Guarded debug logging
Revision ChangesPath
1.3 +7 -4 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CacheStore.java 2002/01/03 04:00:53 1.2
+++ CacheStore.java 2002/01/05 06:38:13 1.3
@@ -25,7 +25,7 @@
* This class manages the persistence needs of the MessageCache
*
* @author Hiram Chirino
- * @version$Revision: 1.2 $
+ * @version$Revision: 1.3 $
*/
public class CacheStore extends ServiceMBeanSupport implements
org.jboss.mq.pm.CacheStore, CacheStoreMBean {
String dataDirectory;
@@ -95,10 +95,12 @@
* This gets called to start the service.
*/
protected void startService() throws Exception {
+ boolean debug = log.isDebugEnabled();
log.warn(using jboss.system.home property);
File jbossHome = new File(System.getProperty(jboss.system.home));
dataFile = new File(jbossHome, dataDirectory);
- log.debug(Data directory set to: + dataFile.getCanonicalPath());
+ if (debug)
+ log.debug(Data directory set to: + dataFile.getCanonicalPath());
dataFile.mkdirs();
if (!dataFile.isDirectory())
@@ -106,7 +108,8 @@
// Clean out the directory of any previous files.
File files[] = dataFile.listFiles();
- log.debug(Removing + files.length + file(s) from: +
dataFile.getCanonicalPath());
+ if (debug)
+ log.debug(Removing + files.length + file(s) from: +
dataFile.getCanonicalPath());
for (int i = 0; i files.length; i++) {
files[i].delete();
}
@@ -120,4 +123,4 @@
return this;
}
-}
\ No newline at end of file
+}
1.14 +25 -27jbossmq/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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- PersistenceManager.java 2002/01/03 04:00:53 1.13
+++ PersistenceManager.java 2002/01/05 06:38:13 1.14
@@ -6,14 +6,6 @@
*/
package org.jboss.mq.pm.file;
-
-
-
-
-
-
-
-
import java.io.File;
import java.io.FileFilter;
import java.io.IOException;
@@ -45,7 +37,7 @@
* persistence.
*
* @author Paul Kendall ([EMAIL PROTECTED])
- * @version$Revision: 1.13 $
+ * @version$Revision: 1.14 $
*/
public class PersistenceManager extends ServiceMBeanSupport implements
PersistenceManagerMBean, org.jboss.mq.pm.PersistenceManager
{
@@ -172,6 +164,8 @@
*/
private void restoreTransactions() throws javax.jms.JMSException
{
+ boolean debug = log.isDebugEnabled();
+
TreeSet txs = new TreeSet();
File[] transactFiles = dataDirFile.listFiles();
int queueNameOffset = dataDirFile.toString().length()+1;
@@ -180,12 +174,12 @@
for (int i = 0; i transactFiles.length; i++)
{
// Set up a messageLog for each queue data directory.
-if( transactFiles[i].isDirectory() )
+if( transactFiles[i].isDirectory() )
{
String dirName = transactFiles[i].toString();
String key = dirName.substring(queueNameOffset);
- MessageLog log = new MessageLog(messageCache, transactFiles[i]);
- LogInfo info = new LogInfo(log, null);
+ MessageLog msgLog = new MessageLog(messageCache, transactFiles[i]);
+ LogInfo info = new LogInfo(msgLog, null);
synchronized (messageLogs)
{
messageLogs.put(key, info);
@@ -193,7 +187,7 @@
transactFiles[i] = null;
continue;
}
-
+
try
{
Long tx = new Long(Long.parseLong(transactFiles[i].getName()));
@@ -227,11 +221,12 @@
clone = (HashMap)messageLogs.clone();
}
- for (Iterator i = clone.keySet().iterator(); i.hasNext();)
+ for (Iterator i = clone.keySet().iterator(); i.hasNext();)
{
Object key = i.next();
LogInfo logInfo = (LogInfo)clone.get(key);
- log.debug(Recovered messages destined for: +key);
+ if (debug)
+log.debug(Recovered messages destined for: +key);
[JBoss-dev] CVS update: jbossmq/src/main/org/jboss/mq/pm/file CacheStore.java PersistenceManager.java
User: user57
Date: 02/01/02 20:00:53
Modified:src/main/org/jboss/mq/pm/file CacheStore.java
PersistenceManager.java
Log:
o migrated all components to a new JMX domain name model. jboss.system
is now where to core/spine components live. moved all components that
were in JBOSS-SYSTEM that did not move into a jboss.* domain into
jboss (where the server is now registered). The point was to limit the
members of jboss.system to core bits only.
o Created org.jboss.system.Server, which does the work of initialization
that org.jboss.Main used to do. Main now only parses the command line,
sets up basic legecy properties and creates a Server instance.
o Moved functionality of Shutdown (component not cl tool) into Server (
which is bound as jboss.system:service=Server)
o Moved more Runtime access from Info into Server. Exposed memory info
as attributes.
o Logging a WARN everywhere that uses System.getProperty(jboss.system.home)
as that should go away soon/eventually.
o Initialized the invokerMap in the harmi impl to avoid NPE
o Made getopt.jar a member of the lib/* dir instead of adding it to the
run.jar and shutdown.jars each time.
o Minor cosmetic changes along the way.
Revision ChangesPath
1.2 +2 -1 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CacheStore.java 2001/11/14 04:24:08 1.1
+++ CacheStore.java 2002/01/03 04:00:53 1.2
@@ -25,7 +25,7 @@
* This class manages the persistence needs of the MessageCache
*
* @author Hiram Chirino
- * @version$Revision: 1.1 $
+ * @version$Revision: 1.2 $
*/
public class CacheStore extends ServiceMBeanSupport implements
org.jboss.mq.pm.CacheStore, CacheStoreMBean {
String dataDirectory;
@@ -95,6 +95,7 @@
* This gets called to start the service.
*/
protected void startService() throws Exception {
+ log.warn(using jboss.system.home property);
File jbossHome = new File(System.getProperty(jboss.system.home));
dataFile = new File(jbossHome, dataDirectory);
log.debug(Data directory set to: + dataFile.getCanonicalPath());
1.13 +2 -1 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- PersistenceManager.java 2001/11/30 18:43:15 1.12
+++ PersistenceManager.java 2002/01/03 04:00:53 1.13
@@ -45,7 +45,7 @@
* persistence.
*
* @author Paul Kendall ([EMAIL PROTECTED])
- * @version$Revision: 1.12 $
+ * @version$Revision: 1.13 $
*/
public class PersistenceManager extends ServiceMBeanSupport implements
PersistenceManagerMBean, org.jboss.mq.pm.PersistenceManager
{
@@ -149,6 +149,7 @@
*/
public void startService() throws Exception
{
+ log.warn(using jboss.system.home property);
File jbossHome = new File(System.getProperty(jboss.system.home));
dataDirFile = new File(jbossHome, dataDirectory);
dataDirFile.mkdirs();
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
