[Unicore-cvs-commits] SF.net SVN: unicore:[9347] wsrflite/trunk/core/src/main/java/de/fzj/unicore /wsrflite

[<dai...@us...>]

Revision: 9347
          http://unicore.svn.sourceforge.net/unicore/?rev=9347&view=rev
Author:   daivandy
Date:     2011-03-09 17:04:13 +0000 (Wed, 09 Mar 2011)

Log Message:
-----------


Modified Paths:
--------------
    wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/DeploymentManager.java
    wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/Kernel.java

Modified: wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/DeploymentManager.java
===================================================================
--- wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/DeploymentManager.java	2011-03-09 16:36:06 UTC (rev 9346)
+++ wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/DeploymentManager.java	2011-03-09 17:04:13 UTC (rev 9347)
@@ -300,12 +300,15 @@
 	
 	
 	public Runnable getStartupServicejarDeployer() {
+		if(!dynamicDeploymentActivated) return null;
+		
 		Runnable r = new Runnable() {
 			File jar = null;
 			
 			public void run() {
 					// if the server is already started and service jars haven't been deployed, yet
-					if(dynamicDeploymentActivated && Kernel.getKernel().getServer().getServer().isStarted() && !serviceJarsDeployed) {
+					if(!serviceJarsDeployed && Kernel.getKernel().getServer().getServer().isStarted()) {
+						
 						File dir = new File(pathToServiceJars);						
 						File[] jars = dir.listFiles(new ListFilesByExtensionFilter("jar"));					
 						

Modified: wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/Kernel.java
===================================================================
--- wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/Kernel.java	2011-03-09 16:36:06 UTC (rev 9346)
+++ wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/Kernel.java	2011-03-09 17:04:13 UTC (rev 9347)
@@ -539,11 +539,8 @@
 			 */
 			public void startSynchronous(String conf) throws Exception {
 				long start = System.currentTimeMillis();
-				printHeader();
+				printHeader();				
 				List<Runnable> tasks = deployServices(conf);				
-				
-				tasks.add(DeploymentManager.getInstance().getStartupServicejarDeployer());
-				
 				initGateway();
 				SecurityManager.createAttributeSource();
 
@@ -628,10 +625,19 @@
 			 */
 			private List<Runnable> deployServices(String configFile) throws Exception {
 				List<Runnable> tasks = null;
-				if (configFile == null) {
+				Runnable serviceJarsDeployer = DeploymentManager.getInstance().getStartupServicejarDeployer();
+				
+				if (configFile == null && serviceJarsDeployer==null) {
 					logger.info("No services to deploy.");
 					return tasks;
 				}
+				else if(serviceJarsDeployer!=null) {
+					tasks = new ArrayList<Runnable>();
+					tasks.add(serviceJarsDeployer);
+					return tasks;
+				}	
+					
+					
 				File file = new File(configFile);
 				serviceConfigurator=new ServiceConfigReader(file, 5000);
 				serviceConfigurator.configureServices();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.