Author: ruwan
Date: Wed Apr 30 01:49:00 2008
New Revision: 16373
Log:
Fixing the registry API to incoporate the wso2 Registry changes
Modified:
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusManager.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/statistics/StatisticsReporterThread.java
trunk/esb/java/modules/distribution/src/main/conf/server.xml
Modified:
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusManager.java
==============================================================================
---
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusManager.java
(original)
+++
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusManager.java
Wed Apr 30 01:49:00 2008
@@ -167,6 +167,10 @@
}
log.info("Starting the WSO2 Enterprise Service Bus..");
+
+ // start database server
+ startDataBaseServer();
+
// start Synapse
ServerManager.getInstance().setAxis2Repolocation(sbc.getAxis2Repo());
ServerManager.getInstance().setAxis2Xml(sbc.getAxis2Xml());
@@ -176,8 +180,7 @@
// set ESB defaults to the Synapse config (e.g. Registry)
setESBDefaults(configurationContext);
- // start database server and the statistics reporter
- startDataBaseServer();
+ // start the statistics reporter
startStatisticsReporter();
// generate UI pages and start JMX
Modified:
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/statistics/StatisticsReporterThread.java
==============================================================================
---
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/statistics/StatisticsReporterThread.java
(original)
+++
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/statistics/StatisticsReporterThread.java
Wed Apr 30 01:49:00 2008
@@ -41,9 +41,7 @@
private boolean shutdownRequested = false;
- private PersistenceManager pm = new PersistenceManager(
- HibernateConfigCache.getHibernateConfig(
- ServiceBusConstants.WSO2ESB_HB_CONFIG_KEY,
ServiceBusConstants.HIBERNATE_CFG_XML));
+ private PersistenceManager pm;
/* The reference to the synapse environment */
private SynapseEnvironment synapseEnvironment;
@@ -60,6 +58,8 @@
*/
public StatisticsReporterThread(SynapseEnvironment synapseEnvironment) {
this.synapseEnvironment = synapseEnvironment;
+ this.pm = new
PersistenceManager(HibernateConfigCache.getHibernateConfig(
+ ServiceBusConstants.WSO2ESB_HB_CONFIG_KEY,
ServiceBusConstants.HIBERNATE_CFG_XML));
}
public long getDelay() {
Modified: trunk/esb/java/modules/distribution/src/main/conf/server.xml
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/conf/server.xml
(original)
+++ trunk/esb/java/modules/distribution/src/main/conf/server.xml Wed Apr
30 01:49:00 2008
@@ -35,13 +35,13 @@
<Registry>
<importRoot>file:registry</importRoot>
- <type>inMemory</type>
- <!--<configuration>-->
-
<!--<driverClass>org.apache.derby.jdbc.ClientDriver</driverClass>-->
-
<!--<url>jdbc:derby://localhost:1528/../../../../database/WSO2REGISTRY_DB</url>-->
- <!--<username>wso2esb</username>-->
- <!--<password>wso2esb</password>-->
- <!--</configuration>-->
+ <type>local</type>
+ <configuration>
+ <driverClass>org.apache.derby.jdbc.ClientDriver</driverClass>
+
<url>jdbc:derby://localhost:1528/database/WSO2REGISTRY_DB;create=true</url>
+ <username>wso2esb</username>
+ <password>wso2esb</password>
+ </configuration>
</Registry>
<!-- General Configuration -->
_______________________________________________
Esb-java-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
