[jboss-svn-commits] JBL Code SVN: r5510 - in labs/jbossesb/branches/refactor/product/core: common/src/org/jboss/soa/esb/common/bizclasses common/src/org/jboss/soa/esb/notification common/src/org/jboss/soa/esb/util common/tests/src/org/jboss/soa/esb/util listeners/src/org/jboss/soa/esb/listeners processors/src/org/jboss/soa/esb/processors services/src/org/jboss/soa/esb/internal/core/objectstore services/src/org/jboss/soa/esb/services/EJB services/src/org/jboss/soa/esb/services/msglistener
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Aug 6 11:04:14 EDT 2006
Author: arvinder
Date: 2006-08-06 11:03:46 -0400 (Sun, 06 Aug 2006)
New Revision: 5510
Added:
labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/util/Util.java
labs/jbossesb/branches/refactor/product/core/common/tests/src/org/jboss/soa/esb/util/UtilUnitTest.java
Removed:
labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/util/EsbUtil.java
labs/jbossesb/branches/refactor/product/core/common/tests/src/org/jboss/soa/esb/util/EsbUtilUnitTest.java
Modified:
labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/common/bizclasses/Address.java
labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/common/bizclasses/BankAcct.java
labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/common/bizclasses/BatchProcess.java
labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/common/bizclasses/Person.java
labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/common/bizclasses/Telephone.java
labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/notification/NotifyEmail.java
labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/util/BaseBusinessObject.java
labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/util/BobjStdDTO.java
labs/jbossesb/branches/refactor/product/core/listeners/src/org/jboss/soa/esb/listeners/AbstractPoller.java
labs/jbossesb/branches/refactor/product/core/listeners/src/org/jboss/soa/esb/listeners/BetterDirListener.java
labs/jbossesb/branches/refactor/product/core/listeners/src/org/jboss/soa/esb/listeners/JmsQueueListener.java
labs/jbossesb/branches/refactor/product/core/listeners/src/org/jboss/soa/esb/listeners/OldDirListener.java
labs/jbossesb/branches/refactor/product/core/listeners/src/org/jboss/soa/esb/listeners/SqlTablePoller.java
labs/jbossesb/branches/refactor/product/core/processors/src/org/jboss/soa/esb/processors/AbstractProcessor.java
labs/jbossesb/branches/refactor/product/core/processors/src/org/jboss/soa/esb/processors/AbstractSaxProcessor.java
labs/jbossesb/branches/refactor/product/core/processors/src/org/jboss/soa/esb/processors/AbstractSqlProcessor.java
labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/BobjStore.java
labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoBatchTable.java
labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoIndexTable.java
labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoSnapTable.java
labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoUidTable.java
labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerBean.java
labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerBean.java
labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerBean.java
labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/msglistener/AbstractEsbMsgDrivenBean.java
Log:
Name change EsbUtil to Util
Modified: labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/common/bizclasses/Address.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/common/bizclasses/Address.java 2006-08-06 14:53:23 UTC (rev 5509)
+++ labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/common/bizclasses/Address.java 2006-08-06 15:03:46 UTC (rev 5510)
@@ -72,7 +72,7 @@
public String setField(ATTRIB pKey, String pVal)
{ if (null==pKey) return null;
String sRet = (null==m_oData)? null : m_oData.remove(pKey);
- if (! EsbUtil.isNullString(pVal))
+ if (! Util.isNullString(pVal))
{ if (null==m_oData)
m_oData = new EnumMap<ATTRIB,String>(ATTRIB.class);
m_oData.put(pKey,pVal);
@@ -117,30 +117,30 @@
public String toString()
{ StringBuilder sb = new StringBuilder();
String sCurr = getField(ATTRIB.strNum);
- if (! EsbUtil.isNullString(sCurr))
+ if (! Util.isNullString(sCurr))
sb.append(sCurr).append(" ");
ATTRIB [] oa = {ATTRIB.strLine1,ATTRIB.strLine2
,ATTRIB.twnCty1,ATTRIB.twnCty2 };
for (ATTRIB oAtt : oa)
{ sCurr = getField(oAtt);
- if(! EsbUtil.isNullString(sCurr))
+ if(! Util.isNullString(sCurr))
sb.append(sCurr.trim()).append("\n");
}
StringBuilder sZprov = new StringBuilder();
sCurr = getField(ATTRIB.postalZip);
- if (! EsbUtil.isNullString(sCurr))
+ if (! Util.isNullString(sCurr))
sZprov.append(sCurr.trim()).append(" ");
sCurr = getField(ATTRIB.provSt);
- if (! EsbUtil.isNullString(sCurr))
+ if (! Util.isNullString(sCurr))
sZprov.append(sCurr.trim());
if (sb.length()>0 && '\n'!=sb.charAt(-1+sb.length()))
sb.append("\n");
sb.append(sZprov);
sCurr = getField(ATTRIB.cntry);
- if (! EsbUtil.isNullString(sCurr))
+ if (! Util.isNullString(sCurr))
{ if (sb.length()>0 && '\n'!=sb.charAt(-1+sb.length()))
sb.append("\n");
sb.append(sCurr.trim());
Modified: labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/common/bizclasses/BankAcct.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/common/bizclasses/BankAcct.java 2006-08-06 14:53:23 UTC (rev 5509)
+++ labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/common/bizclasses/BankAcct.java 2006-08-06 15:03:46 UTC (rev 5510)
@@ -54,7 +54,7 @@
public String setField(ATTRIB pKey, String pVal)
{ if (null==pKey) return null;
String sRet = (null==m_oData)? null : m_oData.remove(pKey);
- if (! EsbUtil.isNullString(pVal))
+ if (! Util.isNullString(pVal))
{ if (null==m_oData)
m_oData = new EnumMap<ATTRIB,String>(ATTRIB.class);
m_oData.put(pKey,pVal);
Modified: labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/common/bizclasses/BatchProcess.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/common/bizclasses/BatchProcess.java 2006-08-06 14:53:23 UTC (rev 5509)
+++ labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/common/bizclasses/BatchProcess.java 2006-08-06 15:03:46 UTC (rev 5510)
@@ -30,7 +30,7 @@
import org.jboss.soa.esb.util.BaseBusinessObject;
import org.jboss.soa.esb.util.BobjStdDTO;
-import org.jboss.soa.esb.util.EsbUtil;
+import org.jboss.soa.esb.util.Util;
public class BatchProcess extends BaseBusinessObject {
@@ -216,7 +216,7 @@
"yyyyMMdd HH:mm:ss.S");
protected final String showStamp(ATTRIB pFld) {
- long lMillis = EsbUtil.parseLong(getField(pFld));
+ long lMillis = Util.parseLong(getField(pFld));
if (lMillis < 1)
return "";
return s_FD.format(new Date(lMillis));
@@ -247,7 +247,7 @@
if (null == pKey)
return null;
String sRet = (null == m_oData) ? null : m_oData.remove(pKey);
- if (!EsbUtil.isNullString(pVal)) {
+ if (!Util.isNullString(pVal)) {
if (null == m_oData)
m_oData = new EnumMap<ATTRIB, String>(ATTRIB.class);
m_oData.put(pKey, pVal);
Modified: labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/common/bizclasses/Person.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/common/bizclasses/Person.java 2006-08-06 14:53:23 UTC (rev 5509)
+++ labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/common/bizclasses/Person.java 2006-08-06 15:03:46 UTC (rev 5510)
@@ -136,7 +136,7 @@
public String setField(ATTRIB pKey, String pVal)
{ if (null==pKey) return null;
String sRet = (null==m_oData)? null : m_oData.remove(pKey);
- if (! EsbUtil.isNullString(pVal))
+ if (! Util.isNullString(pVal))
{ if (null==m_oData)
m_oData = new EnumMap<ATTRIB,String>(ATTRIB.class);
m_oData.put(pKey,pVal);
Modified: labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/common/bizclasses/Telephone.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/common/bizclasses/Telephone.java 2006-08-06 14:53:23 UTC (rev 5509)
+++ labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/common/bizclasses/Telephone.java 2006-08-06 15:03:46 UTC (rev 5510)
@@ -55,7 +55,7 @@
{ if (null==pKey) return null;
if (null==m_oData) m_oData = new EnumMap<ATTRIB,String>(ATTRIB.class);
String sRet = m_oData.remove(pKey);
- if (! EsbUtil.isNullString(pVal))
+ if (! Util.isNullString(pVal))
m_oData.put(pKey,pVal);
return sRet;
} //__________________________________
@@ -69,20 +69,20 @@
public String toString()
{ StringBuilder sb = new StringBuilder();
String sCurr = getField(ATTRIB.cntry);
- if (! EsbUtil.isNullString(sCurr))
+ if (! Util.isNullString(sCurr))
sb.append("+").append(sCurr.trim());
sCurr = getField(ATTRIB.city);
- if(EsbUtil.isNullString(sCurr)) sb.append(" ");
+ if(Util.isNullString(sCurr)) sb.append(" ");
else
sb.append("(").append(sCurr.trim()).append(")");
sCurr = getField(ATTRIB.num);
- if(! EsbUtil.isNullString(sCurr))
+ if(! Util.isNullString(sCurr))
sb.append(sCurr.trim());
sCurr = getField(ATTRIB.ext);
- if(!EsbUtil.isNullString(sCurr))
+ if(!Util.isNullString(sCurr))
sb.append(" Ext ").append(sCurr.trim());
return sb.toString();
Modified: labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/notification/NotifyEmail.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/notification/NotifyEmail.java 2006-08-06 14:53:23 UTC (rev 5509)
+++ labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/notification/NotifyEmail.java 2006-08-06 15:03:46 UTC (rev 5510)
@@ -28,7 +28,7 @@
import javax.mail.internet.*;
import org.jboss.soa.esb.helpers.*;
-import org.jboss.soa.esb.util.EsbUtil;
+import org.jboss.soa.esb.util.Util;
/**
* This class will send an e-mail using the EsbEmail class
@@ -84,7 +84,7 @@
oP.setAttr(Email.MESSAGE, sMsg);
sendEmailNotification(oP);
} catch (Exception e) {
- EsbUtil.getDefaultLogger(this.getClass()).error("Send Mail Failed",
+ Util.getDefaultLogger(this.getClass()).error("Send Mail Failed",
e);
e.printStackTrace();
}
Modified: labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/util/BaseBusinessObject.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/util/BaseBusinessObject.java 2006-08-06 14:53:23 UTC (rev 5509)
+++ labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/util/BaseBusinessObject.java 2006-08-06 15:03:46 UTC (rev 5510)
@@ -76,7 +76,7 @@
if (null == pKey)
return null;
String sRet = (null == m_oData) ? null : m_oData.remove(pKey);
- if (!EsbUtil.isNullString(pVal)) {
+ if (!Util.isNullString(pVal)) {
if (null == m_oData)
m_oData = new EnumMap<ATTRIB, String>(ATTRIB.class);
m_oData.put(pKey, pVal);
@@ -254,12 +254,12 @@
if (m_lLastSnap > 0)
p_oRet.addAttr(HIDDEN.snap.toString(), Long
.toString(m_lLastSnap));
- if (!EsbUtil.isNullString(m_sDtSnap))
+ if (!Util.isNullString(m_sDtSnap))
p_oRet.addAttr(HIDDEN.dtSnap.toString(), m_sDtSnap);
if (getBatchNum() > 0)
p_oRet.addAttr(HIDDEN.batch.toString(), Long
.toString(getBatchNum()));
- if (!EsbUtil.isNullString(m_sPkg))
+ if (!Util.isNullString(m_sPkg))
p_oRet.addAttr(BobjStdDTO.BOBJ_PACKAGE, m_sPkg);
} catch (Exception e1) {
}
Modified: labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/util/BobjStdDTO.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/util/BobjStdDTO.java 2006-08-06 14:53:23 UTC (rev 5509)
+++ labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/util/BobjStdDTO.java 2006-08-06 15:03:46 UTC (rev 5510)
@@ -189,7 +189,7 @@
private long attrAsLong(String p_s) {
try {
String sVal = getAttr(p_s);
- if (!EsbUtil.isNullString(sVal))
+ if (!Util.isNullString(sVal))
return Long.parseLong(sVal);
} catch (Exception e) {/* OK just fall through and return default */
}
@@ -436,7 +436,7 @@
public static synchronized BobjStdDTO getFromXml(String xmlBob)
throws Exception {
- if(EsbUtil.isNullString(xmlBob)) {
+ if(Util.isNullString(xmlBob)) {
throw new IllegalArgumentException("null or empty 'xmlBob' arg in call.");
}
Deleted: labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/util/EsbUtil.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/util/EsbUtil.java 2006-08-06 14:53:23 UTC (rev 5509)
+++ labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/util/EsbUtil.java 2006-08-06 15:03:46 UTC (rev 5510)
@@ -1,103 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.soa.esb.util;
-
-import java.util.*;
-import java.io.*;
-import javax.naming.*;
-import org.apache.log4j.*;
-
-public class EsbUtil {
- private EsbUtil() {
- }
-
- public static void dumpSysProps(PrintStream p_OS) {
- String[] sa = new String[System.getProperties().size()];
- System.getProperties().keySet().toArray(sa);
- Arrays.sort(sa);
- for (String sCurr : sa)
- p_OS.println(sCurr + "=" + System.getProperty(sCurr));
- } // __________________________________
-
- public static boolean isNullString(String p_s) {
- return (null == p_s) ? true : p_s.trim().length() < 1;
- } // __________________________________
-
- public static boolean isLong(String p_s) {
- if (isNullString(p_s))
- return false;
- try {
- Long.parseLong(p_s);
- return true;
- } catch (Exception e) {
- return false;
- }
- } // __________________________________
-
- public static boolean isPositiveLong(String p_s) {
- if (isNullString(p_s))
- return false;
- try {
- long lBk = Long.parseLong(p_s);
- return lBk > 0;
- } catch (Exception e) {
- return false;
- }
- } // __________________________________
-
- public static int parseInt(String s) {
- if (s == null)
- return 0;
- String sVal = s.trim();
- if (sVal.length() < 1)
- return 0;
- else
- try {
- return Integer.parseInt(s);
- } catch (NumberFormatException ex) {
- return 0;
- }
- } // __________________________________
-
- public static long parseLong(String s) {
- if (s == null)
- return 0;
- String sVal = s.trim();
- if (sVal.length() < 1)
- return 0;
- else
- try {
- return Long.parseLong(s);
- } catch (NumberFormatException ex) {
- return 0;
- }
- } // __________________________________
-
- public static Logger getDefaultLogger(Class p_oCls) {
- Logger oRet = Logger.getLogger(p_oCls.getName());
- Appender oApp = new ConsoleAppender(new TTCCLayout("ISO8601"));
- oRet.addAppender(oApp);
- return oRet;
- } // __________________________________
-
-} // ____________________________________________________________________________
Copied: labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/util/Util.java (from rev 5508, labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/util/EsbUtil.java)
===================================================================
--- labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/util/EsbUtil.java 2006-08-06 13:07:59 UTC (rev 5508)
+++ labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/util/Util.java 2006-08-06 15:03:46 UTC (rev 5510)
@@ -0,0 +1,103 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.soa.esb.util;
+
+import java.util.*;
+import java.io.*;
+import javax.naming.*;
+import org.apache.log4j.*;
+
+public class Util {
+ private Util() {
+ }
+
+ public static void dumpSysProps(PrintStream p_OS) {
+ String[] sa = new String[System.getProperties().size()];
+ System.getProperties().keySet().toArray(sa);
+ Arrays.sort(sa);
+ for (String sCurr : sa)
+ p_OS.println(sCurr + "=" + System.getProperty(sCurr));
+ } // __________________________________
+
+ public static boolean isNullString(String p_s) {
+ return (null == p_s) ? true : p_s.trim().length() < 1;
+ } // __________________________________
+
+ public static boolean isLong(String p_s) {
+ if (isNullString(p_s))
+ return false;
+ try {
+ Long.parseLong(p_s);
+ return true;
+ } catch (Exception e) {
+ return false;
+ }
+ } // __________________________________
+
+ public static boolean isPositiveLong(String p_s) {
+ if (isNullString(p_s))
+ return false;
+ try {
+ long lBk = Long.parseLong(p_s);
+ return lBk > 0;
+ } catch (Exception e) {
+ return false;
+ }
+ } // __________________________________
+
+ public static int parseInt(String s) {
+ if (s == null)
+ return 0;
+ String sVal = s.trim();
+ if (sVal.length() < 1)
+ return 0;
+ else
+ try {
+ return Integer.parseInt(s);
+ } catch (NumberFormatException ex) {
+ return 0;
+ }
+ } // __________________________________
+
+ public static long parseLong(String s) {
+ if (s == null)
+ return 0;
+ String sVal = s.trim();
+ if (sVal.length() < 1)
+ return 0;
+ else
+ try {
+ return Long.parseLong(s);
+ } catch (NumberFormatException ex) {
+ return 0;
+ }
+ } // __________________________________
+
+ public static Logger getDefaultLogger(Class p_oCls) {
+ Logger oRet = Logger.getLogger(p_oCls.getName());
+ Appender oApp = new ConsoleAppender(new TTCCLayout("ISO8601"));
+ oRet.addAppender(oApp);
+ return oRet;
+ } // __________________________________
+
+} // ____________________________________________________________________________
Deleted: labs/jbossesb/branches/refactor/product/core/common/tests/src/org/jboss/soa/esb/util/EsbUtilUnitTest.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/common/tests/src/org/jboss/soa/esb/util/EsbUtilUnitTest.java 2006-08-06 14:53:23 UTC (rev 5509)
+++ labs/jbossesb/branches/refactor/product/core/common/tests/src/org/jboss/soa/esb/util/EsbUtilUnitTest.java 2006-08-06 15:03:46 UTC (rev 5510)
@@ -1,109 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.soa.esb.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.Properties;
-
-import junit.framework.TestCase;
-
-/**
- * EsbUtil unit tests.
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public class EsbUtilUnitTest extends TestCase {
-
- public void testDumpSysProps() throws IOException {
- ByteArrayOutputStream buf = new ByteArrayOutputStream();
-
- EsbUtil.dumpSysProps(new PrintStream(buf));
-
- Properties props = new Properties();
- props.load(new ByteArrayInputStream(buf.toByteArray()));
-
- // Just make sure that something was dumped to the printstream
- // by checking for a property we know will be in the System...
- assertTrue(props.containsKey("file.separator"));
- }
-
- public void testIsNullString() {
- assertTrue(EsbUtil.isNullString(null));
- assertTrue(EsbUtil.isNullString(""));
- assertTrue(EsbUtil.isNullString(" "));
- assertTrue(!EsbUtil.isNullString("a"));
- }
-
- public void testIsLong() {
- assertTrue(!EsbUtil.isLong(null));
- assertTrue(!EsbUtil.isLong(""));
- assertTrue(!EsbUtil.isLong(" "));
- assertTrue(!EsbUtil.isLong("a"));
- assertTrue(!EsbUtil.isLong(" 1"));
- assertTrue(!EsbUtil.isLong("1 "));
- assertTrue(!EsbUtil.isLong("1.1"));
- assertTrue(EsbUtil.isLong("1"));
- assertTrue(EsbUtil.isLong("-1"));
- }
-
- public void testIsPositiveLong() {
- assertTrue(!EsbUtil.isPositiveLong(null));
- assertTrue(!EsbUtil.isPositiveLong(""));
- assertTrue(!EsbUtil.isPositiveLong(" "));
- assertTrue(!EsbUtil.isPositiveLong("a"));
- assertTrue(!EsbUtil.isPositiveLong(" 1"));
- assertTrue(!EsbUtil.isPositiveLong("1 "));
- assertTrue(!EsbUtil.isPositiveLong("1.1"));
- assertTrue(EsbUtil.isPositiveLong("1"));
- assertTrue(!EsbUtil.isPositiveLong("0"));
- assertTrue(!EsbUtil.isPositiveLong("-1"));
- }
-
- public void testParseInt() {
- assertEquals(0, EsbUtil.parseInt("a"));
- assertEquals(0, EsbUtil.parseInt(""));
- assertEquals(0, EsbUtil.parseInt(" "));
- assertEquals(0, EsbUtil.parseInt(" 1"));
- assertEquals(0, EsbUtil.parseInt("1 "));
- assertEquals(0, EsbUtil.parseInt("0"));
- assertEquals(1, EsbUtil.parseInt("1"));
- assertEquals(-1, EsbUtil.parseInt("-1"));
- }
-
- public void testParseLong() {
- assertEquals(0L, EsbUtil.parseLong("a"));
- assertEquals(0L, EsbUtil.parseLong(""));
- assertEquals(0L, EsbUtil.parseLong(" "));
- assertEquals(0L, EsbUtil.parseLong(" 1"));
- assertEquals(0L, EsbUtil.parseLong("1 "));
- assertEquals(0L, EsbUtil.parseLong("0"));
- assertEquals(1L, EsbUtil.parseLong("1"));
- assertEquals(-1L, EsbUtil.parseLong("-1"));
- }
-
- public void testGetDefaultLogger() {
- // Cheating here - just getting the coverage results up a little more :-)
- EsbUtil.getDefaultLogger(EsbUtil.class);
- }
-}
Copied: labs/jbossesb/branches/refactor/product/core/common/tests/src/org/jboss/soa/esb/util/UtilUnitTest.java (from rev 5508, labs/jbossesb/branches/refactor/product/core/common/tests/src/org/jboss/soa/esb/util/EsbUtilUnitTest.java)
===================================================================
--- labs/jbossesb/branches/refactor/product/core/common/tests/src/org/jboss/soa/esb/util/EsbUtilUnitTest.java 2006-08-06 13:07:59 UTC (rev 5508)
+++ labs/jbossesb/branches/refactor/product/core/common/tests/src/org/jboss/soa/esb/util/UtilUnitTest.java 2006-08-06 15:03:46 UTC (rev 5510)
@@ -0,0 +1,109 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.soa.esb.util;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.util.Properties;
+
+import junit.framework.TestCase;
+
+/**
+ * Util unit tests.
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public class UtilUnitTest extends TestCase {
+
+ public void testDumpSysProps() throws IOException {
+ ByteArrayOutputStream buf = new ByteArrayOutputStream();
+
+ Util.dumpSysProps(new PrintStream(buf));
+
+ Properties props = new Properties();
+ props.load(new ByteArrayInputStream(buf.toByteArray()));
+
+ // Just make sure that something was dumped to the printstream
+ // by checking for a property we know will be in the System...
+ assertTrue(props.containsKey("file.separator"));
+ }
+
+ public void testIsNullString() {
+ assertTrue(Util.isNullString(null));
+ assertTrue(Util.isNullString(""));
+ assertTrue(Util.isNullString(" "));
+ assertTrue(!Util.isNullString("a"));
+ }
+
+ public void testIsLong() {
+ assertTrue(!Util.isLong(null));
+ assertTrue(!Util.isLong(""));
+ assertTrue(!Util.isLong(" "));
+ assertTrue(!Util.isLong("a"));
+ assertTrue(!Util.isLong(" 1"));
+ assertTrue(!Util.isLong("1 "));
+ assertTrue(!Util.isLong("1.1"));
+ assertTrue(Util.isLong("1"));
+ assertTrue(Util.isLong("-1"));
+ }
+
+ public void testIsPositiveLong() {
+ assertTrue(!Util.isPositiveLong(null));
+ assertTrue(!Util.isPositiveLong(""));
+ assertTrue(!Util.isPositiveLong(" "));
+ assertTrue(!Util.isPositiveLong("a"));
+ assertTrue(!Util.isPositiveLong(" 1"));
+ assertTrue(!Util.isPositiveLong("1 "));
+ assertTrue(!Util.isPositiveLong("1.1"));
+ assertTrue(Util.isPositiveLong("1"));
+ assertTrue(!Util.isPositiveLong("0"));
+ assertTrue(!Util.isPositiveLong("-1"));
+ }
+
+ public void testParseInt() {
+ assertEquals(0, Util.parseInt("a"));
+ assertEquals(0, Util.parseInt(""));
+ assertEquals(0, Util.parseInt(" "));
+ assertEquals(0, Util.parseInt(" 1"));
+ assertEquals(0, Util.parseInt("1 "));
+ assertEquals(0, Util.parseInt("0"));
+ assertEquals(1, Util.parseInt("1"));
+ assertEquals(-1, Util.parseInt("-1"));
+ }
+
+ public void testParseLong() {
+ assertEquals(0L, Util.parseLong("a"));
+ assertEquals(0L, Util.parseLong(""));
+ assertEquals(0L, Util.parseLong(" "));
+ assertEquals(0L, Util.parseLong(" 1"));
+ assertEquals(0L, Util.parseLong("1 "));
+ assertEquals(0L, Util.parseLong("0"));
+ assertEquals(1L, Util.parseLong("1"));
+ assertEquals(-1L, Util.parseLong("-1"));
+ }
+
+ public void testGetDefaultLogger() {
+ // Cheating here - just getting the coverage results up a little more :-)
+ Util.getDefaultLogger(Util.class);
+ }
+}
Modified: labs/jbossesb/branches/refactor/product/core/listeners/src/org/jboss/soa/esb/listeners/AbstractPoller.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/listeners/src/org/jboss/soa/esb/listeners/AbstractPoller.java 2006-08-06 14:53:23 UTC (rev 5509)
+++ labs/jbossesb/branches/refactor/product/core/listeners/src/org/jboss/soa/esb/listeners/AbstractPoller.java 2006-08-06 15:03:46 UTC (rev 5510)
@@ -78,7 +78,7 @@
protected AbstractPoller(String p_sParamsUid) throws Exception
{
- m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
+ m_oLogger = Util.getDefaultLogger(this.getClass());
m_oParmRepos = ParamRepositoryFactory.getInstance();
m_oParmName = p_sParamsUid;
@@ -163,10 +163,10 @@
m_oTopicSubs = null;
String sStopTopic = m_oParms.getAttr(PARM_QUIESCE_TOPIC);
- if (EsbUtil.isNullString(sStopTopic))
+ if (Util.isNullString(sStopTopic))
return;
String sFactClass = m_oParms.getAttr(PARM_TOPIC_CONN_FACT);
- if (EsbUtil.isNullString(sFactClass))
+ if (Util.isNullString(sFactClass))
sFactClass = "ConnectionFactory";
String sJndiType = SystemProperties.getJndiServerType();
@@ -182,7 +182,7 @@
m_oTopicConn.start();
String sSelector = m_oParms.getAttr(PARM_QUIESCE_SELECTOR);
- if (EsbUtil.isNullString(sSelector))
+ if (Util.isNullString(sSelector))
sSelector = "processor='"+getClass().getSimpleName()+"'";
m_oTopicSubs = m_oSession.createSubscriber(m_oTopic, sSelector,true);
}
@@ -269,7 +269,7 @@
String sVal = p_oP.getAttr(p_sAtt);
if (null==sVal)
sVal = p_sDefault;
- if (EsbUtil.isNullString(sVal) && (null==p_sDefault))
+ if (Util.isNullString(sVal) && (null==p_sDefault))
throw new Exception(formatLogMsg("Missing or invalid <"+p_sAtt+"> attribute"));
return sVal;
Modified: labs/jbossesb/branches/refactor/product/core/listeners/src/org/jboss/soa/esb/listeners/BetterDirListener.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/listeners/src/org/jboss/soa/esb/listeners/BetterDirListener.java 2006-08-06 14:53:23 UTC (rev 5509)
+++ labs/jbossesb/branches/refactor/product/core/listeners/src/org/jboss/soa/esb/listeners/BetterDirListener.java 2006-08-06 15:03:46 UTC (rev 5510)
@@ -143,7 +143,7 @@
FileEndsWith(String p_sEnd) throws Exception
{
m_sSuffix = p_sEnd;
- if (EsbUtil.isNullString(m_sSuffix))
+ if (Util.isNullString(m_sSuffix))
throw new Exception("Must specify file extension");
} //_________________________________________
@@ -160,7 +160,7 @@
private DomElement m_oParms;
private Logger m_oLogger;
public FileChildProcess(Class p_oExec, Observer p_oObs, DomElement p_oP)
- { m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
+ { m_oLogger = Util.getDefaultLogger(this.getClass());
m_oExecClass = p_oExec;
this.addObserver(p_oObs);
m_oParms = p_oP;
Modified: labs/jbossesb/branches/refactor/product/core/listeners/src/org/jboss/soa/esb/listeners/JmsQueueListener.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/listeners/src/org/jboss/soa/esb/listeners/JmsQueueListener.java 2006-08-06 14:53:23 UTC (rev 5509)
+++ labs/jbossesb/branches/refactor/product/core/listeners/src/org/jboss/soa/esb/listeners/JmsQueueListener.java 2006-08-06 15:03:46 UTC (rev 5510)
@@ -63,7 +63,7 @@
public JmsQueueListener(String p_sParamsUid) throws Exception
{
- m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
+ m_oLogger = Util.getDefaultLogger(this.getClass());
m_oParmRepos = ParamRepositoryFactory.getInstance();
m_oParmName = p_sParamsUid;
@@ -136,10 +136,10 @@
m_oTopicSubs = null;
String sStopTopic = m_oParms.getAttr(PARM_QUIESCE_TOPIC);
- if (EsbUtil.isNullString(sStopTopic))
+ if (Util.isNullString(sStopTopic))
return;
String sFactClass = m_oParms.getAttr(PARM_TOPIC_CONN_FACT);
- if (EsbUtil.isNullString(sFactClass))
+ if (Util.isNullString(sFactClass))
sFactClass = "ConnectionFactory";
String sJndiType = SystemProperties.getJndiServerType();
@@ -155,7 +155,7 @@
m_oTopicConn.start();
String sSelector = m_oParms.getAttr(PARM_QUIESCE_SELECTOR);
- if (EsbUtil.isNullString(sSelector))
+ if (Util.isNullString(sSelector))
sSelector = "processor='"+getClass().getSimpleName()+"'";
m_oTopicSubs = m_oSession.createSubscriber(m_oTopic, sSelector,true);
}
@@ -320,7 +320,7 @@
String sVal = p_oP.getAttr(p_sAtt);
if (null==sVal)
sVal = p_sDefault;
- if (EsbUtil.isNullString(sVal) && (null==p_sDefault))
+ if (Util.isNullString(sVal) && (null==p_sDefault))
throw new Exception(formatLogMsg("Missing or invalid <"+p_sAtt+"> attribute"));
return sVal;
@@ -338,7 +338,7 @@
m_sSelector = obtainAtt(p_oP,LISTEN_MSG_SELECTOR,null);
String sClass = obtainAtt(p_oP,PARM_ACTION_CLASS,null);
- if (EsbUtil.isNullString(sClass))
+ if (Util.isNullString(sClass))
throw new Exception(formatLogMsg("Missing value for "+PARM_ACTION_CLASS));
m_oExecClass = Class.forName(sClass);
Constructor m_oConstructor = m_oExecClass.getConstructor
@@ -357,7 +357,7 @@
String sQueue = p_oP.getAttr(LISTEN_QUEUE);
String sFactClass = p_oP.getAttr(LISTEN_QUEUE_CONN_FACT);
- if (EsbUtil.isNullString(sFactClass))
+ if (Util.isNullString(sFactClass))
sFactClass = "ConnectionFactory";
String sJndiType = SystemProperties.getJndiServerType();
Modified: labs/jbossesb/branches/refactor/product/core/listeners/src/org/jboss/soa/esb/listeners/OldDirListener.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/listeners/src/org/jboss/soa/esb/listeners/OldDirListener.java 2006-08-06 14:53:23 UTC (rev 5509)
+++ labs/jbossesb/branches/refactor/product/core/listeners/src/org/jboss/soa/esb/listeners/OldDirListener.java 2006-08-06 15:03:46 UTC (rev 5510)
@@ -73,7 +73,7 @@
public OldDirListener(String p_sParamsUid) throws Exception
{
- m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
+ m_oLogger = Util.getDefaultLogger(this.getClass());
m_oParmRepos = ParamRepositoryFactory.getInstance();
while (loadParmsCycle(p_sParamsUid)) {}
} //__________________________________
@@ -390,7 +390,7 @@
private DomElement m_oParms;
private Logger m_oLogger;
public ChildProcess(Class p_oExec, Observer p_oObs, DomElement p_oP)
- { m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
+ { m_oLogger = Util.getDefaultLogger(this.getClass());
m_oExecClass = p_oExec;
this.addObserver(p_oObs);
m_oParms = p_oP;
Modified: labs/jbossesb/branches/refactor/product/core/listeners/src/org/jboss/soa/esb/listeners/SqlTablePoller.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/listeners/src/org/jboss/soa/esb/listeners/SqlTablePoller.java 2006-08-06 14:53:23 UTC (rev 5509)
+++ labs/jbossesb/branches/refactor/product/core/listeners/src/org/jboss/soa/esb/listeners/SqlTablePoller.java 2006-08-06 15:03:46 UTC (rev 5510)
@@ -349,7 +349,7 @@
.append(" from ") .append(m_oVals.get(TABLE_ATT.tableName.toString()));
String sAux = m_oVals.get(OPTIONAL_ATT.whereCondition.toString());
- boolean bWhere = ! EsbUtil.isNullString(sAux);
+ boolean bWhere = ! Util.isNullString(sAux);
if (bWhere)
sb.append(" where ").append(sAux);
sb.append((bWhere) ? " and " : " where ");
@@ -361,7 +361,7 @@
sAux = m_oVals.get(OPTIONAL_ATT.orderBy);
- if (! EsbUtil.isNullString(sAux))
+ if (! Util.isNullString(sAux))
sb.append(" order by ").append(sAux);
return sb.toString();
} //________________________________
Modified: labs/jbossesb/branches/refactor/product/core/processors/src/org/jboss/soa/esb/processors/AbstractProcessor.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/processors/src/org/jboss/soa/esb/processors/AbstractProcessor.java 2006-08-06 14:53:23 UTC (rev 5509)
+++ labs/jbossesb/branches/refactor/product/core/processors/src/org/jboss/soa/esb/processors/AbstractProcessor.java 2006-08-06 15:03:46 UTC (rev 5510)
@@ -89,7 +89,7 @@
protected AbstractProcessor(DomElement p_oParms, boolean p_bLogInit) throws Exception
{
- m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
+ m_oLogger = Util.getDefaultLogger(this.getClass());
m_oParms = p_oParms;
try { m_oInstP = m_oParms.getFirstElementChild(PARMS_THIS_INSTANCE); }
Modified: labs/jbossesb/branches/refactor/product/core/processors/src/org/jboss/soa/esb/processors/AbstractSaxProcessor.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/processors/src/org/jboss/soa/esb/processors/AbstractSaxProcessor.java 2006-08-06 14:53:23 UTC (rev 5509)
+++ labs/jbossesb/branches/refactor/product/core/processors/src/org/jboss/soa/esb/processors/AbstractSaxProcessor.java 2006-08-06 15:03:46 UTC (rev 5510)
@@ -59,7 +59,7 @@
protected AbstractSaxProcessor(File p_oF, AbstractProcessor p_oProc, int p_iOutType)
throws Exception
- { m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
+ { m_oLogger = Util.getDefaultLogger(this.getClass());
m_oProcessor = p_oProc;
m_oProcessor.setOutputType(p_iOutType);
Modified: labs/jbossesb/branches/refactor/product/core/processors/src/org/jboss/soa/esb/processors/AbstractSqlProcessor.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/processors/src/org/jboss/soa/esb/processors/AbstractSqlProcessor.java 2006-08-06 14:53:23 UTC (rev 5509)
+++ labs/jbossesb/branches/refactor/product/core/processors/src/org/jboss/soa/esb/processors/AbstractSqlProcessor.java 2006-08-06 15:03:46 UTC (rev 5510)
@@ -55,7 +55,7 @@
protected AbstractSqlProcessor(File p_oF, AbstractProcessor p_oProc, int p_iOutType)
throws Exception
- { m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
+ { m_oLogger = Util.getDefaultLogger(this.getClass());
m_oProcessor= p_oProc;
m_oProcessor.setOutputType(p_iOutType);
m_oParms = m_oProcessor.cloneParams();
Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/BobjStore.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/BobjStore.java 2006-08-06 14:53:23 UTC (rev 5509)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/BobjStore.java 2006-08-06 15:03:46 UTC (rev 5510)
@@ -88,7 +88,7 @@
}
}
} catch (Exception e) {
- EsbUtil.getDefaultLogger(BobjStore.class).error(
+ Util.getDefaultLogger(BobjStore.class).error(
"BobjStore configuration FAILED", e);
}
@@ -207,7 +207,7 @@
} // ________________________________
private void addLocatorTable(String p_s) {
- if (EsbUtil.isNullString(p_s))
+ if (Util.isNullString(p_s))
return;
if (null == m_olLocators)
m_olLocators = new ArrayList<String>();
@@ -243,7 +243,7 @@
* @see BobjStore#getStore(BusinessObject)
*/
public static BobjStore getStore(String p_sClassName) {
- if (EsbUtil.isNullString(p_sClassName))
+ if (Util.isNullString(p_sClassName))
return null;
return s_oStoreMap.get(p_sClassName);
} // __________________________________
Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoBatchTable.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoBatchTable.java 2006-08-06 14:53:23 UTC (rev 5509)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoBatchTable.java 2006-08-06 15:03:46 UTC (rev 5510)
@@ -51,7 +51,7 @@
*/
public DaoBatchTable(JdbcCleanConn p_oConn,String p_sTblName) throws Exception
{ super(p_oConn,p_sTblName);
- m_oLog = EsbUtil.getDefaultLogger(this.getClass());
+ m_oLog = Util.getDefaultLogger(this.getClass());
m_oConn = p_oConn;
m_oaPS = new PreparedStatement[PS_MAX];
} //________________________________
Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoIndexTable.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoIndexTable.java 2006-08-06 14:53:23 UTC (rev 5509)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoIndexTable.java 2006-08-06 15:03:46 UTC (rev 5510)
@@ -61,7 +61,7 @@
*/
public DaoIndexTable(JdbcCleanConn p_oConn,String p_sTbl) throws Exception
{ super(p_oConn,p_sTbl);
- m_oLog = EsbUtil.getDefaultLogger(this.getClass());
+ m_oLog = Util.getDefaultLogger(this.getClass());
m_oConn = p_oConn;
if (null != m_oaFields)
{ m_oaFields[OBJECT_UID].setPrimaryKey(true);
Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoSnapTable.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoSnapTable.java 2006-08-06 14:53:23 UTC (rev 5509)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoSnapTable.java 2006-08-06 15:03:46 UTC (rev 5510)
@@ -27,7 +27,7 @@
import org.apache.log4j.*;
import org.jboss.soa.esb.common.*;
-import org.jboss.soa.esb.util.EsbUtil;
+import org.jboss.soa.esb.util.Util;
import org.jboss.soa.esb.util.BobjStdDTO;
import org.jboss.soa.esb.helpers.persist.*;
import org.jboss.soa.esb.services.*;
@@ -62,7 +62,7 @@
*/
public DaoSnapTable(JdbcCleanConn p_oConn,BobjStore p_oST) throws Exception
{ super(p_oConn,p_oST.getSnapTable());
- m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
+ m_oLogger = Util.getDefaultLogger(this.getClass());
m_oConn = p_oConn;
m_oST = p_oST;
if (null != m_oaFields)m_oaFields[UID_SNAP].setPrimaryKey(true);
Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoUidTable.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoUidTable.java 2006-08-06 14:53:23 UTC (rev 5509)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoUidTable.java 2006-08-06 15:03:46 UTC (rev 5510)
@@ -62,7 +62,7 @@
*/
public DaoUidTable(JdbcCleanConn p_oConn,String p_sTblName) throws Exception
{ super(p_oConn,p_sTblName);
- m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
+ m_oLogger = Util.getDefaultLogger(this.getClass());
if (null != m_oaFields)
{ m_oaFields[UID].setPrimaryKey(true);
}
Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerBean.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerBean.java 2006-08-06 14:53:23 UTC (rev 5509)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerBean.java 2006-08-06 15:03:46 UTC (rev 5510)
@@ -106,7 +106,7 @@
private void getResources() throws Exception
{ Context oCtx = new InitialContext();
- m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
+ m_oLogger = Util.getDefaultLogger(this.getClass());
m_oUidConn = new JdbcCleanConn ((DataSource)oCtx.lookup("java:JbossEsbDS"));
m_oDataConn = new JdbcCleanConn ((DataSource)oCtx.lookup("java:JbossEsbDS"));
} //__________________________________
Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerBean.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerBean.java 2006-08-06 14:53:23 UTC (rev 5509)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerBean.java 2006-08-06 15:03:46 UTC (rev 5510)
@@ -64,7 +64,7 @@
@Init
public void ejbCreate() throws Exception
{ try
- { m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
+ { m_oLogger = Util.getDefaultLogger(this.getClass());
// Context oCtxInit =
new InitialContext();
Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerBean.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerBean.java 2006-08-06 14:53:23 UTC (rev 5509)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerBean.java 2006-08-06 15:03:46 UTC (rev 5510)
@@ -74,7 +74,7 @@
@Init
public void create() throws Exception
{ try
- { m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
+ { m_oLogger = Util.getDefaultLogger(this.getClass());
Context oCtxInit = new InitialContext();
String sDSjndiName = BobjStore.getDataSourceJndi();
DataSource oDS = (DataSource)oCtxInit.lookup(sDSjndiName);
Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/msglistener/AbstractEsbMsgDrivenBean.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/msglistener/AbstractEsbMsgDrivenBean.java 2006-08-06 14:53:23 UTC (rev 5509)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/msglistener/AbstractEsbMsgDrivenBean.java 2006-08-06 15:03:46 UTC (rev 5510)
@@ -136,7 +136,7 @@
*/
public void onMessage(Message p_oMsg)
{ if (null==m_oLogger)
- m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
+ m_oLogger = Util.getDefaultLogger(this.getClass());
// If the service name is null/blank then use the class name as the service name
try
{
More information about the jboss-svn-commits
mailing list