exo-jcr SVN: r4498 - in kernel/branches/2.2.x: exo.kernel.commons and 12 other directories.
by do-not-reply＠jboss.org
Author: paristote
Date: 2011-06-14 06:12:06 -0400 (Tue, 14 Jun 2011)
New Revision: 4498
Modified:
kernel/branches/2.2.x/exo.kernel.commons/pom.xml
kernel/branches/2.2.x/exo.kernel.component.cache/pom.xml
kernel/branches/2.2.x/exo.kernel.component.command/pom.xml
kernel/branches/2.2.x/exo.kernel.component.common/pom.xml
kernel/branches/2.2.x/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml
kernel/branches/2.2.x/exo.kernel.component.remote/pom.xml
kernel/branches/2.2.x/exo.kernel.container/pom.xml
kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml
kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml
kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml
kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml
kernel/branches/2.2.x/exo.kernel.mc-integration/pom.xml
kernel/branches/2.2.x/packaging/module/pom.xml
kernel/branches/2.2.x/pom.xml
Log:
[maven-release-plugin] [PLF-1660]prepare for next development iteration
Modified: kernel/branches/2.2.x/exo.kernel.commons/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.commons/pom.xml 2011-06-14 10:11:37 UTC (rev 4497)
+++ kernel/branches/2.2.x/exo.kernel.commons/pom.xml 2011-06-14 10:12:06 UTC (rev 4498)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.9-GA</version>
+ <version>2.2.10-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.commons</artifactId>
Modified: kernel/branches/2.2.x/exo.kernel.component.cache/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.component.cache/pom.xml 2011-06-14 10:11:37 UTC (rev 4497)
+++ kernel/branches/2.2.x/exo.kernel.component.cache/pom.xml 2011-06-14 10:12:06 UTC (rev 4498)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.9-GA</version>
+ <version>2.2.10-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.component.cache</artifactId>
Modified: kernel/branches/2.2.x/exo.kernel.component.command/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.component.command/pom.xml 2011-06-14 10:11:37 UTC (rev 4497)
+++ kernel/branches/2.2.x/exo.kernel.component.command/pom.xml 2011-06-14 10:12:06 UTC (rev 4498)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.9-GA</version>
+ <version>2.2.10-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.component.command</artifactId>
Modified: kernel/branches/2.2.x/exo.kernel.component.common/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.component.common/pom.xml 2011-06-14 10:11:37 UTC (rev 4497)
+++ kernel/branches/2.2.x/exo.kernel.component.common/pom.xml 2011-06-14 10:12:06 UTC (rev 4498)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.9-GA</version>
+ <version>2.2.10-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.component.common</artifactId>
Modified: kernel/branches/2.2.x/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2011-06-14 10:11:37 UTC (rev 4497)
+++ kernel/branches/2.2.x/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2011-06-14 10:12:06 UTC (rev 4498)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.9-GA</version>
+ <version>2.2.10-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId>
<name>eXo Kernel :: Cache Extension :: JBoss Cache Implementation</name>
Modified: kernel/branches/2.2.x/exo.kernel.component.remote/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.component.remote/pom.xml 2011-06-14 10:11:37 UTC (rev 4497)
+++ kernel/branches/2.2.x/exo.kernel.component.remote/pom.xml 2011-06-14 10:12:06 UTC (rev 4498)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.9-GA</version>
+ <version>2.2.10-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.component.remote</artifactId>
Modified: kernel/branches/2.2.x/exo.kernel.container/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.container/pom.xml 2011-06-14 10:11:37 UTC (rev 4497)
+++ kernel/branches/2.2.x/exo.kernel.container/pom.xml 2011-06-14 10:12:06 UTC (rev 4498)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.9-GA</version>
+ <version>2.2.10-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.container</artifactId>
<name>eXo Kernel :: Container</name>
Modified: kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2011-06-14 10:11:37 UTC (rev 4497)
+++ kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2011-06-14 10:12:06 UTC (rev 4498)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.2.9-GA</version>
+ <version>2.2.10-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.mc-int</artifactId>
Modified: kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2011-06-14 10:11:37 UTC (rev 4497)
+++ kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2011-06-14 10:12:06 UTC (rev 4498)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.2.9-GA</version>
+ <version>2.2.10-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.mc-int-demo</artifactId>
Modified: kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2011-06-14 10:11:37 UTC (rev 4497)
+++ kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2011-06-14 10:12:06 UTC (rev 4498)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.2.9-GA</version>
+ <version>2.2.10-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.mc-int-tests</artifactId>
Modified: kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2011-06-14 10:11:37 UTC (rev 4497)
+++ kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2011-06-14 10:12:06 UTC (rev 4498)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.2.9-GA</version>
+ <version>2.2.10-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.mc-kernel-extras</artifactId>
Modified: kernel/branches/2.2.x/exo.kernel.mc-integration/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.mc-integration/pom.xml 2011-06-14 10:11:37 UTC (rev 4497)
+++ kernel/branches/2.2.x/exo.kernel.mc-integration/pom.xml 2011-06-14 10:12:06 UTC (rev 4498)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.9-GA</version>
+ <version>2.2.10-GA-SNAPSHOT</version>
</parent>
<artifactId>mc-integration-parent</artifactId>
Modified: kernel/branches/2.2.x/packaging/module/pom.xml
===================================================================
--- kernel/branches/2.2.x/packaging/module/pom.xml 2011-06-14 10:11:37 UTC (rev 4497)
+++ kernel/branches/2.2.x/packaging/module/pom.xml 2011-06-14 10:12:06 UTC (rev 4498)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.9-GA</version>
+ <version>2.2.10-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: kernel/branches/2.2.x/pom.xml
===================================================================
--- kernel/branches/2.2.x/pom.xml 2011-06-14 10:11:37 UTC (rev 4497)
+++ kernel/branches/2.2.x/pom.xml 2011-06-14 10:12:06 UTC (rev 4498)
@@ -30,7 +30,7 @@
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.9-GA</version>
+ <version>2.2.10-GA-SNAPSHOT</version>
<packaging>pom</packaging>
<name>eXo Kernel</name>
@@ -43,9 +43,9 @@
</properties>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/tags/2.2.9-GA</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/tags/2.2.9-GA</developerConnection>
- <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/tags/2.2.9-GA</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/branches/2.2.x/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/branches/2.2.x/</developerConnection>
+ <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/branches/2.2.x</url>
</scm>
<modules>
12 years, 10 months
- 1
- 0
exo-jcr SVN: r4497 - kernel/tags.
by do-not-reply＠jboss.org
Author: paristote
Date: 2011-06-14 06:11:37 -0400 (Tue, 14 Jun 2011)
New Revision: 4497
Added:
kernel/tags/2.2.9-GA/
Log:
[maven-release-plugin] [PLF-1660] copy for tag 2.2.9-GA
12 years, 10 months
- 1
- 0
exo-jcr SVN: r4496 - in kernel/branches/2.2.x: exo.kernel.commons and 12 other directories.
by do-not-reply＠jboss.org
Author: paristote
Date: 2011-06-14 06:11:07 -0400 (Tue, 14 Jun 2011)
New Revision: 4496
Modified:
kernel/branches/2.2.x/exo.kernel.commons/pom.xml
kernel/branches/2.2.x/exo.kernel.component.cache/pom.xml
kernel/branches/2.2.x/exo.kernel.component.command/pom.xml
kernel/branches/2.2.x/exo.kernel.component.common/pom.xml
kernel/branches/2.2.x/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml
kernel/branches/2.2.x/exo.kernel.component.remote/pom.xml
kernel/branches/2.2.x/exo.kernel.container/pom.xml
kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml
kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml
kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml
kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml
kernel/branches/2.2.x/exo.kernel.mc-integration/pom.xml
kernel/branches/2.2.x/packaging/module/pom.xml
kernel/branches/2.2.x/pom.xml
Log:
[maven-release-plugin] [PLF-1660]prepare release 2.2.9-GA
Modified: kernel/branches/2.2.x/exo.kernel.commons/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.commons/pom.xml 2011-06-10 08:31:59 UTC (rev 4495)
+++ kernel/branches/2.2.x/exo.kernel.commons/pom.xml 2011-06-14 10:11:07 UTC (rev 4496)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.9-GA-SNAPSHOT</version>
+ <version>2.2.9-GA</version>
</parent>
<artifactId>exo.kernel.commons</artifactId>
Modified: kernel/branches/2.2.x/exo.kernel.component.cache/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.component.cache/pom.xml 2011-06-10 08:31:59 UTC (rev 4495)
+++ kernel/branches/2.2.x/exo.kernel.component.cache/pom.xml 2011-06-14 10:11:07 UTC (rev 4496)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.9-GA-SNAPSHOT</version>
+ <version>2.2.9-GA</version>
</parent>
<artifactId>exo.kernel.component.cache</artifactId>
Modified: kernel/branches/2.2.x/exo.kernel.component.command/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.component.command/pom.xml 2011-06-10 08:31:59 UTC (rev 4495)
+++ kernel/branches/2.2.x/exo.kernel.component.command/pom.xml 2011-06-14 10:11:07 UTC (rev 4496)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.9-GA-SNAPSHOT</version>
+ <version>2.2.9-GA</version>
</parent>
<artifactId>exo.kernel.component.command</artifactId>
Modified: kernel/branches/2.2.x/exo.kernel.component.common/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.component.common/pom.xml 2011-06-10 08:31:59 UTC (rev 4495)
+++ kernel/branches/2.2.x/exo.kernel.component.common/pom.xml 2011-06-14 10:11:07 UTC (rev 4496)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.9-GA-SNAPSHOT</version>
+ <version>2.2.9-GA</version>
</parent>
<artifactId>exo.kernel.component.common</artifactId>
Modified: kernel/branches/2.2.x/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2011-06-10 08:31:59 UTC (rev 4495)
+++ kernel/branches/2.2.x/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2011-06-14 10:11:07 UTC (rev 4496)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.9-GA-SNAPSHOT</version>
+ <version>2.2.9-GA</version>
</parent>
<artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId>
<name>eXo Kernel :: Cache Extension :: JBoss Cache Implementation</name>
Modified: kernel/branches/2.2.x/exo.kernel.component.remote/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.component.remote/pom.xml 2011-06-10 08:31:59 UTC (rev 4495)
+++ kernel/branches/2.2.x/exo.kernel.component.remote/pom.xml 2011-06-14 10:11:07 UTC (rev 4496)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.9-GA-SNAPSHOT</version>
+ <version>2.2.9-GA</version>
</parent>
<artifactId>exo.kernel.component.remote</artifactId>
Modified: kernel/branches/2.2.x/exo.kernel.container/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.container/pom.xml 2011-06-10 08:31:59 UTC (rev 4495)
+++ kernel/branches/2.2.x/exo.kernel.container/pom.xml 2011-06-14 10:11:07 UTC (rev 4496)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.9-GA-SNAPSHOT</version>
+ <version>2.2.9-GA</version>
</parent>
<artifactId>exo.kernel.container</artifactId>
<name>eXo Kernel :: Container</name>
Modified: kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2011-06-10 08:31:59 UTC (rev 4495)
+++ kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2011-06-14 10:11:07 UTC (rev 4496)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.2.9-GA-SNAPSHOT</version>
+ <version>2.2.9-GA</version>
</parent>
<artifactId>exo.kernel.mc-int</artifactId>
Modified: kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2011-06-10 08:31:59 UTC (rev 4495)
+++ kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2011-06-14 10:11:07 UTC (rev 4496)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.2.9-GA-SNAPSHOT</version>
+ <version>2.2.9-GA</version>
</parent>
<artifactId>exo.kernel.mc-int-demo</artifactId>
Modified: kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2011-06-10 08:31:59 UTC (rev 4495)
+++ kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2011-06-14 10:11:07 UTC (rev 4496)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.2.9-GA-SNAPSHOT</version>
+ <version>2.2.9-GA</version>
</parent>
<artifactId>exo.kernel.mc-int-tests</artifactId>
Modified: kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2011-06-10 08:31:59 UTC (rev 4495)
+++ kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2011-06-14 10:11:07 UTC (rev 4496)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.2.9-GA-SNAPSHOT</version>
+ <version>2.2.9-GA</version>
</parent>
<artifactId>exo.kernel.mc-kernel-extras</artifactId>
Modified: kernel/branches/2.2.x/exo.kernel.mc-integration/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.mc-integration/pom.xml 2011-06-10 08:31:59 UTC (rev 4495)
+++ kernel/branches/2.2.x/exo.kernel.mc-integration/pom.xml 2011-06-14 10:11:07 UTC (rev 4496)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.9-GA-SNAPSHOT</version>
+ <version>2.2.9-GA</version>
</parent>
<artifactId>mc-integration-parent</artifactId>
Modified: kernel/branches/2.2.x/packaging/module/pom.xml
===================================================================
--- kernel/branches/2.2.x/packaging/module/pom.xml 2011-06-10 08:31:59 UTC (rev 4495)
+++ kernel/branches/2.2.x/packaging/module/pom.xml 2011-06-14 10:11:07 UTC (rev 4496)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.9-GA-SNAPSHOT</version>
+ <version>2.2.9-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: kernel/branches/2.2.x/pom.xml
===================================================================
--- kernel/branches/2.2.x/pom.xml 2011-06-10 08:31:59 UTC (rev 4495)
+++ kernel/branches/2.2.x/pom.xml 2011-06-14 10:11:07 UTC (rev 4496)
@@ -30,7 +30,7 @@
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.9-GA-SNAPSHOT</version>
+ <version>2.2.9-GA</version>
<packaging>pom</packaging>
<name>eXo Kernel</name>
@@ -43,9 +43,9 @@
</properties>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/branches/2.2.x/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/branches/2.2.x/</developerConnection>
- <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/branches/2.2.x</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/tags/2.2.9-GA</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/tags/2.2.9-GA</developerConnection>
+ <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/tags/2.2.9-GA</url>
</scm>
<modules>
12 years, 10 months
- 1
- 0
exo-jcr SVN: r4495 - in core/branches/2.3.x: exo.core.component.document/src/test/java/org/exoplatform/services/document/test and 3 other directories.
by do-not-reply＠jboss.org
Author: paristote
Date: 2011-06-10 04:31:59 -0400 (Fri, 10 Jun 2011)
New Revision: 4495
Added:
core/branches/2.3.x/exo.core.component.document/src/test/resources/Trait_union.06.Mai_2009.pdf
core/branches/2.3.x/exo.core.component.document/src/test/resources/metro.pdf
core/branches/2.3.x/exo.core.component.document/src/test/resources/pfs_accapp.pdf
core/branches/2.3.x/patch/2.3.8/COR-228/readme.txt
Modified:
core/branches/2.3.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PDFDocumentReader.java
core/branches/2.3.x/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/TestPropertiesExtracting.java
core/branches/2.3.x/packaging/module/src/main/javascript/core.packaging.module.js
Log:
COR-228
What is the problem to fix?
Implementation that uses iText does not support many XMP metadata. Make new implementation of PdfDocumentReader.getProperties() using PdfBox instead of iText.
How is the problem fixed?
Use PdfBox to extract XMP metadata.
iText was removed from code.
Modified: core/branches/2.3.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PDFDocumentReader.java
===================================================================
--- core/branches/2.3.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PDFDocumentReader.java 2011-06-09 14:54:48 UTC (rev 4494)
+++ core/branches/2.3.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PDFDocumentReader.java 2011-06-10 08:31:59 UTC (rev 4495)
@@ -18,37 +18,28 @@
*/
package org.exoplatform.services.document.impl;
-import com.lowagie.text.pdf.PdfDate;
-import com.lowagie.text.pdf.PdfReader;
-
+import org.apache.jempbox.xmp.XMPMetadata;
+import org.apache.jempbox.xmp.XMPSchemaBasic;
+import org.apache.jempbox.xmp.XMPSchemaDublinCore;
+import org.apache.pdfbox.exceptions.InvalidPasswordException;
import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
+import org.apache.pdfbox.pdmodel.PDDocumentInformation;
+import org.apache.pdfbox.pdmodel.common.PDMetadata;
import org.apache.pdfbox.util.PDFTextStripper;
-import org.exoplatform.commons.utils.ISO8601;
import org.exoplatform.services.document.DCMetaData;
import org.exoplatform.services.document.DocumentReadException;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.StringWriter;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.text.ParseException;
+import java.io.UnsupportedEncodingException;
import java.util.Calendar;
-import java.util.HashMap;
+import java.util.List;
import java.util.Properties;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
/**
* Created by The eXo Platform SAS A parser of Adobe PDF files.
*
@@ -79,79 +70,51 @@
*/
public String getContentAsText(final InputStream is) throws IOException, DocumentReadException
{
-
+ if (is == null)
+ {
+ throw new NullPointerException("InputStream is null.");
+ }
+ PDDocument pdDocument = null;
+ StringWriter sw = new StringWriter();
try
{
- return (String)AccessController.doPrivileged(new PrivilegedExceptionAction<Object>()
- {
- public Object run() throws Exception
- {
- if (is == null)
- {
- throw new NullPointerException("InputStream is null.");
- }
- PDDocument pdDocument = null;
- StringWriter sw = new StringWriter();
- try
- {
- if (is.available() == 0)
- return "";
+ if (is.available() == 0)
+ return "";
- try
- {
- pdDocument = PDDocument.load(is);
- }
- catch (IOException e)
- {
- throw new DocumentReadException("Can not load PDF document.", e);
- }
-
- PDFTextStripper stripper = new PDFTextStripper();
- stripper.setStartPage(1);
- stripper.setEndPage(Integer.MAX_VALUE);
- stripper.writeText(pdDocument, sw);
- }
- finally
- {
- if (pdDocument != null)
- try
- {
- pdDocument.close();
- }
- catch (IOException e)
- {
- }
- if (is != null)
- try
- {
- is.close();
- }
- catch (IOException e)
- {
- }
- }
- return sw.toString();
- }
- });
-
- }
- catch (PrivilegedActionException pae)
- {
- Throwable cause = pae.getCause();
- if (cause instanceof IOException)
+ try
{
- throw (IOException)cause;
+ pdDocument = PDDocument.load(is);
}
- else if (cause instanceof RuntimeException)
+ catch (IOException e)
{
- throw (RuntimeException)cause;
+ throw new DocumentReadException("Can not load PDF document.", e);
}
- else
- {
- throw new RuntimeException(cause);
- }
+
+ PDFTextStripper stripper = new PDFTextStripper();
+ stripper.setStartPage(1);
+ stripper.setEndPage(Integer.MAX_VALUE);
+ stripper.writeText(pdDocument, sw);
}
-
+ finally
+ {
+ if (pdDocument != null)
+ try
+ {
+ pdDocument.close();
+ }
+ catch (IOException e)
+ {
+ }
+ if (is != null)
+ try
+ {
+ is.close();
+ }
+ catch (IOException e)
+ {
+ }
+ }
+ return sw.toString();
}
public String getContentAsText(InputStream is, String encoding) throws IOException, DocumentReadException
@@ -168,204 +131,269 @@
*/
public Properties getProperties(InputStream is) throws IOException, DocumentReadException
{
-
- Properties props = null;
-
- PdfReader reader = new PdfReader(is, "".getBytes());
-
- // Read the file metadata
- byte[] metadata = reader.getMetadata();
-
- if (metadata != null)
+ PDDocument pdDocument = PDDocument.load(is);
+ Properties props = new Properties();
+ try
{
- // there is XMP metadata try exctract it
- props = getPropertiesFromMetadata(metadata);
- }
-
- if (props == null)
- {
- // it's old pdf document version
- props = getPropertiesFromInfo(reader.getInfo());
- }
- reader.close();
- if (is != null)
- try
+ if (pdDocument.isEncrypted())
{
- is.close();
+ try
+ {
+ pdDocument.decrypt("");
+ }
+ catch (InvalidPasswordException e)
+ {
+ throw new DocumentReadException("The pdf document is encrypted.", e);
+ }
+ catch (org.apache.pdfbox.exceptions.CryptographyException e)
+ {
+ throw new DocumentReadException(e.getMessage(), e);
+ }
}
- catch (IOException e)
+
+ PDDocumentCatalog catalog = pdDocument.getDocumentCatalog();
+ PDMetadata meta = catalog.getMetadata();
+ if (meta != null)
{
- }
- return props;
- }
+ XMPMetadata metadata = meta.exportXMPMetadata();
- /**
- * Extract properties from XMP xml.
- *
- * @param metadata XML as byte array
- * @return extracted properties
- * @throws DocumentReadException
- * @throws Exception if extracting fails
- */
- protected Properties getPropertiesFromMetadata(byte[] metadata) throws IOException, DocumentReadException
- {
+ XMPSchemaDublinCore dc = metadata.getDublinCoreSchema();
+ if (dc != null)
+ {
+ try
+ {
+ if (dc.getTitle() != null)
+ props.put(DCMetaData.TITLE, fixEncoding(dc.getTitle()));
+ }
+ catch (Exception e)
+ {
+ log.warn("getTitle failed: " + e);
+ }
+ try
+ {
+ if (dc.getDescription() != null)
+ props.put(DCMetaData.SUBJECT, fixEncoding(dc.getDescription()));
+ }
+ catch (Exception e)
+ {
+ log.warn("getSubject failed: " + e);
+ }
- Properties props = null;
+ try
+ {
+ if (dc.getCreators() != null)
+ {
+ List<String> list = dc.getCreators();
+ for (String creator : list)
+ {
+ props.put(DCMetaData.CREATOR, fixEncoding(creator));
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ log.warn("getCreator failed: " + e);
+ }
- // parse xml
+ try
+ {
+ if (dc.getDates() != null)
+ {
+ List<Calendar> list = dc.getDates();
- Document doc;
- try
- {
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- DocumentBuilder docBuilder = dbf.newDocumentBuilder();
- doc = docBuilder.parse(new ByteArrayInputStream(metadata));
- }
- catch (SAXException e)
- {
- throw new DocumentReadException(e.getMessage(), e);
- }
- catch (ParserConfigurationException e)
- {
- throw new DocumentReadException(e.getMessage(), e);
- }
+ for (Calendar date : list)
+ {
+ props.put(DCMetaData.DATE, date);
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ log.warn("getDate failed: " + e);
+ }
+ }
- // Check is there PDF/A-1 XMP
- String version = "";
- NodeList list = doc.getElementsByTagName("pdfaid:conformance");
- if (list != null && list.item(0) != null)
- {
- version += list.item(0).getTextContent() + "-";
- }
+ XMPSchemaBasic basic = metadata.getBasicSchema();
+ if (basic != null)
+ {
+ try
+ {
+ if (basic.getCreateDate() != null)
+ props.put(DCMetaData.DATE, basic.getCreateDate());
+ }
+ catch (Exception e)
+ {
+ log.warn("getCreationDate failed: " + e);
+ }
+ try
+ {
+ if (basic.getModifyDate() != null)
+ props.put(DCMetaData.DATE, basic.getModifyDate());
+ }
+ catch (Exception e)
+ {
+ log.warn("getModificationDate failed: " + e);
+ }
+ }
+ }
- list = doc.getElementsByTagName("pdfaid:part");
- if (list != null && list.item(0) != null)
- {
- version += list.item(0).getTextContent();
- }
+ if (props.isEmpty())
+ {
+ // The pdf doesn't contain any XMP metadata or XMP metadata do not contains any
+ // usefull data, try to use the document information instead
+ PDDocumentInformation docInfo = pdDocument.getDocumentInformation();
- // PDF/A-1a or PDF/A-1b
- if (version.equalsIgnoreCase("A-1"))
- {
- props = getPropsFromPDFAMetadata(doc);
- }
+ if (docInfo != null)
+ {
+ try
+ {
+ if (docInfo.getCreationDate() != null)
+ props.put(DCMetaData.DATE, docInfo.getCreationDate());
+ }
+ catch (Exception e)
+ {
+ log.warn("getCreationDate failed: " + e);
+ }
+ try
+ {
+ if (docInfo.getCreator() != null)
+ props.put(DCMetaData.CREATOR, docInfo.getCreator());
+ }
+ catch (Exception e)
+ {
+ log.warn("getCreator failed: " + e);
+ }
+ try
+ {
- return props;
- }
-
- /**
- * Extracts properties from PDF Info hash set.
- *
- * @param Pdf Info hash set
- * @return Extracted properties
- * @throws Exception if extracting fails
- */
- @SuppressWarnings("unchecked")
- protected Properties getPropertiesFromInfo(HashMap info) throws IOException
- {
- Properties props = new Properties();
-
- String title = (String)info.get("Title");
- if (title != null)
- {
- props.put(DCMetaData.TITLE, title);
+ if (docInfo.getKeywords() != null)
+ props.put(DCMetaData.SUBJECT, docInfo.getKeywords());
+ }
+ catch (Exception e)
+ {
+ log.warn("getKeywords failed: " + e);
+ }
+ try
+ {
+ if (docInfo.getModificationDate() != null)
+ props.put(DCMetaData.DATE, docInfo.getModificationDate());
+ }
+ catch (Exception e)
+ {
+ log.warn("getModificationDate failed: " + e);
+ }
+ try
+ {
+ if (docInfo.getSubject() != null)
+ props.put(DCMetaData.DESCRIPTION, docInfo.getSubject());
+ }
+ catch (Exception e)
+ {
+ log.warn("getSubject failed: " + e);
+ }
+ try
+ {
+ if (docInfo.getTitle() != null)
+ props.put(DCMetaData.TITLE, docInfo.getTitle());
+ }
+ catch (Exception e)
+ {
+ log.warn("getTitle failed: " + e);
+ }
+ }
+ }
}
-
- String author = (String)info.get("Author");
- if (author != null)
+ finally
{
- props.put(DCMetaData.CREATOR, author);
+ if (pdDocument != null)
+ {
+ pdDocument.close();
+ }
}
- String subject = (String)info.get("Subject");
- if (subject != null)
- {
- props.put(DCMetaData.SUBJECT, subject);
- }
-
- String creationDate = (String)info.get("CreationDate");
- if (creationDate != null)
- {
- props.put(DCMetaData.DATE, PdfDate.decode(creationDate));
- }
-
- String modDate = (String)info.get("ModDate");
- if (modDate != null)
- {
- props.put(DCMetaData.DATE, PdfDate.decode(modDate));
- }
-
return props;
}
- private Properties getPropsFromPDFAMetadata(Document doc) throws IOException, DocumentReadException
+ private String fixEncoding(String str) throws DocumentReadException
{
- Properties props = new Properties();
- // get properties
- NodeList list = doc.getElementsByTagName("rdf:li");
- if (list != null && list.getLength() > 0)
+ try
{
- for (int i = 0; i < list.getLength(); i++)
+ String encoding = null;
+ int orderMaskOffset = 0;
+
+ if (str.startsWith("\\000\\000\\376\\377"))
{
-
- Node n = list.item(i);
- // dc:title - TITLE
- if (n.getParentNode().getParentNode().getNodeName().equals("dc:title"))
- {
- String title = n.getLastChild().getTextContent();
- props.put(DCMetaData.TITLE, title);
- }
-
- // dc:creator - CREATOR
- if (n.getParentNode().getParentNode().getNodeName().equals("dc:creator"))
- {
- String author = n.getLastChild().getTextContent();
- props.put(DCMetaData.CREATOR, author);
- }
-
- // DC:description - SUBJECT
- if (n.getParentNode().getParentNode().getNodeName().equals("dc:description"))
- {
- String description = n.getLastChild().getTextContent();
- props.put(DCMetaData.SUBJECT, description);
- // props.put(DCMetaData.DESCRIPTION, description);
- }
+ encoding = "UTF-32BE";
+ orderMaskOffset = 16;
}
- }
-
- try
- {
- // xmp:CreateDate - DATE
- list = doc.getElementsByTagName("xmp:CreateDate");
- if (list != null && list.item(0) != null)
+ else if (str.startsWith("\\377\\376\\000\\000"))
{
- Node creationDateNode = list.item(0).getLastChild();
- if (creationDateNode != null)
- {
- String creationDate = creationDateNode.getTextContent();
- Calendar c = ISO8601.parseEx(creationDate);
- props.put(DCMetaData.DATE, c);
- }
+ encoding = "UTF-32LE";
+ orderMaskOffset = 16;
}
+ else if (str.startsWith("\\376\\377"))
+ {
+ encoding = "UTF-16BE";
+ orderMaskOffset = 8;
+ }
+ else if (str.startsWith("\\377\\376"))
+ {
+ encoding = "UTF-16LE";
+ orderMaskOffset = 8;
+ }
- // xmp:ModifyDate - DATE
- list = doc.getElementsByTagName("xmp:ModifyDate");
- if (list != null && list.item(0) != null)
+ if (encoding == null)
{
- Node modifyDateNode = list.item(0).getLastChild();
- if (modifyDateNode != null)
+ // return default
+ return str;
+ }
+ else
+ {
+ int i = orderMaskOffset, len = str.length();
+ char c;
+ StringBuilder sb = new StringBuilder(len);
+ while (i < len)
{
- String modifyDate = modifyDateNode.getTextContent();
- Calendar c = ISO8601.parseEx(modifyDate);
- props.put(DCMetaData.DATE, c);
+ c = str.charAt(i++);
+ if (c == '\\')
+ {
+ if (i + 3 <= len)
+ {
+ //extract octal-code
+ try
+ {
+ c = (char)Integer.parseInt(str.substring(i, i + 3), 8);
+ i += 3;
+ }
+ catch (NumberFormatException e)
+ {
+ if (log.isDebugEnabled())
+ {
+ log.debug(
+ "PDF metadata exctraction warning: can not decode octal code - "
+ + str.substring(i - 1, i + 3) + ".", e);
+ }
+ }
+ }
+ else
+ {
+ if (log.isDebugEnabled())
+ {
+ log.debug("PDF metadata exctraction warning: octal code is not complete - "
+ + str.substring(i - 1, len));
+ }
+ }
+ }
+ sb.append(c);
}
+
+ byte[] bytes = sb.toString().getBytes();
+ return new String(bytes, encoding);
}
}
- catch (ParseException e)
+ catch (UnsupportedEncodingException e)
{
throw new DocumentReadException(e.getMessage(), e);
}
- return props;
}
-
}
Modified: core/branches/2.3.x/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/TestPropertiesExtracting.java
===================================================================
--- core/branches/2.3.x/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/TestPropertiesExtracting.java 2011-06-09 14:54:48 UTC (rev 4494)
+++ core/branches/2.3.x/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/TestPropertiesExtracting.java 2011-06-10 08:31:59 UTC (rev 4495)
@@ -18,7 +18,6 @@
*/
package org.exoplatform.services.document.test;
-import org.exoplatform.commons.utils.ISO8601;
import org.exoplatform.services.document.DCMetaData;
import org.exoplatform.services.document.DocumentReader;
import org.exoplatform.services.document.DocumentReaderService;
@@ -34,6 +33,22 @@
{
DocumentReaderService service;
+ private void evalProps(Properties etalon, Properties testedProps, boolean testSize)
+ {
+ Iterator it = etalon.entrySet().iterator();
+ while (it.hasNext())
+ {
+ Map.Entry prop = (Map.Entry)it.next();
+ Object tval = testedProps.get(prop.getKey());
+ assertNotNull(prop.getKey() + " property not founded. ", tval);
+ assertEquals(prop.getKey() + " property value is incorrect", prop.getValue(), tval);
+ }
+ if (testSize)
+ {
+ assertEquals("size is incorrect", etalon.size(), testedProps.size());
+ }
+ }
+
@Override
public void setUp() throws Exception
{
@@ -41,20 +56,21 @@
service = (DocumentReaderService)getComponentInstanceOfType(DocumentReaderService.class);
}
- public void testPDFDocumentReaderServiceXMPMetadata() throws Exception
+ public void testExcelDocumentReaderService() throws Exception
{
- InputStream is = TestPropertiesExtracting.class.getResourceAsStream("/MyTest.pdf");
+ InputStream is = TestPropertiesExtracting.class.getResourceAsStream("/test.xls");
try
{
- DocumentReader rdr = service.getDocumentReader("application/pdf");
- Properties testprops = rdr.getProperties(is);
+ Properties props = service.getDocumentReader("application/excel").getProperties(is);
Properties etalon = new Properties();
- etalon.put(DCMetaData.TITLE, "Test de convertion de fichier tif");
- etalon.put(DCMetaData.CREATOR, "Christian Klaus");
- etalon.put(DCMetaData.SUBJECT, "20080901 TEST Christian Etat OK");
- Calendar c = ISO8601.parseEx("2008-09-01T08:01:10+00:00");
- etalon.put(DCMetaData.DATE, c);
- evalProps(etalon, testprops);
+ etalon.put(DCMetaData.TITLE, "test-Title");
+ etalon.put(DCMetaData.DATE, new Date(1283247293000L));
+ etalon.put(DCMetaData.SUBJECT, "test-Subject");
+ etalon.put(DCMetaData.CREATOR, "KHANH NGUYEN GIA");
+ etalon.put(DCMetaData.CONTRIBUTOR, "Max Yakimenko");
+ etalon.put(DCMetaData.DESCRIPTION, "test-Comments");
+
+ evalProps(etalon, props, true);
}
finally
{
@@ -62,20 +78,25 @@
}
}
- public void testWordDocumentReaderService() throws Exception
+ public void testOODocumentReaderService() throws Exception
{
- InputStream is = TestPropertiesExtracting.class.getResourceAsStream("/test.doc");
+ InputStream is = TestPropertiesExtracting.class.getResourceAsStream("/test.odt");
try
{
- Properties props = service.getDocumentReader("application/msword").getProperties(is);
+ Properties props = service.getDocumentReader("application/vnd.oasis.opendocument.text").getProperties(is);
Properties etalon = new Properties();
+ Calendar date = Calendar.getInstance();
+ date.setTimeInMillis(0);
+ date.set(2010, 7, 31, 14, 13, 23);
+
etalon.put(DCMetaData.TITLE, "test-Title");
- etalon.put(DCMetaData.DATE, new Date(1283247060000L));
+ etalon.put(DCMetaData.LANGUAGE, "ru-RU");
+ etalon.put(DCMetaData.DATE, "2010-08-31T14:13:23");
etalon.put(DCMetaData.SUBJECT, "test-Subject");
- etalon.put(DCMetaData.CREATOR, "Max Yakimenko");
- etalon.put(DCMetaData.CONTRIBUTOR, "Max Yakimenko");
+ etalon.put(DCMetaData.CREATOR, "nikolaz ");
etalon.put(DCMetaData.DESCRIPTION, "test-Comments");
- evalProps(etalon, props);
+
+ evalProps(etalon, props, true);
}
finally
{
@@ -83,6 +104,92 @@
}
}
+ public void testPDFDocumentReaderService() throws Exception
+ {
+ InputStream is = TestPropertiesExtracting.class.getResourceAsStream("/test.pdf");
+ DocumentReader rdr = service.getDocumentReader("application/pdf");
+ Properties props = rdr.getProperties(is);
+ assertTrue(props.isEmpty());
+
+ // Properties etalon = new Properties();
+ // etalon.put(DCMetaData.PUBLISHER, "FOP 0.20.4");
+ // evalProps(etalon, props, false);
+ }
+
+ public void testPDFDocumentReaderServiceBrokenFile() throws Exception
+ {
+ InputStream is = TestPropertiesExtracting.class.getResourceAsStream("/pfs_accapp.pdf");
+ try
+ {
+
+ DocumentReader rdr = service.getDocumentReader("application/pdf");
+ Properties testprops = rdr.getProperties(is);
+ Properties etalon = new Properties();
+ etalon.put(DCMetaData.TITLE, "Personal Account Opening Form VN");
+ etalon.put(DCMetaData.CREATOR, "mr");
+ evalProps(etalon, testprops, false);
+ }
+ finally
+ {
+ is.close();
+ }
+ }
+
+ public void testPDFDocumentReaderServiceMetro() throws Exception
+ {
+ InputStream is = TestPropertiesExtracting.class.getResourceAsStream("/metro.pdf");
+ try
+ {
+
+ DocumentReader rdr = service.getDocumentReader("application/pdf");
+ Properties testprops = rdr.getProperties(is);
+ Properties etalon = new Properties();
+ etalon.put(DCMetaData.TITLE, "metro");
+ etalon.put(DCMetaData.CREATOR, "Preview");
+ evalProps(etalon, testprops, false);
+ }
+ finally
+ {
+ is.close();
+ }
+ }
+
+ public void testPDFDocumentReaderServiceXMPUsecase1() throws Exception
+ {
+ InputStream is = TestPropertiesExtracting.class.getResourceAsStream("/MyTest.pdf");
+ DocumentReader rdr = service.getDocumentReader("application/pdf");
+
+ Properties testprops = rdr.getProperties(is);
+ // printProps(testprops);
+
+ Properties etalon = new Properties();
+ etalon.put(DCMetaData.TITLE, "Test de convertion de fichier tif");
+ etalon.put(DCMetaData.CREATOR, "Christian Klaus");
+ etalon.put(DCMetaData.SUBJECT, "20080901 TEST Christian Etat OK");
+ // Calendar c = ISO8601.parseEx("2008-09-01T08:01:10+00:00");
+ // etalon.put(DCMetaData.DATE, c);
+
+ evalProps(etalon, testprops, false);
+ }
+
+ public void testPDFDocumentReaderServiceXMPUsecase2() throws Exception
+ {
+ InputStream is = TestPropertiesExtracting.class.getResourceAsStream("/Trait_union.06.Mai_2009.pdf");
+ try
+ {
+ DocumentReader rdr = service.getDocumentReader("application/pdf");
+ Properties testprops = rdr.getProperties(is);
+ Properties etalon = new Properties();
+ etalon.put(DCMetaData.TITLE, "journal interne mai 2009.qxp");
+ etalon.put(DCMetaData.CREATOR, "presse");
+ evalProps(etalon, testprops, false);
+ }
+ finally
+ {
+ is.close();
+ }
+ }
+
public void testPPTDocumentReaderService() throws Exception
{
InputStream is = TestPropertiesExtracting.class.getResourceAsStream("/test.ppt");
@@ -96,7 +203,7 @@
etalon.put(DCMetaData.CREATOR, "Max Yakimenko");
etalon.put(DCMetaData.CONTRIBUTOR, "Max Yakimenko");
etalon.put(DCMetaData.DESCRIPTION, "test-Comments");
- evalProps(etalon, props);
+ evalProps(etalon, props, true);
}
finally
{
@@ -104,21 +211,20 @@
}
}
- public void testExcelDocumentReaderService() throws Exception
+ public void testWordDocumentReaderService() throws Exception
{
- InputStream is = TestPropertiesExtracting.class.getResourceAsStream("/test.xls");
+ InputStream is = TestPropertiesExtracting.class.getResourceAsStream("/test.doc");
try
{
- Properties props = service.getDocumentReader("application/excel").getProperties(is);
+ Properties props = service.getDocumentReader("application/msword").getProperties(is);
Properties etalon = new Properties();
etalon.put(DCMetaData.TITLE, "test-Title");
- etalon.put(DCMetaData.DATE, new Date(1283247293000L));
+ etalon.put(DCMetaData.DATE, new Date(1283247060000L));
etalon.put(DCMetaData.SUBJECT, "test-Subject");
- etalon.put(DCMetaData.CREATOR, "KHANH NGUYEN GIA");
+ etalon.put(DCMetaData.CREATOR, "Max Yakimenko");
etalon.put(DCMetaData.CONTRIBUTOR, "Max Yakimenko");
etalon.put(DCMetaData.DESCRIPTION, "test-Comments");
-
- evalProps(etalon, props);
+ evalProps(etalon, props, true);
}
finally
{
@@ -126,27 +232,27 @@
}
}
- public void testXWordDocumentReaderService() throws Exception
+ public void testXExcelDocumentReaderService() throws Exception
{
- InputStream is = TestPropertiesExtracting.class.getResourceAsStream("/test.docx");
+ InputStream is = TestPropertiesExtracting.class.getResourceAsStream("/test.xlsx");
try
{
Properties props =
- service.getDocumentReader("application/vnd.openxmlformats-officedocument.wordprocessingml.document")
+ service.getDocumentReader("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
.getProperties(is);
Properties etalon = new Properties();
Calendar date = Calendar.getInstance();
date.setTimeInMillis(0);
- date.set(2010, 7, 31, 7, 53, 0);
+ date.set(2010, 7, 31, 8, 7, 25);
etalon.put(DCMetaData.TITLE, "test-Title");
etalon.put(DCMetaData.DATE, date.getTime());
- etalon.put(DCMetaData.SUBJECT, "Subject");
- etalon.put(DCMetaData.CREATOR, "nikolaz");
+ etalon.put(DCMetaData.SUBJECT, "test-Subject");
+ etalon.put(DCMetaData.CREATOR, "KHANH NGUYEN GIA");
etalon.put(DCMetaData.CONTRIBUTOR, "Max Yakimenko");
etalon.put(DCMetaData.DESCRIPTION, "test-Comments");
- evalProps(etalon, props);
+ evalProps(etalon, props, true);
}
finally
{
@@ -174,7 +280,7 @@
etalon.put(DCMetaData.CONTRIBUTOR, "Max Yakimenko");
etalon.put(DCMetaData.DESCRIPTION, "test-Comments");
- evalProps(etalon, props);
+ evalProps(etalon, props, true);
}
finally
{
@@ -182,27 +288,27 @@
}
}
- public void testXExcelDocumentReaderService() throws Exception
+ public void testXWordDocumentReaderService() throws Exception
{
- InputStream is = TestPropertiesExtracting.class.getResourceAsStream("/test.xlsx");
+ InputStream is = TestPropertiesExtracting.class.getResourceAsStream("/test.docx");
try
{
Properties props =
- service.getDocumentReader("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+ service.getDocumentReader("application/vnd.openxmlformats-officedocument.wordprocessingml.document")
.getProperties(is);
Properties etalon = new Properties();
Calendar date = Calendar.getInstance();
date.setTimeInMillis(0);
- date.set(2010, 7, 31, 8, 7, 25);
+ date.set(2010, 7, 31, 7, 53, 0);
etalon.put(DCMetaData.TITLE, "test-Title");
etalon.put(DCMetaData.DATE, date.getTime());
- etalon.put(DCMetaData.SUBJECT, "test-Subject");
- etalon.put(DCMetaData.CREATOR, "KHANH NGUYEN GIA");
+ etalon.put(DCMetaData.SUBJECT, "Subject");
+ etalon.put(DCMetaData.CREATOR, "nikolaz");
etalon.put(DCMetaData.CONTRIBUTOR, "Max Yakimenko");
etalon.put(DCMetaData.DESCRIPTION, "test-Comments");
- evalProps(etalon, props);
+ evalProps(etalon, props, true);
}
finally
{
@@ -210,47 +316,4 @@
}
}
- public void testOODocumentReaderService() throws Exception
- {
- InputStream is = TestPropertiesExtracting.class.getResourceAsStream("/test.odt");
- try
- {
- Properties props = service.getDocumentReader("application/vnd.oasis.opendocument.text").getProperties(is);
- Properties etalon = new Properties();
- Calendar date = Calendar.getInstance();
- date.setTimeInMillis(0);
- date.set(2010, 7, 31, 14, 13, 23);
-
- etalon.put(DCMetaData.TITLE, "test-Title");
- etalon.put(DCMetaData.LANGUAGE, "ru-RU");
- etalon.put(DCMetaData.DATE, "2010-08-31T14:13:23");
- etalon.put(DCMetaData.SUBJECT, "test-Subject");
- etalon.put(DCMetaData.CREATOR, "nikolaz ");
- etalon.put(DCMetaData.DESCRIPTION, "test-Comments");
-
- evalProps(etalon, props);
- }
- finally
- {
- is.close();
- }
- }
-
- private void evalProps(Properties etalon, Properties testedProps)
- {
- Iterator it = etalon.entrySet().iterator();
- while (it.hasNext())
- {
- Map.Entry prop = (Map.Entry)it.next();
- Object tval = testedProps.get(prop.getKey());
- assertNotNull(prop.getKey() + " property not founded. ", tval);
- if (tval instanceof Date)
- {
- System.out.println("was:" + ((Date)tval).getTime() + " expected: " + ((Date)prop.getValue()).getTime());
- }
- assertEquals(prop.getKey() + " property value is incorrect", prop.getValue(), tval);
- }
- assertEquals("size is incorrect", etalon.size(), testedProps.size());
- }
-
}
Added: core/branches/2.3.x/exo.core.component.document/src/test/resources/Trait_union.06.Mai_2009.pdf
===================================================================
(Binary files differ)
Property changes on: core/branches/2.3.x/exo.core.component.document/src/test/resources/Trait_union.06.Mai_2009.pdf
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: core/branches/2.3.x/exo.core.component.document/src/test/resources/metro.pdf
===================================================================
(Binary files differ)
Property changes on: core/branches/2.3.x/exo.core.component.document/src/test/resources/metro.pdf
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: core/branches/2.3.x/exo.core.component.document/src/test/resources/pfs_accapp.pdf
===================================================================
(Binary files differ)
Property changes on: core/branches/2.3.x/exo.core.component.document/src/test/resources/pfs_accapp.pdf
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: core/branches/2.3.x/packaging/module/src/main/javascript/core.packaging.module.js
===================================================================
--- core/branches/2.3.x/packaging/module/src/main/javascript/core.packaging.module.js 2011-06-09 14:54:48 UTC (rev 4494)
+++ core/branches/2.3.x/packaging/module/src/main/javascript/core.packaging.module.js 2011-06-10 08:31:59 UTC (rev 4495)
@@ -39,6 +39,7 @@
module.component.documents =
new Project("org.exoplatform.core", "exo.core.component.document", "jar", module.version).
addDependency(new Project("org.apache.pdfbox", "pdfbox", "jar", "1.1.0")).
+ addDependency(new Project("org.apache.pdfbox", "jempbox", "jar", "1.1.0")).
addDependency(new Project("com.lowagie", "itext", "jar", "2.1.0")).
addDependency(new Project("bouncycastle", "bcmail-jdk14", "jar", "136")).
addDependency(new Project("bouncycastle", "bcprov-jdk14", "jar", "136")).
Added: core/branches/2.3.x/patch/2.3.8/COR-228/readme.txt
===================================================================
--- core/branches/2.3.x/patch/2.3.8/COR-228/readme.txt (rev 0)
+++ core/branches/2.3.x/patch/2.3.8/COR-228/readme.txt 2011-06-10 08:31:59 UTC (rev 4495)
@@ -0,0 +1,71 @@
+Summary
+
+ Status: Make PdfDocumentReader.getProperties() use PdfBox instead of iText
+ CCP Issue: N/A, Product Jira Issue: COR-228.
+ Complexity: hard
+
+The Proposal
+Problem description
+
+What is the problem to fix?
+
+ Implementation that uses iText does not support many XMP metadata. Make new implementation of PdfDocumentReader.getProperties() using PdfBox instead of iText.
+
+Fix description
+
+How is the problem fixed?
+
+ Use PdfBox to extract XMP metadata.
+ iText was removed from code.
+
+Patch information:
+Patch file(s): COR-228.patch
+
+Tests to perform:
+Test performed at Support level
+Test on 3 pdf files (metro.pdf, pfs_accapp.pdf, Train_union.06.Mai_2009.pdf): using Webdav or ECMS Content explorer (in a Content folder)
+
+ Upload file from local to eXo PLF server
+ Copy-paste file inside JCR folders
+ Check how its name and title display
+
+Tests performed at DevLevel
+
+ Add these 3 PDF files into src/test/resources
+ TestPropertiesExtraction and other core.document tests
+
+Tests performed at QA
+*
+
+Documentation changes
+
+Documentation changes:
+ none
+
+Configuration changes
+
+Configuration changes:
+ none
+
+Will previous configuration continue to work?
+ yes
+
+Risks and impacts
+
+Can this bug fix have any side effects on current client projects?
+ The behavior of PDFDocumentReader.getProperties based on PdfBox may be different than based on iText
+
+Is there a performance risk/cost?
+ none
+
+Validation (PM/Support/QA)
+
+PM Comment
+* Patch approved by the PL
+
+Support Comment
+* Support review : patch validated
+
+QA Feedbacks
+*
+
12 years, 11 months
- 1
- 0
exo-jcr SVN: r4494 - kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-06-09 10:54:48 -0400 (Thu, 09 Jun 2011)
New Revision: 4494
Modified:
kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/SecurityHelper.java
Log:
EXOJCR-1365: enable to throw RuntimeException in doPrivilegedExceptionAction() method
Modified: kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/SecurityHelper.java
===================================================================
--- kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/SecurityHelper.java 2011-06-09 13:31:35 UTC (rev 4493)
+++ kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/SecurityHelper.java 2011-06-09 14:54:48 UTC (rev 4494)
@@ -308,6 +308,10 @@
{
return action.run();
}
+ catch (RuntimeException e)
+ {
+ throw e;
+ }
catch (Exception e)
{
throw new PrivilegedActionException(e);
12 years, 11 months
- 1
- 0
exo-jcr SVN: r4493 - in jcr/trunk/exo.jcr.component.core: src/test/java/org/exoplatform/services/jcr/usecases/common and 1 other directory.
by do-not-reply＠jboss.org
Author: sergiykarpenko
Date: 2011-06-09 09:31:35 -0400 (Thu, 09 Jun 2011)
New Revision: 4493
Added:
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/common/RemoveSameNameSiblingUnfixedTest.java
Modified:
jcr/trunk/exo.jcr.component.core/pom.xml
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/common/RemoveSameNameSiblingTest.java
Log:
EXOJCR-1377: move failed tests from RemoveSameNameSiblingTest to RemoveSameNameSiblingUnfixedTest and exclude it.
Modified: jcr/trunk/exo.jcr.component.core/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/pom.xml 2011-06-09 09:40:02 UTC (rev 4492)
+++ jcr/trunk/exo.jcr.component.core/pom.xml 2011-06-09 13:31:35 UTC (rev 4493)
@@ -417,6 +417,7 @@
<exclude>org/exoplatform/services/jcr/**/impl/**/TestWorkspaceManagement.java</exclude>
<exclude>org/exoplatform/services/jcr/**/impl/**/TestJCRSerializationStream.java</exclude>
<exclude>org/exoplatform/services/jcr/**/impl/**/TestJCRSerializationVersionRestore.java</exclude>
+ <exclude>org/exoplatform/services/jcr/usecases/common/RemoveSameNameSiblingUnfixedTest.java</exclude>
<exclude>org/exoplatform/services/jcr/**/impl/**/SQLBenchmarkTest.java</exclude>
</excludes>
</configuration>
@@ -757,6 +758,7 @@
<exclude>org/exoplatform/services/jcr/**/impl/**/TestRepositoryManagement.java</exclude>
<exclude>org/exoplatform/services/jcr/**/impl/**/TestJCRSerializationStream.java</exclude>
<exclude>org/exoplatform/services/jcr/**/impl/**/TestJCRSerializationVersionRestore.java</exclude>
+ <exclude>org/exoplatform/services/jcr/usecases/common/RemoveSameNameSiblingUnfixedTest.java</exclude>
<exclude>org/exoplatform/services/jcr/**/impl/**/SQLBenchmarkTest.java</exclude>
<!-- From TCK -->
<exclude>org/apache/jackrabbit/test/api/TestAll.java</exclude>
Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/common/RemoveSameNameSiblingTest.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/common/RemoveSameNameSiblingTest.java 2011-06-09 09:40:02 UTC (rev 4492)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/common/RemoveSameNameSiblingTest.java 2011-06-09 13:31:35 UTC (rev 4493)
@@ -207,8 +207,8 @@
try
{
Query query =
- session.getWorkspace().getQueryManager().createQuery(
- "select * from nt:base where jcr:path like '/u1/child[3]/%'", Query.SQL);
+ session.getWorkspace().getQueryManager()
+ .createQuery("select * from nt:base where jcr:path like '/u1/child[3]/%'", Query.SQL);
QueryResult queryResult = query.execute();
NodeIterator iterator = queryResult.getNodes();
while (iterator.hasNext())
@@ -217,8 +217,8 @@
}
query =
- session.getWorkspace().getQueryManager().createQuery(
- "select * from nt:base where jcr:path like '/u1/child[2]/%'", Query.SQL);
+ session.getWorkspace().getQueryManager()
+ .createQuery("select * from nt:base where jcr:path like '/u1/child[2]/%'", Query.SQL);
queryResult = query.execute();
iterator = queryResult.getNodes();
while (iterator.hasNext())
@@ -259,8 +259,8 @@
try
{
Query query =
- session.getWorkspace().getQueryManager().createQuery("/jcr:root/u1/child[3]//element(*, nt:base)",
- Query.XPATH);
+ session.getWorkspace().getQueryManager()
+ .createQuery("/jcr:root/u1/child[3]//element(*, nt:base)", Query.XPATH);
QueryResult queryResult = query.execute();
NodeIterator iterator = queryResult.getNodes();
while (iterator.hasNext())
@@ -269,8 +269,8 @@
}
query =
- session.getWorkspace().getQueryManager().createQuery("/jcr:root/u1/child[2]//element(*, nt:base)",
- Query.XPATH);
+ session.getWorkspace().getQueryManager()
+ .createQuery("/jcr:root/u1/child[2]//element(*, nt:base)", Query.XPATH);
queryResult = query.execute();
iterator = queryResult.getNodes();
while (iterator.hasNext())
@@ -367,49 +367,4 @@
fail(e.getMessage());
}
}
-
- public void testRemoveSameNameSiblings() throws Exception
- {
-
- Node testRoot = root.addNode("snsRemoveTest");
- session.save();
-
- try
- {
-
- Node node1 = testRoot.addNode("_node");
- node1.setProperty("prop", "_data1");
- Node node2 = testRoot.addNode("_node");
- node2.setProperty("prop", "_data2");
- Node node3 = node2.addNode("node3");
- testRoot.save();
-
- try
- {
- assertEquals("/snsRemoveTest/_node[2]/node3", node2.getNode("node3").getPath());
- node1.remove(); // /snsRemoveTest/_node[2] -> /snsRemoveTest/_node[1]
-
- // check
- String n2p = node2.getProperty("prop").getString();
- assertEquals("A property must be same ", "_data2", n2p);
-
- // TODO there is a problem, we can't see deep subtree of reindexed same-name-siblings now.
- // after save it will be ok.
- // See http://jira.exoplatform.org/browse/JCR-340
- //assertEquals("/snsRemoveTest/_node/node3", node2.getNode("node3").getPath());
- assertEquals("/snsRemoveTest/_node[2]/node3", node2.getNode("node3").getPath());
-
- }
- catch (RepositoryException e)
- {
- e.printStackTrace();
- fail("A property must exists on the node /snsRemoveTest/_node[1] " + e);
- }
- }
- finally
- {
- testRoot.remove();
- session.save();
- }
- }
}
Added: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/common/RemoveSameNameSiblingUnfixedTest.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/common/RemoveSameNameSiblingUnfixedTest.java (rev 0)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/common/RemoveSameNameSiblingUnfixedTest.java 2011-06-09 13:31:35 UTC (rev 4493)
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2011 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.exoplatform.services.jcr.usecases.common;
+
+import org.exoplatform.services.jcr.usecases.BaseUsecasesTest;
+
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+
+/**
+ * TODO this class contains unfixed tests from RemoveSameNameSiblingTest.
+ * Please move back fixed tests.
+ *
+ * @author <a href="mailto:skarpenko@exoplatform.com">Sergiy Karpenko</a>
+ * @version $Id: exo-jboss-codetemplates.xml 34360 9.06.2011 skarpenko $
+ */
+public class RemoveSameNameSiblingUnfixedTest extends BaseUsecasesTest
+{
+ public void testRemoveSameNameSiblings() throws Exception
+ {
+ Node testRoot = root.addNode("snsRemoveTest");
+ session.save();
+
+ try
+ {
+ Node node1 = testRoot.addNode("_node");
+ node1.setProperty("prop", "_data1");
+ Node node2 = testRoot.addNode("_node");
+ node2.setProperty("prop", "_data2");
+ Node node3 = node2.addNode("node3");
+ testRoot.save();
+
+ try
+ {
+ assertEquals("/snsRemoveTest/_node[2]/node3", node2.getNode("node3").getPath());
+ node1.remove(); // /snsRemoveTest/_node[2] -> /snsRemoveTest/_node[1]
+
+ // check
+ String n2p = node2.getProperty("prop").getString();
+ assertEquals("A property must be same ", "_data2", n2p);
+
+ // TODO there is a problem, we can't see deep subtree of reindexed same-name-siblings now.
+ // after save it will be ok.
+ // See http://jira.exoplatform.org/browse/JCR-340
+ // Also, this test do not fails with disabled cache.
+ assertEquals("/snsRemoveTest/_node/node3", node2.getNode("node3").getPath());
+
+ }
+ catch (RepositoryException e)
+ {
+ e.printStackTrace();
+ fail("A property must exists on the node /snsRemoveTest/_node[1] " + e);
+ }
+ }
+ finally
+ {
+ testRoot.remove();
+ session.save();
+ }
+ }
+}
12 years, 11 months
- 1
- 0
exo-jcr SVN: r4492 - in jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query: jbosscache and 1 other directory.
by do-not-reply＠jboss.org
Author: nzamosenchuk
Date: 2011-06-09 05:40:02 -0400 (Thu, 09 Jun 2011)
New Revision: 4492
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/IndexerCacheStore.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/IndexerSingletonStoreCacheLoader.java
Log:
EXOJCR-1345 : dispatching ViewChanged in JBC and ISPN asynchronously
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/IndexerCacheStore.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/IndexerCacheStore.java 2011-06-09 08:25:41 UTC (rev 4491)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/IndexerCacheStore.java 2011-06-09 09:40:02 UTC (rev 4492)
@@ -141,17 +141,26 @@
* @param newActiveState true if the cache just became the coordinator, false if the cache stopped being the
* coordinator.
*/
- protected void activeStatusChanged(boolean newActiveState)
+ protected void activeStatusChanged(final boolean newActiveState)
{
- coordinator = newActiveState;
+ // originally came from EXOJCR-1345.
+ // Deadlock occurs inside JGroups, if calling some operations inside the same thread,
+ // invoking ViewChanged. That's why, need to perform operation in separated async tread.
+ new Thread(new Runnable()
+ {
+ public void run()
+ {
+ coordinator = newActiveState;
- getModeHandler().setMode(coordinator ? IndexerIoMode.READ_WRITE : IndexerIoMode.READ_ONLY);
- log.info("Set indexer io mode to:" + (coordinator ? IndexerIoMode.READ_WRITE : IndexerIoMode.READ_ONLY));
+ getModeHandler().setMode(coordinator ? IndexerIoMode.READ_WRITE : IndexerIoMode.READ_ONLY);
+ log.info("Set indexer io mode to:" + (coordinator ? IndexerIoMode.READ_WRITE : IndexerIoMode.READ_ONLY));
- if (coordinator)
- {
- doPushState();
- }
+ if (coordinator)
+ {
+ doPushState();
+ }
+ }
+ }, "JCR Indexer ActiveStatusChanged-handler").start();
}
/**
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/IndexerSingletonStoreCacheLoader.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/IndexerSingletonStoreCacheLoader.java 2011-06-09 08:25:41 UTC (rev 4491)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/IndexerSingletonStoreCacheLoader.java 2011-06-09 09:40:02 UTC (rev 4492)
@@ -45,12 +45,28 @@
* @see org.jboss.cache.loader.SingletonStoreCacheLoader#activeStatusChanged(boolean)
*/
@Override
- protected void activeStatusChanged(boolean newActiveState) throws PushStateException
+ protected void activeStatusChanged(final boolean newActiveState) throws PushStateException
{
- // at first change indexer mode
- setIndexerMode(newActiveState);
- // and them push states if needed
- super.activeStatusChanged(newActiveState);
+ // originally came from EXOJCR-1345.
+ // Deadlock occurs inside JGroups, if calling some operations inside the same thread,
+ // invoking ViewChanged. That's why, need to perform operation in separated async tread.
+ new Thread(new Runnable()
+ {
+ public void run()
+ {
+ // at first change indexer mode
+ setIndexerMode(newActiveState);
+ // and them push states if needed
+ try
+ {
+ IndexerSingletonStoreCacheLoader.super.activeStatusChanged(newActiveState);
+ }
+ catch (PushStateException e)
+ {
+ log.error("Failed to initiate PushState.", e);
+ }
+ }
+ }, "JCR Indexer ActiveStatusChanged-handler").start();
}
@Override
12 years, 11 months
- 1
- 0
exo-jcr SVN: r4491 - ws/branches/2.1.x/exo.ws.rest.core.
by do-not-reply＠jboss.org
Author: paristote
Date: 2011-06-09 04:25:41 -0400 (Thu, 09 Jun 2011)
New Revision: 4491
Modified:
ws/branches/2.1.x/exo.ws.rest.core/pom.xml
Log:
WS-266 use maven build helper plugin to use generated sources from target
Modified: ws/branches/2.1.x/exo.ws.rest.core/pom.xml
===================================================================
--- ws/branches/2.1.x/exo.ws.rest.core/pom.xml 2011-06-09 07:45:52 UTC (rev 4490)
+++ ws/branches/2.1.x/exo.ws.rest.core/pom.xml 2011-06-09 08:25:41 UTC (rev 4491)
@@ -105,6 +105,25 @@
<build>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+ <execution>
+ <id>add-test-sources</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>target/generated-test-sources</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
<executions>
@@ -148,29 +167,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>0</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>generate-test-sources</phase>
- <configuration>
- <tasks>
- <echo>copy files gnerated by JAXB to test source directory</echo>
- <copy todir="src/test/java">
- <fileset dir="target/generated-test-sources">
- <include name="org/**" />
- </fileset>
- </copy>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
12 years, 11 months
- 1
- 0
exo-jcr SVN: r4490 - jcr/trunk.
by do-not-reply＠jboss.org
Author: dkuleshov
Date: 2011-06-09 03:45:52 -0400 (Thu, 09 Jun 2011)
New Revision: 4490
Modified:
jcr/trunk/pom.xml
Log:
EXOJCR-1255: downgraded commons-dbcp
Modified: jcr/trunk/pom.xml
===================================================================
--- jcr/trunk/pom.xml 2011-06-09 07:45:04 UTC (rev 4489)
+++ jcr/trunk/pom.xml 2011-06-09 07:45:52 UTC (rev 4490)
@@ -289,7 +289,7 @@
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
- <version>1.4</version>
+ <version>1.2.2</version>
<exclusions>
<exclusion>
<groupId>commons-pool</groupId>
12 years, 11 months
- 1
- 0
exo-jcr SVN: r4489 - core/trunk.
by do-not-reply＠jboss.org
Author: dkuleshov
Date: 2011-06-09 03:45:04 -0400 (Thu, 09 Jun 2011)
New Revision: 4489
Modified:
core/trunk/pom.xml
Log:
EXOJCR-1255: downgraded commons-dbcp
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2011-06-09 06:12:58 UTC (rev 4488)
+++ core/trunk/pom.xml 2011-06-09 07:45:04 UTC (rev 4489)
@@ -315,7 +315,7 @@
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
- <version>1.4</version>
+ <version>1.2.2</version>
<exclusions>
<exclusion>
<groupId>commons-pool</groupId>
12 years, 11 months
- 1
- 0