[parancoe] 2 new revisions pushed by lucio.be...@gmail.com on 2012-06-22 15:12 GMT

1 view
Skip to first unread message

para...@googlecode.com

unread,
Jun 22, 2012, 11:12:43 AM6/22/12
to parancoe...@googlegroups.com
2 new revisions:

Revision: ddee0ebd32c9
Author: lucio.benfante <lucio.b...@gmail.com>
Date: Fri Jun 22 07:43:19 2012
Log: Configured for the development in the 2.0.x branch.
http://code.google.com/p/parancoe/source/detail?r=ddee0ebd32c9

Revision: 620dd259bbd6
Author: lucio.benfante <lucio.b...@gmail.com>
Date: Fri Jun 22 08:11:40 2012
Log: Temporarly setting autocommit to false committing the session in
Paran...
http://code.google.com/p/parancoe/source/detail?r=620dd259bbd6

==============================================================================
Revision: ddee0ebd32c9
Author: lucio.benfante <lucio.b...@gmail.com>
Date: Fri Jun 22 07:43:19 2012
Log: Configured for the development in the 2.0.x branch.
http://code.google.com/p/parancoe/source/detail?r=ddee0ebd32c9

Modified:
/parancoe-core/pom.xml
/parancoe-web/pom.xml
/parancoe-yaml/pom.xml
/pom.xml

=======================================
--- /parancoe-core/pom.xml Mon Feb 15 07:20:45 2010
+++ /parancoe-core/pom.xml Fri Jun 22 07:43:19 2012
@@ -3,92 +3,77 @@
<parent>
<artifactId>parancoe</artifactId>
<groupId>org.parancoe</groupId>
- <version>2.0.2</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.parancoe</groupId>
<artifactId>parancoe-core</artifactId>
<name>Parancoe Core</name>
- <version>2.0.2</version>
+ <version>2.0-SNAPSHOT</version>
<url>http://www.parancoe.org</url>
<dependencies>
<dependency>
<groupId>org.parancoe</groupId>
<artifactId>parancoe-yaml</artifactId>
- <version>2.0.2</version>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>1.8.0.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.4</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
- <version>1.5</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>${parancoe.spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>${parancoe.spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>${parancoe.spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
- <version>${parancoe.spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
- <version>${parancoe.spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>${parancoe.spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
- <version>${parancoe.spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
- <version>${parancoe.spring.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
- <version>${parancoe.hibernate.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
- <version>3.4.0.GA</version>
<exclusions>
<exclusion>
<artifactId>hibernate</artifactId>
@@ -99,7 +84,6 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-commons-annotations</artifactId>
- <version>3.3.0.ga</version>
<exclusions>
<exclusion>
<artifactId>hibernate</artifactId>
@@ -111,70 +95,52 @@
</exclusion>
</exclusions>
</dependency>
- <!--
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
- </dependency>
- -->
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
- <version>1.6.1</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
- <version>1.6.1</version>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
- <version>1.2.2</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.14</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
<scope>compile</scope>
<!-- necessary if you want to export EnhancedTest -->
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.3</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.5.3</version>
</dependency>
<dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
- <version>3.8.0.GA</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
- <version>1.0</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
- <version>${parancoe.spring.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>1.4.2</version>
<scope>provided</scope>
</dependency>
</dependencies>
=======================================
--- /parancoe-web/pom.xml Mon Feb 15 07:20:45 2010
+++ /parancoe-web/pom.xml Fri Jun 22 07:43:19 2012
@@ -3,60 +3,52 @@
<parent>
<artifactId>parancoe</artifactId>
<groupId>org.parancoe</groupId>
- <version>2.0.2</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.parancoe</groupId>
<artifactId>parancoe-web</artifactId>
<name>Parancoe Web</name>
- <version>2.0.2</version>
+ <version>2.0-SNAPSHOT</version>
<url>http://www.parancoe.org</url>
<dependencies>
<dependency>
<groupId>org.parancoe</groupId>
<artifactId>parancoe-core</artifactId>
- <version>2.0.2</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
- <version>1.1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.1.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
- <version>1.1.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
- <version>1.1.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springmodules</groupId>
<artifactId>spring-modules-validation</artifactId>
- <version>0.8a</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
@@ -67,28 +59,23 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>${parancoe.spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
- <version>${parancoe.spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
- <version>${parancoe.spring.version}</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>1.8.0.4</version>
<scope>test</scope>
</dependency>
</dependencies>
=======================================
--- /parancoe-yaml/pom.xml Mon Feb 15 07:20:45 2010
+++ /parancoe-yaml/pom.xml Fri Jun 22 07:43:19 2012
@@ -2,19 +2,18 @@
<parent>
<artifactId>parancoe</artifactId>
<groupId>org.parancoe</groupId>
- <version>2.0.2</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.parancoe</groupId>
<artifactId>parancoe-yaml</artifactId>
<name>Parancoe Yaml</name>
- <version>2.0.2</version>
+ <version>2.0-SNAPSHOT</version>
<url>http://www.parancoe.org</url>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
=======================================
--- /pom.xml Mon Feb 15 07:20:45 2010
+++ /pom.xml Fri Jun 22 07:43:19 2012
@@ -4,7 +4,7 @@
<groupId>org.parancoe</groupId>
<artifactId>parancoe</artifactId>
<packaging>pom</packaging>
- <version>2.0.2</version>
+ <version>2.0-SNAPSHOT</version>
<name>Parancoe</name>
<url>http://www.parancoe.org</url>
<modules>
@@ -16,6 +16,222 @@
<parancoe.spring.version>2.5.6.SEC01</parancoe.spring.version>
<parancoe.hibernate.version>3.3.2.GA</parancoe.hibernate.version>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.parancoe</groupId>
+ <artifactId>parancoe-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.parancoe</groupId>
+ <artifactId>parancoe-yaml</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springmodules</groupId>
+ <artifactId>spring-modules-validation</artifactId>
+ <version>0.8a</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${parancoe.spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>${parancoe.spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ <version>${parancoe.spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${parancoe.spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${parancoe.spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${parancoe.spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-orm</artifactId>
+ <version>${parancoe.spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>${parancoe.spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${parancoe.spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>${parancoe.spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>${parancoe.spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${parancoe.hibernate.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <version>3.4.0.GA</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>hibernate</artifactId>
+ <groupId>org.hibernate</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-commons-annotations</artifactId>
+ <version>3.3.0.ga</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>hibernate</artifactId>
+ <groupId>org.hibernate</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>persistence-api</artifactId>
+ <groupId>javax.persistence</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.5.3</version>
+ </dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.8.0.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4.2</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<build>
<plugins>
<plugin>
@@ -67,26 +283,61 @@
<name>Parancoe Repository for Maven</name>
<url>http://maven2.parancoe.org/repo/</url>
<layout>default</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
</repository>
<repository>
<id>maven2-repository.dev.java.net</id>
<name>Java.net Repository for Maven</name>
<url>http://download.java.net/maven/2/</url>
<layout>default</layout>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</repository>
<repository>
<id>jboss-maven2-repository</id>
<name>JBoss Repository for Maven</name>
<url>http://repository.jboss.com/maven2/</url>
- <layout>default</layout>
- </repository>
+ <layout>default</layout>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>jboss-maven2-nexus-repository</id>
+ <name>JBoss Repository for Maven</name>
+
<url>https://repository.jboss.org/nexus/content/repositories/public/</url>
+ <layout>default</layout>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>sonatype-nexus-snapshots</id>
+ <name>Sonatype Nexus snapshot repository</name>
+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
</repositories>
<distributionManagement>
+ <snapshotRepository>
+ <id>sonatype-nexus-snapshots</id>
+ <name>Sonatype Nexus Snapshots</name>
+
<url>http://oss.sonatype.org/content/repositories/snapshots</url>
+ </snapshotRepository>
<repository>
- <id>parancoe-org-repository</id>
-
<url>scp://maven2.parancoe.org/home/web/maven2.parancoe.org/repository/repo</url>
- <layout>default</layout>
+ <id>sonatype-nexus-staging</id>
+ <name>Nexus Release Repository</name>
+
<url>http://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
+ <site>
+ <id>parancoe-org-repository</id>
+
<url>scp://web...@doc.lambico.org/home/web/maven2.parancoe.org/repository/sites/parancoe/</url>
+ </site>
</distributionManagement>
<scm>

<connection>scm:hg:https://parancoe.googlecode.com/hg/parancoe</connection>

==============================================================================
Revision: 620dd259bbd6
Author: lucio.benfante <lucio.b...@gmail.com>
Date: Fri Jun 22 08:11:40 2012
Log: Temporarly setting autocommit to false committing the session in
ParancoeOpenSessionInViewInterceptor.

Update issue #7
Implemented in the 2.0.x branch.
http://code.google.com/p/parancoe/source/detail?r=620dd259bbd6

Modified:

/parancoe-web/src/main/java/org/parancoe/web/ParancoeOpenSessionInViewInterceptor.java

=======================================
---
/parancoe-web/src/main/java/org/parancoe/web/ParancoeOpenSessionInViewInterceptor.java
Sun Sep 21 14:08:50 2008
+++
/parancoe-web/src/main/java/org/parancoe/web/ParancoeOpenSessionInViewInterceptor.java
Fri Jun 22 08:11:40 2012
@@ -17,6 +17,7 @@

package org.parancoe.web;

+import java.sql.Connection;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.log4j.Logger;
@@ -61,7 +62,13 @@
try{
if(ex==null){
logger.debug("Committing the database transaction");
- if (session.getTransaction().isActive()
&& !session.getTransaction().wasRolledBack())
session.getTransaction().commit();
+ if (session.getTransaction().isActive()
&& !session.getTransaction().wasRolledBack()) {
+ Connection connection = session.connection();
+ boolean autoCommit = connection.getAutoCommit();
+ connection.setAutoCommit(false);
+ session.getTransaction().commit();
+ connection.setAutoCommit(autoCommit);
+ }
}else{
logger.error(ex);
logger.debug("Rolling back the database transaction");
Reply all
Reply to author
Forward
0 new messages