[wsas-java-dev] svn commit r1256 - in trunk/wsas/java/modules: admin/src/org/wso2/wsas/admin/service admin/src/org/wso2/wsas/admin/service/logging admin/src/org/wso2/wsas/admin/service/util core/conf/hibernate core/src/org/wso2/wsas core/src/org/wso2/wsas/deployment core/src/org/wso2/wsas/persistence core/src/org/wso2/wsas/security core/src/org/wso2/wsas/security/pox core/src/org/wso2/wsas/transport core/src/org/wso2/wsas/transport/util core/src/org/wso2/wsas/trust core/src/org/wso2/wsas/util core/test/org/wso2/wsas/persistence integration/test/org/wso2/tracer/service

svn at wso2.org svn at wso2.org
Thu Mar 15 00:40:33 PDT 2007


Author: azeez
Date: Thu Mar 15 00:39:27 2007
New Revision: 1256

Modified:
   trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/GlobalAdmin.java
   trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ModuleAdmin.java
   trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/OperationAdmin.java
   trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/SecurityScenarioConfigAdmin.java
   trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java
   trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceGroupAdmin.java
   trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/TransportAdmin.java
   trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/UserAdmin.java
   trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/logging/LoggingAdmin.java
   trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/AdminDatabaseAuthenticator.java
   trunk/wsas/java/modules/core/conf/hibernate/wso2wsas.hbm.xml
   trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerManager.java
   trunk/wsas/java/modules/core/src/org/wso2/wsas/deployment/DeploymentInterceptor.java
   trunk/wsas/java/modules/core/src/org/wso2/wsas/deployment/ServerConfigurator.java
   trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java
   trunk/wsas/java/modules/core/src/org/wso2/wsas/security/ServerCrypto.java
   trunk/wsas/java/modules/core/src/org/wso2/wsas/security/ServicePasswordCallbackHandler.java
   trunk/wsas/java/modules/core/src/org/wso2/wsas/security/pox/POXSecurityHandler.java
   trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/WSASServlet.java
   trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/util/HttpGetRequestProcessor.java
   trunk/wsas/java/modules/core/src/org/wso2/wsas/trust/SecurityTokenStore.java
   trunk/wsas/java/modules/core/src/org/wso2/wsas/util/KeyStoreUtil.java
   trunk/wsas/java/modules/core/src/org/wso2/wsas/util/LoggingUtil.java
   trunk/wsas/java/modules/core/src/org/wso2/wsas/util/TracePersisterImpl.java
   trunk/wsas/java/modules/core/test/org/wso2/wsas/persistence/PersistenceTest.java
   trunk/wsas/java/modules/integration/test/org/wso2/tracer/service/TracerServiceIntegrationTest.java
Log:
Refactoring code



Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/GlobalAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/GlobalAdmin.java	(original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/GlobalAdmin.java	Thu Mar 15 00:39:27 2007
@@ -59,9 +59,7 @@
 public class GlobalAdmin extends AbstractAdmin {
 
     private static final Log log = LogFactory.getLog(GlobalAdmin.class);
-    private PersistenceManager pm =
-            new PersistenceManager(HibernateConfigFactory.
-                    getDefaultConfig(ServerConstants.WSO2WSAS_HB_CONFIG_KEY));
+    private PersistenceManager pm = new PersistenceManager();
 
     /**
      * List hnadlers in a given phase (global)

Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ModuleAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ModuleAdmin.java	(original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ModuleAdmin.java	Thu Mar 15 00:39:27 2007
@@ -69,9 +69,7 @@
     private static final QName RAMPART_QN = new QName("rampart");
     private static Log log = LogFactory.getLog(ModuleAdmin.class);
 
-    private PersistenceManager pm =
-            new PersistenceManager(HibernateConfigFactory.
-                    getDefaultConfig(ServerConstants.WSO2WSAS_HB_CONFIG_KEY));
+    private PersistenceManager pm = new PersistenceManager();
 
     public ModuleAdmin() {
     }

Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/OperationAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/OperationAdmin.java	(original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/OperationAdmin.java	Thu Mar 15 00:39:27 2007
@@ -259,8 +259,7 @@
         Parameter parameter = ParameterUtil.createParameter(parameterElement);
 
         // Persist the parameter
-        PersistenceManager pm = new PersistenceManager(HibernateConfigFactory.getDefaultConfig(
-                org.wso2.wsas.ServerConstants.WSO2WSAS_HB_CONFIG_KEY));
+        PersistenceManager pm = new PersistenceManager();
         Parameter p = axisOp.getParameter(parameter.getName());
 
         if (p != null) {

Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/SecurityScenarioConfigAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/SecurityScenarioConfigAdmin.java	(original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/SecurityScenarioConfigAdmin.java	Thu Mar 15 00:39:27 2007
@@ -70,9 +70,7 @@
     public static final String ENCRYPTION_USER = "rampart.config.encryption.user";
     public static final Log log = LogFactory.getLog(SecurityScenarioConfigAdmin.class);
 
-    private PersistenceManager pm =
-            new PersistenceManager(HibernateConfigFactory.
-                getDefaultConfig(ServerConstants.WSO2WSAS_HB_CONFIG_KEY));
+    private PersistenceManager pm = new PersistenceManager();
     private String scenarioDir =
             System.getProperty(ServerConstants.WSO2WSAS_HOME) + File.separator + "conf" +
             File.separator + "rampart" + File.separator;

Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java	(original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java	Thu Mar 15 00:39:27 2007
@@ -61,9 +61,7 @@
     private static final String SERVICE_MUST_CONTAIN_AT_LEAST_ONE_TRANSPORT =
             "Cannot remove transport binding. " +
             "<br/>A service must contain at least one transport binding!";
-    private PersistenceManager pm =
-            new PersistenceManager(HibernateConfigFactory.
-                    getDefaultConfig(ServerConstants.WSO2WSAS_HB_CONFIG_KEY));
+    private PersistenceManager pm = new PersistenceManager();
 
     public ServiceAdmin() {
     }

Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceGroupAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceGroupAdmin.java	(original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceGroupAdmin.java	Thu Mar 15 00:39:27 2007
@@ -44,9 +44,7 @@
  */
 public class ServiceGroupAdmin extends AbstractAdmin {
 
-    private PersistenceManager pm =
-            new PersistenceManager(HibernateConfigFactory.
-                    getDefaultConfig(ServerConstants.WSO2WSAS_HB_CONFIG_KEY));
+    private PersistenceManager pm = new PersistenceManager();
 
     /**
      * List all the available service groups

Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/TransportAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/TransportAdmin.java	(original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/TransportAdmin.java	Thu Mar 15 00:39:27 2007
@@ -38,9 +38,7 @@
  *
  */
 public class TransportAdmin extends AbstractAdmin {
-    private PersistenceManager pm =
-            new PersistenceManager(HibernateConfigFactory.
-                    getDefaultConfig(ServerConstants.WSO2WSAS_HB_CONFIG_KEY));
+    private PersistenceManager pm = new PersistenceManager();
 
     public TransportSummary[] listTransports() {
         TransportDO[] transports = pm.getTransports();

Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/UserAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/UserAdmin.java	(original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/UserAdmin.java	Thu Mar 15 00:39:27 2007
@@ -41,8 +41,7 @@
     private PersistenceManager pm;
 
     public UserAdmin() {
-        pm = new PersistenceManager(HibernateConfigFactory.getDefaultConfig(
-                ServerConstants.WSO2WSAS_HB_CONFIG_KEY));
+        pm = new PersistenceManager();
     }
 
     public void addAdmin(String userName, String password)

Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/logging/LoggingAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/logging/LoggingAdmin.java	(original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/logging/LoggingAdmin.java	Thu Mar 15 00:39:27 2007
@@ -36,9 +36,7 @@
  */
 public class LoggingAdmin {
     private static Logger log = Logger.getLogger(LoggingAdmin.class);
-    private PersistenceManager pm =
-            new PersistenceManager(HibernateConfigFactory.
-                    getDefaultConfig(ServerConstants.WSO2WSAS_HB_CONFIG_KEY));
+    private PersistenceManager pm = new PersistenceManager();
 
     /**
      * Update the System Log Level

Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/AdminDatabaseAuthenticator.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/AdminDatabaseAuthenticator.java	(original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/AdminDatabaseAuthenticator.java	Thu Mar 15 00:39:27 2007
@@ -39,8 +39,7 @@
 
     public boolean authenticate(String userName, String password,
                                 ConfigurationContext configCtx) {
-        PersistenceManager pm = new PersistenceManager(HibernateConfigFactory.getDefaultConfig(
-                ServerConstants.WSO2WSAS_HB_CONFIG_KEY));
+        PersistenceManager pm = new PersistenceManager();
 
         ServiceUserDO admin = pm.getUser(userName);
 

Modified: trunk/wsas/java/modules/core/conf/hibernate/wso2wsas.hbm.xml
==============================================================================
--- trunk/wsas/java/modules/core/conf/hibernate/wso2wsas.hbm.xml	(original)
+++ trunk/wsas/java/modules/core/conf/hibernate/wso2wsas.hbm.xml	Thu Mar 15 00:39:27 2007
@@ -456,8 +456,6 @@
         <property name="lastUpdatedTime" type="timestamp" column="c_last_updated" not-null="true"/>
 
         <property name="uuid" column="c_uuid" not-null="true"/>
-        <!-- TODO: We'll need to use another data type which accomodates larger strings-->
-        <!--<property name="policy" column="policy" not-null="true" length="32672"/>-->
         <property name="policy" column="c_policy" not-null="true" type="text" length="1000000"/>
         <property name="type" column="c_type" not-null="true"/>
 

Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerManager.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerManager.java	(original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerManager.java	Thu Mar 15 00:39:27 2007
@@ -96,8 +96,7 @@
 
     private ServerManager() {
         this.serverConfig = ServerConfiguration.getInstance();
-        pm = new PersistenceManager(HibernateConfigFactory.
-                getDefaultConfig(ServerConstants.WSO2WSAS_HB_CONFIG_KEY));
+        pm = new PersistenceManager();
     }
 
     public void start() throws ServerException {

Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/deployment/DeploymentInterceptor.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/deployment/DeploymentInterceptor.java	(original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/deployment/DeploymentInterceptor.java	Thu Mar 15 00:39:27 2007
@@ -53,9 +53,7 @@
     private AxisConfiguration axisConfig;
 
     public void init(AxisConfiguration axisConfig) {
-        persistenceMgr =
-                new PersistenceManager(HibernateConfigFactory.
-                        getDefaultConfig(ServerConstants.WSO2WSAS_HB_CONFIG_KEY));
+        persistenceMgr = new PersistenceManager();
         this.axisConfig = axisConfig;
     }
 

Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/deployment/ServerConfigurator.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/deployment/ServerConfigurator.java	(original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/deployment/ServerConfigurator.java	Thu Mar 15 00:39:27 2007
@@ -211,9 +211,7 @@
         }
         // -----------------------------------------------------------------------------------------
 
-        PersistenceManager pm =
-                new PersistenceManager(HibernateConfigFactory.
-                        getDefaultConfig(ServerConstants.WSO2WSAS_HB_CONFIG_KEY));
+        PersistenceManager pm = new PersistenceManager();
 
         // Check whether the user has removed transports from Axis2.xml
         TransportDO[] transports = pm.getTransports();

Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java	(original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java	Thu Mar 15 00:39:27 2007
@@ -90,6 +90,8 @@
 import org.wso2.wsas.util.HibernateConfig;
 import org.wso2.wsas.util.ModuleIdUtil;
 import org.wso2.wsas.util.ParameterUtil;
+import org.wso2.wsas.util.HibernateConfigFactory;
+import org.wso2.wsas.ServerConstants;
 
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLOutputFactory;
@@ -110,8 +112,10 @@
     private HibernateConfig hbConfig;
     private static Log log = LogFactory.getLog(PersistenceManager.class);
 
-    public PersistenceManager(HibernateConfig hbConfig) {
-        this.hbConfig = hbConfig;
+    public PersistenceManager() {
+        this.hbConfig =
+                HibernateConfigFactory.
+                    getDefaultConfig(ServerConstants.WSO2WSAS_HB_CONFIG_KEY);
     }
 
     public Long addModule(ModuleDO module) throws ModuleAlreadyExistsException {

Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/security/ServerCrypto.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/security/ServerCrypto.java	(original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/security/ServerCrypto.java	Thu Mar 15 00:39:27 2007
@@ -97,9 +97,7 @@
     public ServerCrypto(Properties prop, ClassLoader loader)
             throws CredentialException, IOException {
 
-        persistenceMgr =
-                new PersistenceManager(HibernateConfigFactory.
-                        getDefaultConfig(ServerConstants.WSO2WSAS_HB_CONFIG_KEY));
+        persistenceMgr = new PersistenceManager();
 
         this.properties = prop;
 

Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/security/ServicePasswordCallbackHandler.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/security/ServicePasswordCallbackHandler.java	(original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/security/ServicePasswordCallbackHandler.java	Thu Mar 15 00:39:27 2007
@@ -107,9 +107,7 @@
 
 
     private String getPrivateKeyPassword(String username) throws IOException {
-        PersistenceManager pm =
-                new PersistenceManager(HibernateConfigFactory.
-                        getDefaultConfig(ServerConstants.WSO2WSAS_HB_CONFIG_KEY));
+        PersistenceManager pm = new PersistenceManager();
         KeyStoreDO ksDO = pm.getService(serviceId, serviceVersion).getPrivateKeyStore();
         if (username.equals(ksDO.getPrivateKeyAlias())) {
             try {
@@ -135,9 +133,7 @@
      * @return The password corresponding to the username
      */
     private String getPassword(String username, String serviceId, String serviceVersion) {
-        PersistenceManager pm =
-                new PersistenceManager(HibernateConfigFactory.
-                        getDefaultConfig(ServerConstants.WSO2WSAS_HB_CONFIG_KEY));
+        PersistenceManager pm = new PersistenceManager();
         if (serviceVersion == null || serviceVersion.trim().length() == 0) {
             serviceVersion = ServiceIdentifierDO.EMPTY_SERVICE_VERSION;
         }

Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/security/pox/POXSecurityHandler.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/security/pox/POXSecurityHandler.java	(original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/security/pox/POXSecurityHandler.java	Thu Mar 15 00:39:27 2007
@@ -52,9 +52,7 @@
             
     private HandlerDescription description;
 
-    private PersistenceManager pm =
-        new PersistenceManager(HibernateConfigFactory.getDefaultConfig(
-                org.wso2.wsas.ServerConstants.WSO2WSAS_HB_CONFIG_KEY));
+    private PersistenceManager pm = new PersistenceManager();
     /**
      * @see org.apache.axis2.engine.Handler#cleanup()
      */

Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/WSASServlet.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/WSASServlet.java	(original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/WSASServlet.java	Thu Mar 15 00:39:27 2007
@@ -49,7 +49,7 @@
      */
     protected void doGet(HttpServletRequest request,
                          HttpServletResponse response) throws ServletException, IOException {
-
+                               
         initContextRoot(request);
 
         try {

Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/util/HttpGetRequestProcessor.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/util/HttpGetRequestProcessor.java	(original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/util/HttpGetRequestProcessor.java	Thu Mar 15 00:39:27 2007
@@ -58,9 +58,7 @@
  */
 public class HttpGetRequestProcessor {
     private static Log log = LogFactory.getLog(HttpGetRequestProcessor.class);
-    private static PersistenceManager pm =
-            new PersistenceManager(HibernateConfigFactory.
-                    getDefaultConfig(ServerConstants.WSO2WSAS_HB_CONFIG_KEY));
+    private static PersistenceManager pm = new PersistenceManager();
 
     public static void processCert(ConfigurationContext configurationContext,
                                    HttpServletResponse response, HttpServletRequest request)

Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/trust/SecurityTokenStore.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/trust/SecurityTokenStore.java	(original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/trust/SecurityTokenStore.java	Thu Mar 15 00:39:27 2007
@@ -28,9 +28,7 @@
  * 
  */
 public class SecurityTokenStore extends SimpleTokenStore {
-    private PersistenceManager pm =
-            new PersistenceManager(HibernateConfigFactory.
-                    getDefaultConfig(ServerConstants.WSO2WSAS_HB_CONFIG_KEY));
+    private PersistenceManager pm = new PersistenceManager();
 
     public SecurityTokenStore() throws TrustException {
 

Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/util/KeyStoreUtil.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/util/KeyStoreUtil.java	(original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/util/KeyStoreUtil.java	Thu Mar 15 00:39:27 2007
@@ -40,9 +40,7 @@
  */
 public final class KeyStoreUtil {
 
-    private static PersistenceManager pm =
-            new PersistenceManager(HibernateConfigFactory.
-                    getDefaultConfig(ServerConstants.WSO2WSAS_HB_CONFIG_KEY));
+    private static PersistenceManager pm = new PersistenceManager();
     private static Log log = LogFactory.getLog(KeyStoreUtil.class);
 
     private KeyStoreUtil() {

Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/util/LoggingUtil.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/util/LoggingUtil.java	(original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/util/LoggingUtil.java	Thu Mar 15 00:39:27 2007
@@ -34,9 +34,7 @@
  * 
  */
 public class LoggingUtil {
-    private static PersistenceManager pm =
-            new PersistenceManager(HibernateConfigFactory.
-                    getDefaultConfig(ServerConstants.WSO2WSAS_HB_CONFIG_KEY));
+    private static PersistenceManager pm = new PersistenceManager();
 
     public static void loadDefaultConfiguration() {
 

Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/util/TracePersisterImpl.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/util/TracePersisterImpl.java	(original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/util/TracePersisterImpl.java	Thu Mar 15 00:39:27 2007
@@ -46,9 +46,7 @@
     private static Log log = LogFactory.getLog(TracePersisterImpl.class);
     private MessageContext msgContext;
 
-    private PersistenceManager pm =
-                new PersistenceManager(HibernateConfigFactory.
-                        getDefaultConfig(ServerConstants.WSO2WSAS_HB_CONFIG_KEY));
+    private PersistenceManager pm = new PersistenceManager();
 
     public void setMsgContext(MessageContext msgContext) {
         this.msgContext = msgContext;
@@ -141,8 +139,7 @@
             Object counterInt = monitoringHandlerMap.get(key);
 
             if (counterInt == null) {
-                PersistenceManager pm = new PersistenceManager(HibernateConfigFactory.getDefaultConfig(
-                        ServerConstants.WSO2WSAS_HB_CONFIG_KEY));
+                PersistenceManager pm = new PersistenceManager();
                 msgSequence = pm.getMaxMessageSequence(serviceName,
                                                        ServiceIdentifierDO.EMPTY_SERVICE_VERSION, //TODO: replace this with service version when it is available
                                                        operationName) + 1;

Modified: trunk/wsas/java/modules/core/test/org/wso2/wsas/persistence/PersistenceTest.java
==============================================================================
--- trunk/wsas/java/modules/core/test/org/wso2/wsas/persistence/PersistenceTest.java	(original)
+++ trunk/wsas/java/modules/core/test/org/wso2/wsas/persistence/PersistenceTest.java	Thu Mar 15 00:39:27 2007
@@ -40,8 +40,7 @@
 
     protected void setUp() throws Exception {
         System.setProperty(ServerConstants.DERBY_HOME, "conf");
-        hbConfig = HibernateConfigFactory.getDefaultConfig(ServerConstants.WSO2WSAS_HB_CONFIG_KEY);
-        pm = new PersistenceManager(hbConfig);
+        pm = new PersistenceManager();
     }
 
     public void testAddAdminAccount() {

Modified: trunk/wsas/java/modules/integration/test/org/wso2/tracer/service/TracerServiceIntegrationTest.java
==============================================================================
--- trunk/wsas/java/modules/integration/test/org/wso2/tracer/service/TracerServiceIntegrationTest.java	(original)
+++ trunk/wsas/java/modules/integration/test/org/wso2/tracer/service/TracerServiceIntegrationTest.java	Thu Mar 15 00:39:27 2007
@@ -50,7 +50,7 @@
 
             HibernateConfig hbConfig =
                     HibernateConfigFactory.getDefaultConfig(ServerConstants.WSO2WSAS_HB_CONFIG_KEY);
-            persistenceMgr = new PersistenceManager(hbConfig);
+            persistenceMgr = new PersistenceManager();
             serviceName = new QName("TracerService");
 
             ConfigurationContext configContext = null;




More information about the Wsas-java-dev mailing list