[exo-jcr-commits] exo-jcr SVN: r2758 - in core/branches/2.3.x: exo.core.component.organization.jdbc and 1 other directories.

[do-not-reply at jboss.org]

Author: nzamosenchuk
Date: 2010-07-09 05:38:29 -0400 (Fri, 09 Jul 2010)
New Revision: 2758

Modified:
   core/branches/2.3.x/exo.core.component.organization.jdbc/pom.xml
   core/branches/2.3.x/exo.core.component.organization.jdbc/src/test/resources/conf/portal/test-configuration.xml
   core/branches/2.3.x/pom.xml
Log:
EXOJCR-809: Adding Javassist dependency, and HibernateService component

Modified: core/branches/2.3.x/exo.core.component.organization.jdbc/pom.xml
===================================================================
--- core/branches/2.3.x/exo.core.component.organization.jdbc/pom.xml	2010-07-09 09:33:25 UTC (rev 2757)
+++ core/branches/2.3.x/exo.core.component.organization.jdbc/pom.xml	2010-07-09 09:38:29 UTC (rev 2758)
@@ -109,19 +109,12 @@
          <artifactId>mysql-connector-java</artifactId>
          <scope>test</scope>
       </dependency>
+      <dependency>
+         <groupId>javassist</groupId>
+         <artifactId>javassist</artifactId>
+         <scope>test</scope>
+      </dependency>
+
    </dependencies>
-   <build>
-    <plugins>
-       <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-             <excludes>
-                <exclude>**/TestOrganizationService.java</exclude>
-             </excludes>
-          </configuration>
-       </plugin>
-   </plugins>
-
-   </build>
+
 </project>
\ No newline at end of file

Modified: core/branches/2.3.x/exo.core.component.organization.jdbc/src/test/resources/conf/portal/test-configuration.xml
===================================================================
--- core/branches/2.3.x/exo.core.component.organization.jdbc/src/test/resources/conf/portal/test-configuration.xml	2010-07-09 09:33:25 UTC (rev 2757)
+++ core/branches/2.3.x/exo.core.component.organization.jdbc/src/test/resources/conf/portal/test-configuration.xml	2010-07-09 09:38:29 UTC (rev 2758)
@@ -91,8 +91,32 @@
       </init-params>
    </component>
 
+  <component>
+    <key>org.exoplatform.services.database.HibernateService</key>
+    <jmx-name>database:type=HibernateService</jmx-name>
+    <type>org.exoplatform.services.database.impl.HibernateServiceImpl</type>
+    <init-params>
+      <properties-param>
+        <name>hibernate.properties</name>
+        <description>Default Hibernate Service</description>
+        <property name="hibernate.show_sql" value="false"/>
+        <property name="hibernate.cglib.use_reflection_optimizer" value="true"/>
+        <property name="hibernate.connection.url" value="jdbc:hsqldb:file:target/temp/data/exodb"/>
+        <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver"/>
+        <property name="hibernate.connection.autocommit" value="true"/>
+        <property name="hibernate.connection.username" value="sa"/>
+        <property name="hibernate.connection.password" value=""/>
+        <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
+        <property name="hibernate.c3p0.min_size" value="5"/>
+        <property name="hibernate.c3p0.max_size" value="20"/>
+        <property name="hibernate.c3p0.timeout" value="1800"/>
+        <property name="hibernate.c3p0.max_statements" value="50"/>
+      </properties-param>
+    </init-params>
+  </component>
+
    <import>classpath:/conf/portal/hibernate-organization-configuration.xml</import>
    <!--  <import>classpath:/conf/portal/jdbc-organization-configuration.xml</import>-->
    <import>classpath:/conf/portal/test-organization-configuration.xml</import>
    <!--  <remove-configuration>org.exoplatform.services.database.HibernateService</remove-configuration>-->
-</configuration>
\ No newline at end of file
+</configuration>

Modified: core/branches/2.3.x/pom.xml
===================================================================
--- core/branches/2.3.x/pom.xml	2010-07-09 09:33:25 UTC (rev 2757)
+++ core/branches/2.3.x/pom.xml	2010-07-09 09:38:29 UTC (rev 2758)
@@ -351,6 +351,12 @@
            <artifactId>commons-pool</artifactId>
            <version>1.5.4</version>
         </dependency>
+        
+        <dependency>
+           <groupId>javassist</groupId>
+           <artifactId>javassist</artifactId>
+           <version>3.4.GA</version>
+        </dependency>
 
       </dependencies>
    </dependencyManagement>