0001701: Re-add support for db.spring.bean.name. Also added web.xml i…

…nit parameter to tell symmetric to look for and use a webapp's application context
JumpMind · Apr 30, 2014 · 272a4c6 · 272a4c6
1 parent e39e21c
commit 272a4c6
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 9 deletions.
diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/ClientSymmetricEngine.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/ClientSymmetricEngine.java
@@ -163,14 +163,18 @@ protected SecurityServiceType getSecurityServiceType() {
     @Override
     protected void init() {
         try {
-            super.init();
 
+            this.propertiesFactory = createTypedPropertiesFactory();
+
+            this.securityService = SecurityServiceFactory.create(getSecurityServiceType(), propertiesFactory.reload());
+            TypedProperties properties = this.propertiesFactory.reload();
+
             PropertyPlaceholderConfigurer configurer = new PropertyPlaceholderConfigurer();
-            configurer.setProperties(parameterService.getAllParameters());
-
+            configurer.setProperties(properties);
+            
             ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(springContext);
             ctx.addBeanFactoryPostProcessor(configurer);
-
+            
             if (registerEngine) {
                 ctx.setConfigLocations(new String[] { "classpath:/symmetric-ext-points.xml",
                         "classpath:/symmetric-jmx.xml" });
@@ -180,6 +184,10 @@ protected void init() {
             ctx.refresh();
 
             this.springContext = ctx;
+
+            super.init();
+
+
 
             this.dataSource = platform.getDataSource();
 
@@ -248,6 +256,7 @@ public static IDatabasePlatform createDatabasePlatform(ApplicationContext spring
 
             String springBeanName = properties.getProperty(ParameterConstants.DB_SPRING_BEAN_NAME);
             if (isNotBlank(springBeanName)) {
+                log.info("Using datasource from spring.  The spring bean name is {}", springBeanName);
                 dataSource = (DataSource)springContext.getBean(springBeanName);
             }
 

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/AbstractSymmetricEngine.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/AbstractSymmetricEngine.java
@@ -247,14 +247,22 @@ public void setDeploymentType(String deploymentType) {
     protected abstract SecurityServiceType getSecurityServiceType();
 
     protected void init() {
-        this.propertiesFactory = createTypedPropertiesFactory();
-        this.securityService = SecurityServiceFactory.create(getSecurityServiceType(), propertiesFactory.reload());
+        if (propertiesFactory == null) {
+            this.propertiesFactory = createTypedPropertiesFactory();
+        }
+
+        if (securityService == null) {
+            this.securityService = SecurityServiceFactory.create(getSecurityServiceType(),
+                    propertiesFactory.reload());
+        }
+
         TypedProperties properties = this.propertiesFactory.reload();
+
+        MDC.put("engineName", properties.get(ParameterConstants.ENGINE_NAME));
+
         this.platform = createDatabasePlatform(properties);
         this.parameterService = new ParameterService(platform, propertiesFactory, properties.get(
-                ParameterConstants.RUNTIME_CONFIG_TABLE_PREFIX, "sym"));
-
-        MDC.put("engineName", this.parameterService.getEngineName());
+                ParameterConstants.RUNTIME_CONFIG_TABLE_PREFIX, "sym"));        
 
         this.platform.setMetadataIgnoreCase(this.parameterService
                 .is(ParameterConstants.DB_METADATA_IGNORE_CASE));