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

diff --git a/Workspace/Siman/WebContent/jap/splat-launcher.jar b/Workspace/Siman/WebContent/jap/splat-launcher.jar
index a2ece4ea18727c9ead0ffdb6d2b5a34bf7cd3c4c..40a4ad46303911f414c277b276b7c34590d3f527 100644 (file)
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 cd45d583e517c0cd40b7f95ebacc0a5c1f84399f..7b9637f7bfe635ba0885c2333180354d336bd130 100644 (file)
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 d1e94de858095a29203f9cb1dcf62a3ef3cff356..c65dc09bbd96dc3b86a8221ad802e95d9134a224 100644 (file)
--- 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 6c02458569af3d808f89459d13f6f0422863cbbd..dd4d35633bb5b8106e8145191f6f4c9a4dc342d5 100644 (file)
--- 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) {