]> SALOME platform Git repositories - tools/siman.git/commitdiff
Salome HOME
p6sys has been removed.
authorrkv <rkv@opencascade.com>
Tue, 4 Dec 2012 10:49:24 +0000 (10:49 +0000)
committerrkv <rkv@opencascade.com>
Tue, 4 Dec 2012 10:49:24 +0000 (10:49 +0000)
Workspace/Siman-Common/.classpath
Workspace/Siman-Common/lib/p6spy.jar [deleted file]
Workspace/Siman-Common/src/spring/datasourceContext.xml
Workspace/Siman/.settings/org.eclipse.wst.common.component
Workspace/Siman/conf/debug.properties
Workspace/Siman/conf/release.properties
Workspace/Siman/src/hibernate.properties
Workspace/Siman/src/jdbc.properties

index b8b79e304c7e866cc9ef14b31e92cff61be5ca57..20999c605cc86b2affca7b6d4f64003d9b56512f 100644 (file)
@@ -25,7 +25,6 @@
        <classpathentry exported="true" kind="lib" path="lib/org.springframework.web.struts-3.1.2.RELEASE.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/org.springframework.web-3.1.2.RELEASE.jar"/>
        <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="lib" path="lib/testng-6.8.jar"/>
diff --git a/Workspace/Siman-Common/lib/p6spy.jar b/Workspace/Siman-Common/lib/p6spy.jar
deleted file mode 100644 (file)
index 44b8987..0000000
Binary files a/Workspace/Siman-Common/lib/p6spy.jar and /dev/null differ
index 3770d1f8303b9167125d475591d2ca0df6d9128b..516ca204b0ccbd3f8ca2a7a419f8288aa58a5d95 100644 (file)
@@ -1,10 +1,10 @@
 <?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"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xmlns:tx="http://www.springframework.org/schema/tx"
-    xsi:schemaLocation="
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:aop="http://www.springframework.org/schema/aop"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:tx="http://www.springframework.org/schema/tx"
+       xsi:schemaLocation="
 http://www.springframework.org/schema/beans
 http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
 http://www.springframework.org/schema/aop
@@ -14,114 +14,102 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd
 http://www.springframework.org/schema/tx
 http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
 
-    <!--    <bean id="simanDataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
-        <property name="jndiName" value="jdbc/ibatis"/>
-        </bean> -->
+       <!--    <bean id="simanDataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+               <property name="jndiName" value="jdbc/ibatis"/>
+               </bean> -->
 
-    <bean id="simanDatasource"
-        class="org.springframework.jdbc.datasource.DriverManagerDataSource">
-        <property name="driverClassName"
-            value="${connection.driver_class}" />
-        <property name="url" value="${connection.url}" />
-        <property name="username" value="${connection.username}" />
-        <property name="password" value="${connection.password}" />
-    </bean>
+       <bean id="simanDatasource"
+               class="org.springframework.jdbc.datasource.DriverManagerDataSource">
+               <property name="driverClassName"
+                       value="${connection.driver_class}" />
+               <property name="url" value="${connection.url}" />
+               <property name="username" value="${connection.username}" />
+               <property name="password" value="${connection.password}" />
+       </bean>
 
-    <!--    <bean id="simanDatasource"
-        class="org.springframework.jdbc.datasource.SingleConnectionDataSource">
-        <property name="driverClassName"
-            value="${connection.driver_class}" />
-        <property name="url" value="${connection.url}" />
-        <property name="username" value="${connection.username}" />
-        <property name="password" value="${connection.password}" />
-        <property name="suppressClose" value="true" />
-        <property name="autoCommit" value="false" />
-    </bean>
-    -->
+       <!--    <bean id="simanDatasource"
+               class="org.springframework.jdbc.datasource.SingleConnectionDataSource">
+               <property name="driverClassName"
+               value="${connection.driver_class}" />
+               <property name="url" value="${connection.url}" />
+               <property name="username" value="${connection.username}" />
+               <property name="password" value="${connection.password}" />
+               <property name="suppressClose" value="true" />
+               <property name="autoCommit" value="false" />
+               </bean>
+       -->
 
-    <bean id="p6spySimanDatasource"
-        class="com.p6spy.engine.spy.P6DataSource">
-        <constructor-arg>
-            <ref local="simanDatasource" />
-        </constructor-arg>
-    </bean>
+       <bean id="hibernateProperties"
+               class="org.springframework.beans.factory.config.PropertiesFactoryBean">
+               <property name="properties">
+                       <props>
+                               <!-- normal properties -->
+                       </props>
+               </property>
+               <!-- hibernate.config should be defined somewhere in the spring.properties layers -->
+               <property name="locations">
+                       <list>
+                               <value>classpath:${hibernate.config.file}</value>
+                       </list>
+               </property>
+       </bean>
 
+       <bean id="simanSessionFactory"
+               class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
+               <property name="dataSource" ref="simanDatasource" />
+               <property name="mappingResources">
+                       <list>
+                               <value>
+                                       org/splat/dal/bo/kernel/Persistent.hbm.xml
+                               </value>
+                               <value>org/splat/dal/bo/kernel/Any.hbm.xml</value>
+                               <value>org/splat/dal/bo/kernel/Entity.hbm.xml</value>
+                               <value>org/splat/dal/bo/kernel/Attribute.hbm.xml</value>
+                               <value>org/splat/dal/bo/kernel/Relation.hbm.xml</value>
+                               <value>
+                                       org/splat/dal/bo/kernel/TextAttribute.hbm.xml
+                               </value>
+                               <value>org/splat/dal/bo/kernel/User.hbm.xml</value>
 
-    <bean id="hibernateProperties"
-        class="org.springframework.beans.factory.config.PropertiesFactoryBean">
-        <property name="properties">
-            <props>
-                <!-- normal properties -->
-            </props>
-        </property>
-        <!-- hibernate.config should be defined somewhere in the spring.properties layers -->
-        <property name="locations">
-            <list>
-                <value>classpath:${hibernate.config.file}</value>
-            </list>
-        </property>
-    </bean>
+                               <value>
+                                       org/splat/dal/bo/som/ProjectElement.hbm.xml
+                               </value>
+                               <value>org/splat/dal/bo/som/Study.hbm.xml</value>
+                               <value>org/splat/dal/bo/som/Scenario.hbm.xml</value>
+                               <value>org/splat/dal/bo/som/Attributes.hbm.xml</value>
+                               <value>org/splat/dal/bo/som/Relations.hbm.xml</value>
+                               <value>org/splat/dal/bo/som/File.hbm.xml</value>
+                               <value>org/splat/dal/bo/som/Document.hbm.xml</value>
+                               <value>org/splat/dal/bo/som/Publication.hbm.xml</value>
+                               <value>
+                                       org/splat/dal/bo/som/ValidationCycle.hbm.xml
+                               </value>
+                               <value>org/splat/dal/bo/som/Timestamp.hbm.xml</value>
+                               <value>
+                                       org/splat/dal/bo/som/SimulationContext.hbm.xml
+                               </value>
+                               <value>
+                                       org/splat/dal/bo/som/KnowledgeElement.hbm.xml
+                               </value>
+                               <value>org/splat/dal/bo/som/IDBuilder.hbm.xml</value>
+                       </list>
+               </property>
+               <property name="hibernateProperties">
+                       <ref local="hibernateProperties" />
+               </property>
+               <!-- The following property is used temporary to be able to manage transactions manually. -->
+               <!-- TODO: use annotations to mark transaction methods 
+                       instead of programmatic transaction management  -->
+               <property name="exposeTransactionAwareSessionFactory">
+                       <value>false</value>
+               </property>
+       </bean>
 
-    <bean id="simanSessionFactory"
-        class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-        <property name="dataSource" ref="simanDatasource" />
-<!--         <property name="configurationClass" value="org.hibernate.cfg.AnnotationConfiguration" />-->
+       <bean id="txManager"
+               class="org.springframework.orm.hibernate3.HibernateTransactionManager">
+               <property name="sessionFactory" ref="simanSessionFactory" />
+       </bean>
 
-        <property name="mappingResources">
-            <list>
-                <value>
-                    org/splat/dal/bo/kernel/Persistent.hbm.xml
-                </value>
-                <value>org/splat/dal/bo/kernel/Any.hbm.xml</value>
-                <value>org/splat/dal/bo/kernel/Entity.hbm.xml</value>
-                <value>org/splat/dal/bo/kernel/Attribute.hbm.xml</value>
-                <value>org/splat/dal/bo/kernel/Relation.hbm.xml</value>
-                <value>
-                    org/splat/dal/bo/kernel/TextAttribute.hbm.xml
-                </value>
-                <value>org/splat/dal/bo/kernel/User.hbm.xml</value>
-
-                <value>
-                    org/splat/dal/bo/som/ProjectElement.hbm.xml
-                </value>
-                <value>org/splat/dal/bo/som/Study.hbm.xml</value>
-                <value>org/splat/dal/bo/som/Scenario.hbm.xml</value>
-                <value>org/splat/dal/bo/som/Attributes.hbm.xml</value>
-                <value>org/splat/dal/bo/som/Relations.hbm.xml</value>
-                <value>org/splat/dal/bo/som/File.hbm.xml</value>
-                <value>org/splat/dal/bo/som/Document.hbm.xml</value>
-                <value>org/splat/dal/bo/som/Publication.hbm.xml</value>
-                <value>
-                    org/splat/dal/bo/som/ValidationCycle.hbm.xml
-                </value>
-                <value>org/splat/dal/bo/som/Timestamp.hbm.xml</value>
-                <value>
-                    org/splat/dal/bo/som/SimulationContext.hbm.xml
-                </value>
-                <value>
-                    org/splat/dal/bo/som/KnowledgeElement.hbm.xml
-                </value>
-                <value>org/splat/dal/bo/som/IDBuilder.hbm.xml</value>
-            </list>
-        </property>
-        <!-- hibernate.connection.driver_class=com.p6spy.engine.spy.P6SpyDriver -->
-
-        <property name="hibernateProperties">
-            <ref local="hibernateProperties" />
-        </property>
-        <!-- The following property is used temporary to be able to manage transactions manually. -->
-        <!-- TODO: use annotations to mark transaction methods 
-            instead of programmatic transaction management  -->
-        <property name="exposeTransactionAwareSessionFactory">
-            <value>false</value>
-        </property>
-    </bean>
-
-    <bean id="txManager"
-        class="org.springframework.orm.hibernate3.HibernateTransactionManager">
-        <property name="sessionFactory" ref="simanSessionFactory" />
-    </bean>
-
-    <tx:annotation-driven transaction-manager="txManager" />
+       <tx:annotation-driven transaction-manager="txManager" />
 
 </beans>
index d34656d9eb6b958483a0127802b5e3bbf297d769..20caf89aec987decf4cc4b0dacbd8ac0974fa2ae 100644 (file)
         <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/Siman-Common/dist/siman-common.jar">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/Siman-Common/lib/p6spy.jar">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/Siman-Common/lib/aopalliance.jar">
             <dependency-type>uses</dependency-type>
         </dependent-module>
index 49be9514051d894c34f83ab4e5069cda3a1b6b9a..997c048b8bae6569d50f44e284fc6219cddc5b4b 100644 (file)
@@ -3,7 +3,6 @@ connection.url=jdbc:mysql://localhost/simer
 connection.username=simer
 connection.password=admin
 connection.driver_class=com.mysql.jdbc.Driver
-#connection.driver_class=com.p6spy.engine.spy.P6SpyDriver
 
 # Hibernate config
 hibernate.hbm2ddl.auto=update
index c61d1bf6064a58e598178736b916b62e44d0ad75..e849ecb95a394e5f27651baa9b24a4dd0f13f947 100644 (file)
@@ -2,7 +2,7 @@
 connection.url=jdbc:mysql://localhost/simer
 connection.username=simer
 connection.password=admin
-connection.driver_class=com.p6spy.engine.spy.P6SpyDriver
+connection.driver_class=com.mysql.jdbc.Driver
 
 # Hibernate config
 #hibernate.hbm2ddl.auto=validate
index 326140a023d883a1c1e6f9340e7c2389b7feb754..88cd755b12a0c7ce8d3115dee0c099a4c48e2f16 100644 (file)
@@ -1,4 +1,4 @@
-# Generated at 26/11/2012 09:23:45
+# Generated at 04/12/2012 01:42:16
 # 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 62a0c8bc4300f710d39f3c5eb7521a5e16fb904b..ecfd593de1e81d2b79d67e4cdfdd6378c2ddde7a 100644 (file)
@@ -1,4 +1,4 @@
-# Generated at 26/11/2012 09:23:45
+# Generated at 04/12/2012 01:42:16
 # 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