Salome HOME
New dependency (CGLIB jar) is added to Siman-Common (for aop:scoped-proxy). Search...
authorrkv <rkv@opencascade.com>
Thu, 11 Oct 2012 09:54:41 +0000 (09:54 +0000)
committerrkv <rkv@opencascade.com>
Thu, 11 Oct 2012 09:54:41 +0000 (09:54 +0000)
13 files changed:
Workspace/Siman-Common/.classpath
Workspace/Siman-Common/lib/cglib-nodep-2.2.3.jar [new file with mode: 0644]
Workspace/Siman/.settings/org.eclipse.wst.common.component
Workspace/Siman/WebContent/WEB-INF/web.xml
Workspace/Siman/WebContent/welcome.jsp
Workspace/Siman/conf/debug.properties
Workspace/Siman/conf/templates/log4j.xml
Workspace/Siman/src/hibernate.properties
Workspace/Siman/src/jdbc.properties
Workspace/Siman/src/org/splat/simer/Action.java
Workspace/Siman/src/org/splat/simer/DisplayStudyStepAction.java
Workspace/Siman/src/org/splat/simer/StartAction.java
Workspace/Siman/src/spring/applicationContext.xml

index 063fd5a96f7b441cfeb1e6087250da2de5807126..746d69464afb80a784a73d47f62adbf487a932a3 100644 (file)
@@ -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 (file)
index 0000000..35d6d7c
Binary files /dev/null and b/Workspace/Siman-Common/lib/cglib-nodep-2.2.3.jar differ
index 477d6d7ee7bfd73934fa370d35d93cd707aabeed..97e1bec59b97d3795358e95ef4cd053804612767 100644 (file)
         <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>
index 88912fb9e73b56c078dc39ca4da1e85a69fa42d0..386e72b59a88a26690ad968031c7b854bd1ff0d7 100644 (file)
                <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>
index cebdeeccb7a2fed7d50816f7b039b9b913ed3952..45275c809c4b679b0f50234e862be508b4143bd9 100644 (file)
@@ -22,7 +22,6 @@
 <!-- Title-bar
   -->
     <div id=title-bar><s:text name="message.welcome"/></div>
-
   </body>
 
 </html>
\ No newline at end of file
index 303bb22d0258b8a365a8c149207c3d31a479c9ce..9e6b9444c84c5836ed8c0d91f835caf6964b23f3 100644 (file)
@@ -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@.
index ae1320eb40b894bd7ca996088ddc5aad287c5ce3..d3a719011e2317ea411acbc0ef10e36e6fc6d8f3 100644 (file)
         <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>
index 92c9dedfd11de162efdb1c28911187299abe6137..46b07188a5811016ffb4ce342d0563c7ebf75eeb 100644 (file)
@@ -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
index ec862dcbe89a28da66a6d3474f1984d5e35a5c6a..6720228fe4e766cf2c82b6a986afcebcefdbb42a 100644 (file)
@@ -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
index 610ca53bd04e492870a3c9da503d897491984771..c092693e1d61fc27c8037b94630c4c6e0616cd2d 100644 (file)
@@ -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) {
index b2d468c878facb70c850d7bfa2448c5da8eb4408..56f57959e79bbdd0ab1be97009b40b35ca79da3b 100644 (file)
@@ -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
index 9d432b5f6c7af3ca69dd645b244bcbf4fea835be..90665711b77651f06d5f7fdff40afebcf018885a 100644 (file)
@@ -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;
 
 //  ==============================================================================================================================
index f8cc9fd168fa3faa791f19826871b65d61c74237..c7b78a981732fe2a8b6d76175aa622b50fa982ba 100644 (file)
@@ -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" />