From: rkv <rkv@opencascade.com>
Date: Thu, 11 Oct 2012 09:54:41 +0000 (+0000)
Subject: New dependency (CGLIB jar) is added to Siman-Common (for aop:scoped-proxy). Search... 
X-Git-Tag: Root_Delivery1_2012_12_06~170
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=66016fb74b21a6edecd02c036d833f7dd41affc8;p=tools%2Fsiman.git

New dependency (CGLIB jar) is added to Siman-Common (for aop:scoped-proxy). Search and open study actions are fixed. OpenStudy bean is session scoped now.
---

diff --git a/Workspace/Siman-Common/.classpath b/Workspace/Siman-Common/.classpath
index 063fd5a..746d694 100644
--- a/Workspace/Siman-Common/.classpath
+++ b/Workspace/Siman-Common/.classpath
@@ -27,5 +27,6 @@
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
 	<classpathentry exported="true" kind="lib" path="lib/p6spy.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/aopalliance.jar"/>
+	<classpathentry exported="true" kind="lib" path="dist/siman-common.jar" sourcepath="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/Workspace/Siman-Common/lib/cglib-nodep-2.2.3.jar b/Workspace/Siman-Common/lib/cglib-nodep-2.2.3.jar
new file mode 100644
index 0000000..35d6d7c
Binary files /dev/null and b/Workspace/Siman-Common/lib/cglib-nodep-2.2.3.jar differ
diff --git a/Workspace/Siman/.settings/org.eclipse.wst.common.component b/Workspace/Siman/.settings/org.eclipse.wst.common.component
index 477d6d7..97e1bec 100644
--- a/Workspace/Siman/.settings/org.eclipse.wst.common.component
+++ b/Workspace/Siman/.settings/org.eclipse.wst.common.component
@@ -139,6 +139,9 @@
         <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/Siman-Common/lib/aopalliance.jar">
             <dependency-type>uses</dependency-type>
         </dependent-module>
+        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/Siman-Common/lib/cglib-nodep-2.2.3.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
         <property name="java-output-path" value="build/classes"/>
         <property name="context-root" value="siman"/>
     </wb-module>
diff --git a/Workspace/Siman/WebContent/WEB-INF/web.xml b/Workspace/Siman/WebContent/WEB-INF/web.xml
index 88912fb..386e72b 100644
--- a/Workspace/Siman/WebContent/WEB-INF/web.xml
+++ b/Workspace/Siman/WebContent/WEB-INF/web.xml
@@ -10,6 +10,17 @@
 		<welcome-file>index.jsp</welcome-file>
 	</welcome-file-list>
 
+	<filter>
+		<filter-name>RequestContextFilter</filter-name>
+		<filter-class>
+			org.springframework.web.filter.RequestContextFilter
+		</filter-class>
+	</filter>
+	<filter-mapping>
+		<filter-name>RequestContextFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
 	<filter>
 		<filter-name>struts2</filter-name>
 		<filter-class>
@@ -40,5 +51,4 @@
 			org.springframework.web.context.ContextLoaderListener
 		</listener-class>
 	</listener>
-
 </web-app>
diff --git a/Workspace/Siman/WebContent/welcome.jsp b/Workspace/Siman/WebContent/welcome.jsp
index cebdeec..45275c8 100644
--- a/Workspace/Siman/WebContent/welcome.jsp
+++ b/Workspace/Siman/WebContent/welcome.jsp
@@ -22,7 +22,6 @@
 <!-- Title-bar
   -->
     <div id=title-bar><s:text name="message.welcome"/></div>
-
   </body>
 
 </html>
\ No newline at end of file
diff --git a/Workspace/Siman/conf/debug.properties b/Workspace/Siman/conf/debug.properties
index 303bb22..9e6b944 100644
--- a/Workspace/Siman/conf/debug.properties
+++ b/Workspace/Siman/conf/debug.properties
@@ -20,6 +20,8 @@ org.springframework.logger.level=DEBUG
 org.hibernate.logger.level=DEBUG
 org.splat.siman.logger.level=DEBUG
 log4j.logger.org.hibernate.logger.level=DEBUG
+com.opensymphony.xwork2.validator.logger.level=DEBUG
+org.apache.struts2.interceptor.validation.logger.level=DEBUG
 
 # Generated file header
 file.header=Don't edit manually. See the source in @config.src.dir@.
diff --git a/Workspace/Siman/conf/templates/log4j.xml b/Workspace/Siman/conf/templates/log4j.xml
index ae1320e..d3a7190 100644
--- a/Workspace/Siman/conf/templates/log4j.xml
+++ b/Workspace/Siman/conf/templates/log4j.xml
@@ -47,6 +47,14 @@
         <level value="@log4j.logger.org.hibernate.logger.level@" />
     </logger>
 
+    <category name="com.opensymphony.xwork2.validator">
+      <priority value="@com.opensymphony.xwork2.validator.logger.level@"/>
+   </category>
+
+   <category name="org.apache.struts2.interceptor.validation">
+      <priority value="@org.apache.struts2.interceptor.validation.logger.level@"/>
+   </category>
+
    <!-- for all other loggers log only debug and above log messages -->
      <root>
         <priority value="@root.logger.level@"/> 
@@ -54,4 +62,4 @@
 		@root.logger.appender@ 
      </root> 
 
-</log4j:configuration> 
\ No newline at end of file
+</log4j:configuration>
diff --git a/Workspace/Siman/src/hibernate.properties b/Workspace/Siman/src/hibernate.properties
index 92c9ded..46b0718 100644
--- a/Workspace/Siman/src/hibernate.properties
+++ b/Workspace/Siman/src/hibernate.properties
@@ -1,4 +1,4 @@
-# Generated at 10/10/2012 11:56:16
+# Generated at 11/10/2012 11:33:51
 # Don't edit manually. See the source in D:\users\rkv\SIMAN\SIMAN_SRC\Workspace\Siman\conf\templates.
 # Connection properties
 connection.driver_class=com.mysql.jdbc.Driver
diff --git a/Workspace/Siman/src/jdbc.properties b/Workspace/Siman/src/jdbc.properties
index ec862dc..6720228 100644
--- a/Workspace/Siman/src/jdbc.properties
+++ b/Workspace/Siman/src/jdbc.properties
@@ -1,4 +1,4 @@
-# Generated at 10/10/2012 11:56:16
+# Generated at 11/10/2012 11:33:51
 # Don't edit manually. See the source in D:\users\rkv\SIMAN\SIMAN_SRC\Workspace\Siman\conf\templates.
 # Connection properties
 connection.url=jdbc:mysql://localhost/simer
diff --git a/Workspace/Siman/src/org/splat/simer/Action.java b/Workspace/Siman/src/org/splat/simer/Action.java
index 610ca53..c092693 100644
--- a/Workspace/Siman/src/org/splat/simer/Action.java
+++ b/Workspace/Siman/src/org/splat/simer/Action.java
@@ -112,7 +112,7 @@ public class Action extends ActionSupport implements SessionAware {
       _openStudy = aStudy;
     }
     public OpenStudy getOpenStudy () {
-    	_openStudy = (OpenStudy)session.get("study.open");
+//    	_openStudy = (OpenStudy)session.get("study.open");
           return _openStudy;                       // May be null
         }
     protected OpenKnowledge open (KnowledgeElement kelm) {
diff --git a/Workspace/Siman/src/org/splat/simer/DisplayStudyStepAction.java b/Workspace/Siman/src/org/splat/simer/DisplayStudyStepAction.java
index b2d468c..56f5795 100644
--- a/Workspace/Siman/src/org/splat/simer/DisplayStudyStepAction.java
+++ b/Workspace/Siman/src/org/splat/simer/DisplayStudyStepAction.java
@@ -35,7 +35,7 @@ public class DisplayStudyStepAction extends DisplayBaseAction {
       mystudy = getOpenStudy();
       if (myindex != null) try {                                // Opening a study from the search result
     	int index = Integer.valueOf(myindex);
-    	if (mystudy != null && mystudy.getIndex() == index) {   // - The selected study is currently open
+    	if (mystudy != null && mystudy.getStudyObject() != null && mystudy.getIndex() == index) {   // - The selected study is currently open
           selection = mystudy.getSelection();                   // Current selection
           study     = mystudy.getStudyObject();                 // Current Study object
     	} else {                                                // - The selected study is new
@@ -183,4 +183,14 @@ public class DisplayStudyStepAction extends DisplayBaseAction {
 	public void setStudyService(StudyService studyService) {
 		_studyService = studyService;
 	}
+
+	/** 
+	 * {@inheritDoc}
+	 * @see org.splat.simer.Action#setOpenStudy(org.splat.simer.OpenStudy)
+	 */
+	@Override
+	public void setOpenStudy(OpenStudy study) {
+		super.setOpenStudy(study);
+		mystudy = study;
+	}
 }
\ No newline at end of file
diff --git a/Workspace/Siman/src/org/splat/simer/StartAction.java b/Workspace/Siman/src/org/splat/simer/StartAction.java
index 9d432b5..9066571 100644
--- a/Workspace/Siman/src/org/splat/simer/StartAction.java
+++ b/Workspace/Siman/src/org/splat/simer/StartAction.java
@@ -13,13 +13,13 @@ import org.splat.dal.dao.som.Database;
 import org.splat.service.technical.ProjectSettingsService;
 
 
+
 public class StartAction extends Action implements ServletRequestAware {
 
     private HttpServletRequest  request = null;
 
 	private ProjectSettingsService _projectSettingsService;
 	private ApplicationSettings _ApplicationSettings;
-    
 	private static final long   serialVersionUID = 5875058140682652964L;
 
 //  ==============================================================================================================================
diff --git a/Workspace/Siman/src/spring/applicationContext.xml b/Workspace/Siman/src/spring/applicationContext.xml
index f8cc9fd..c7b78a9 100644
--- a/Workspace/Siman/src/spring/applicationContext.xml
+++ b/Workspace/Siman/src/spring/applicationContext.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:aop="http://www.springframework.org/schema/aop"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans  
-http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+http://www.springframework.org/schema/aop  
+http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
 
 	<bean id="applicationSettings"
 		class="org.splat.simer.ApplicationSettings">
@@ -13,7 +16,7 @@ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 		scope="prototype" />
 
 	<bean id="openStudy" class="org.splat.simer.OpenStudy"
-		scope="prototype">
+		scope="session">
 		<property name="projectElementService"
 			ref="projectElementService" />
 		<property name="projectSettings" ref="projectSettings" />
@@ -30,11 +33,22 @@ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 	</bean>
 
 	<bean id="baseAction" class="org.splat.simer.Action"
-		scope="prototype">
+		scope="prototype" abstract="true">
 		<property name="openStudy" ref="openStudy" />
 		<property name="openKnowledge" ref="openKnowledge" />
 	</bean>
 
+	<bean id="displayStudyStepAction"
+		class="org.splat.simer.DisplayStudyStepAction" parent="baseAction"
+		scope="prototype">
+		<property name="studyService" ref="studyService" />
+	</bean>
+
+	<bean id="newStudyAction" class="org.splat.simer.NewStudyAction"
+		parent="baseAction" scope="prototype">
+		<property name="studyService" ref="studyService" />
+	</bean>
+
 	<bean id="startAction" class="org.splat.simer.StartAction"
 		scope="prototype">
 		<property name="applicationSettings" ref="applicationSettings" />
@@ -67,11 +81,6 @@ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 		class="org.splat.simer.SearchDocumentAction" scope="prototype">
 	</bean>
 
-	<bean id="displayStudyStepAction" parent="baseAction"
-		class="org.splat.simer.DisplayStudyStepAction" scope="prototype">
-		<property name="studyService" ref="studyService" />
-	</bean>
-
 	<bean id="studyPropertiesAction"
 		class="org.splat.simer.StudyPropertiesAction" scope="prototype">
 		<property name="studyService" ref="studyService" />
@@ -88,11 +97,6 @@ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 		<property name="studyService" ref="studyService" />
 	</bean>
 
-	<bean id="newStudyAction" class="org.splat.simer.NewStudyAction"
-		parent="baseAction" scope="prototype">
-		<property name="studyService" ref="studyService" />
-	</bean>
-
 	<bean id="newScenarioAction"
 		class="org.splat.simer.NewScenarioAction" scope="prototype">
 		<property name="projectElementService"
@@ -140,7 +144,7 @@ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
 	<bean id="editKnowledgeElementAction"
 		class="org.splat.simer.EditKnowledgeElementAction"
-		scope="prototype">
+		scope="prototype" parent="baseAction">
 		<property name="knowledgeElementService"
 			ref="knowledgeElementService" />
 		<property name="scenarioService" ref="scenarioService" />