Author: ilgrosso Date: Fri Mar 8 13:51:32 2013 New Revision: 1454388 URL: http://svn.apache.org/r1454388 Log: Verified with MySQL: small fixes
Modified: syncope/trunk/core/pom.xml syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java syncope/trunk/core/src/test/resources/context.xml syncope/trunk/core/src/test/resources/mysql/persistence.properties Modified: syncope/trunk/core/pom.xml URL: http://svn.apache.org/viewvc/syncope/trunk/core/pom.xml?rev=1454388&r1=1454387&r2=1454388&view=diff ============================================================================== --- syncope/trunk/core/pom.xml (original) +++ syncope/trunk/core/pom.xml Fri Mar 8 13:51:32 2013 @@ -1044,7 +1044,7 @@ under the License. <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>5.1.21</version> + <version>5.1.23</version> <scope>test</scope> </dependency> </dependencies> Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java?rev=1454388&r1=1454387&r2=1454388&view=diff ============================================================================== --- syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java (original) +++ syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java Fri Mar 8 13:51:32 2013 @@ -557,7 +557,7 @@ public class UserController { @PreAuthorize("hasRole('WORKFLOW_FORM_LIST')") @RequestMapping(method = RequestMethod.GET, value = "/workflow/form/list") - @Transactional(readOnly = true, rollbackFor = {Throwable.class}) + @Transactional(rollbackFor = {Throwable.class}) public List<WorkflowFormTO> getForms() { List<WorkflowFormTO> forms = uwfAdapter.getForms(); Modified: syncope/trunk/core/src/test/resources/context.xml URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/resources/context.xml?rev=1454388&r1=1454387&r2=1454388&view=diff ============================================================================== --- syncope/trunk/core/src/test/resources/context.xml (original) +++ syncope/trunk/core/src/test/resources/context.xml Fri Mar 8 13:51:32 2013 @@ -20,8 +20,4 @@ under the License. <Context> <!-- Disable session persistence across Tomcat restarts --> <Manager pathname="" /> - - <Loader className="org.apache.catalina.loader.VirtualWebappLoader" - virtualClasspath="${project.build.directory}/classes:${project.build.directory}/${project.build.finalName}/WEB-INF/lib/*.jar" - searchVirtualFirst="true"/> </Context> Modified: syncope/trunk/core/src/test/resources/mysql/persistence.properties URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/resources/mysql/persistence.properties?rev=1454388&r1=1454387&r2=1454388&view=diff ============================================================================== --- syncope/trunk/core/src/test/resources/mysql/persistence.properties (original) +++ syncope/trunk/core/src/test/resources/mysql/persistence.properties Fri Mar 8 13:51:32 2013 @@ -20,5 +20,5 @@ jpa.username=syncope jpa.password=syncope jpa.dialect=org.apache.openjpa.jdbc.sql.MySQLDictionary quartz.jobstore=org.quartz.impl.jdbcjobstore.StdJDBCDelegate -quartz.sql=tables_mysql_innodb.sql -logback.sql=mysql.sql \ No newline at end of file +quartz.sql=tables_mysql.sql +logback.sql=mysql.sql