From: rkv <rkv@opencascade.com>
Date: Tue, 4 Dec 2012 13:22:28 +0000 (+0000)
Subject: Run salome from KERNEL/bin/salome/ directory. Hibernate logging configuration is... 
X-Git-Tag: Root_Delivery1_2012_12_06~14
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=59fe0f65d90c34ef02bb4b4ea2919366d0eb7751;p=tools%2Fsiman.git

Run salome from KERNEL/bin/salome/ directory. Hibernate logging configuration is updated.
---

diff --git a/Workspace/Siman/WebContent/jap/splat-launcher.jar b/Workspace/Siman/WebContent/jap/splat-launcher.jar
index a2ece4e..40a4ad4 100644
Binary files a/Workspace/Siman/WebContent/jap/splat-launcher.jar and b/Workspace/Siman/WebContent/jap/splat-launcher.jar differ
diff --git a/Workspace/Siman/WebContent/jap/splat-signedlauncher.jar b/Workspace/Siman/WebContent/jap/splat-signedlauncher.jar
index cd45d58..7b9637f 100644
Binary files a/Workspace/Siman/WebContent/jap/splat-signedlauncher.jar and b/Workspace/Siman/WebContent/jap/splat-signedlauncher.jar differ
diff --git a/Workspace/Siman/conf/templates/log4j.xml b/Workspace/Siman/conf/templates/log4j.xml
index d1e94de..c65dc09 100644
--- a/Workspace/Siman/conf/templates/log4j.xml
+++ b/Workspace/Siman/conf/templates/log4j.xml
@@ -50,6 +50,15 @@
     <logger name="log4j.logger.org.hibernate">
         <level value="@log4j.logger.org.hibernate.logger.level@" />
     </logger>
+    
+    <logger name="log4j.logger.org.hibernate.type">
+        <level value="@log4j.logger.org.hibernate.logger.level@" />
+    </logger>
+    <logger name="log4j.logger.org.hibernate.SQL">
+        <level value="@log4j.logger.org.hibernate.logger.level@" />
+    </logger>
+    
+    
 
     <category name="com.opensymphony.xwork2.validator">
       <priority value="@com.opensymphony.xwork2.validator.logger.level@"/>
diff --git a/Workspace/Siman/src/org/splat/launcher/ToolbarApplet.java b/Workspace/Siman/src/org/splat/launcher/ToolbarApplet.java
index 6c02458..dd4d356 100644
--- a/Workspace/Siman/src/org/splat/launcher/ToolbarApplet.java
+++ b/Workspace/Siman/src/org/splat/launcher/ToolbarApplet.java
@@ -198,7 +198,8 @@ public class ToolbarApplet extends java.applet.Applet implements ActionListener
 		} else if (!SALOME_HOME.endsWith(File.separator)) {
 			SALOME_HOME += File.separator;
 		}
-		String pathToScript = SALOME_HOME + "runSalome";
+		String pathToScript = SALOME_HOME + "KERNEL" + File.separator + "bin"
+				+ File.separator + "salome" + File.separator + "runSalome";
 
 		// Look for the launching script in the file system
 		File script = new File(pathToScript);
@@ -238,7 +239,8 @@ public class ToolbarApplet extends java.applet.Applet implements ActionListener
 				Runtime.getRuntime().exec(
 						new String[] { script.getAbsolutePath(), params });
 				// Refresh the current scenario view
-				getAppletContext().showDocument(new URL(this.getParameter("refresh")));
+				getAppletContext().showDocument(
+						new URL(this.getParameter("refresh")));
 			} else {
 				// Checkout of the scenario is failed at the beginning.
 				if (response != null) {