From: rkv <rkv@opencascade.com>
Date: Tue, 4 Dec 2012 10:49:24 +0000 (+0000)
Subject: p6sys has been removed.
X-Git-Tag: Root_Delivery1_2012_12_06~15
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=43ed0758fca696dfc058f220563fb5cef70ad280;p=tools%2Fsiman.git

p6sys has been removed.
---

diff --git a/Workspace/Siman-Common/.classpath b/Workspace/Siman-Common/.classpath
index b8b79e3..20999c6 100644
--- a/Workspace/Siman-Common/.classpath
+++ b/Workspace/Siman-Common/.classpath
@@ -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
index 44b8987..0000000
Binary files a/Workspace/Siman-Common/lib/p6spy.jar and /dev/null differ
diff --git a/Workspace/Siman-Common/src/spring/datasourceContext.xml b/Workspace/Siman-Common/src/spring/datasourceContext.xml
index 3770d1f..516ca20 100644
--- a/Workspace/Siman-Common/src/spring/datasourceContext.xml
+++ b/Workspace/Siman-Common/src/spring/datasourceContext.xml
@@ -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>
diff --git a/Workspace/Siman/.settings/org.eclipse.wst.common.component b/Workspace/Siman/.settings/org.eclipse.wst.common.component
index d34656d..20caf89 100644
--- a/Workspace/Siman/.settings/org.eclipse.wst.common.component
+++ b/Workspace/Siman/.settings/org.eclipse.wst.common.component
@@ -127,9 +127,6 @@
         <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>
diff --git a/Workspace/Siman/conf/debug.properties b/Workspace/Siman/conf/debug.properties
index 49be951..997c048 100644
--- a/Workspace/Siman/conf/debug.properties
+++ b/Workspace/Siman/conf/debug.properties
@@ -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
diff --git a/Workspace/Siman/conf/release.properties b/Workspace/Siman/conf/release.properties
index c61d1bf..e849ecb 100644
--- a/Workspace/Siman/conf/release.properties
+++ b/Workspace/Siman/conf/release.properties
@@ -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
diff --git a/Workspace/Siman/src/hibernate.properties b/Workspace/Siman/src/hibernate.properties
index 326140a..88cd755 100644
--- a/Workspace/Siman/src/hibernate.properties
+++ b/Workspace/Siman/src/hibernate.properties
@@ -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
diff --git a/Workspace/Siman/src/jdbc.properties b/Workspace/Siman/src/jdbc.properties
index 62a0c8b..ecfd593 100644
--- a/Workspace/Siman/src/jdbc.properties
+++ b/Workspace/Siman/src/jdbc.properties
@@ -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