exo-jcr SVN: r4648 - core/trunk.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-07-19 03:46:51 -0400 (Tue, 19 Jul 2011)
New Revision: 4648
Modified:
core/trunk/pom.xml
Log:
EXOJCR-1435: change dep to tag
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2011-07-19 07:10:24 UTC (rev 4647)
+++ core/trunk/pom.xml 2011-07-19 07:46:51 UTC (rev 4648)
@@ -39,7 +39,7 @@
<exo.product.specification>2.4</exo.product.specification>
<org.exoplatform.framework.junit.version>1.2.1-GA</org.exoplatform.framework.junit.version>
- <org.exoplatform.kernel.version>2.3.0-GA-SNAPSHOT</org.exoplatform.kernel.version>
+ <org.exoplatform.kernel.version>2.3.0-CR4</org.exoplatform.kernel.version>
</properties>
<scm>
12 years, 10 months
exo-jcr SVN: r4647 - in jcr/branches/1.12.x/patch/1.12.10-GA: JCR-1647 and 1 other directory.
by do-not-reply＠jboss.org
Author: dkuleshov
Date: 2011-07-19 03:10:24 -0400 (Tue, 19 Jul 2011)
New Revision: 4647
Added:
jcr/branches/1.12.x/patch/1.12.10-GA/JCR-1647/
jcr/branches/1.12.x/patch/1.12.10-GA/JCR-1647/JCR-1647.patch
Log:
JCR-1647: backported 'release' profile (patch proposed)
Added: jcr/branches/1.12.x/patch/1.12.10-GA/JCR-1647/JCR-1647.patch
===================================================================
--- jcr/branches/1.12.x/patch/1.12.10-GA/JCR-1647/JCR-1647.patch (rev 0)
+++ jcr/branches/1.12.x/patch/1.12.10-GA/JCR-1647/JCR-1647.patch 2011-07-19 07:10:24 UTC (rev 4647)
@@ -0,0 +1,44 @@
+Index: pom.xml
+===================================================================
+--- pom.xml (revision 4640)
++++ pom.xml (working copy)
+@@ -464,4 +464,39 @@
+ <module>exo.jcr.docs</module>
+ <module>packaging/module</module>
+ </modules>
++ <profiles>
++ <profile>
++ <id>release</id>
++ <build>
++ <plugins>
++ <plugin>
++ <artifactId>maven-assembly-plugin</artifactId>
++ <dependencies>
++ <dependency>
++ <groupId>org.apache.apache.resources</groupId>
++ <artifactId>apache-source-release-assembly-descriptor</artifactId>
++ <version>1.0.2</version>
++ </dependency>
++ </dependencies>
++ <executions>
++ <execution>
++ <id>source-release-assembly</id>
++ <phase>package</phase>
++ <goals>
++ <goal>single</goal>
++ </goals>
++ <configuration>
++ <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
++ <descriptorRefs>
++ <descriptorRef>source-release</descriptorRef>
++ </descriptorRefs>
++ <tarLongFileFormat>gnu</tarLongFileFormat>
++ </configuration>
++ </execution>
++ </executions>
++ </plugin>
++ </plugins>
++ </build>
++ </profile>
++ </profiles>
+ </project>
Property changes on: jcr/branches/1.12.x/patch/1.12.10-GA/JCR-1647/JCR-1647.patch
___________________________________________________________________
Added: svn:eol-style
+ native
12 years, 10 months
exo-jcr SVN: r4646 - in kernel/trunk: exo.kernel.commons and 13 other directories.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-07-19 03:09:43 -0400 (Tue, 19 Jul 2011)
New Revision: 4646
Modified:
kernel/trunk/exo.kernel.commons.test/pom.xml
kernel/trunk/exo.kernel.commons/pom.xml
kernel/trunk/exo.kernel.component.cache/pom.xml
kernel/trunk/exo.kernel.component.command/pom.xml
kernel/trunk/exo.kernel.component.common/pom.xml
kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v4/pom.xml
kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml
kernel/trunk/exo.kernel.container/pom.xml
kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml
kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml
kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml
kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml
kernel/trunk/exo.kernel.mc-integration/pom.xml
kernel/trunk/packaging/module/pom.xml
kernel/trunk/pom.xml
Log:
[maven-release-plugin] rollback the release of 2.3.0-CR4
Modified: kernel/trunk/exo.kernel.commons/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.commons/pom.xml 2011-07-19 07:02:36 UTC (rev 4645)
+++ kernel/trunk/exo.kernel.commons/pom.xml 2011-07-19 07:09:43 UTC (rev 4646)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.0-CR4</version>
+ <version>2.3.0-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.commons</artifactId>
Modified: kernel/trunk/exo.kernel.commons.test/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.commons.test/pom.xml 2011-07-19 07:02:36 UTC (rev 4645)
+++ kernel/trunk/exo.kernel.commons.test/pom.xml 2011-07-19 07:09:43 UTC (rev 4646)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.0-CR4</version>
+ <version>2.3.0-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.commons.test</artifactId>
Modified: kernel/trunk/exo.kernel.component.cache/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.cache/pom.xml 2011-07-19 07:02:36 UTC (rev 4645)
+++ kernel/trunk/exo.kernel.component.cache/pom.xml 2011-07-19 07:09:43 UTC (rev 4646)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.0-CR4</version>
+ <version>2.3.0-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.component.cache</artifactId>
Modified: kernel/trunk/exo.kernel.component.command/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.command/pom.xml 2011-07-19 07:02:36 UTC (rev 4645)
+++ kernel/trunk/exo.kernel.component.command/pom.xml 2011-07-19 07:09:43 UTC (rev 4646)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.0-CR4</version>
+ <version>2.3.0-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.component.command</artifactId>
Modified: kernel/trunk/exo.kernel.component.common/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.common/pom.xml 2011-07-19 07:02:36 UTC (rev 4645)
+++ kernel/trunk/exo.kernel.component.common/pom.xml 2011-07-19 07:09:43 UTC (rev 4646)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.0-CR4</version>
+ <version>2.3.0-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.component.common</artifactId>
Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v4/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v4/pom.xml 2011-07-19 07:02:36 UTC (rev 4645)
+++ kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v4/pom.xml 2011-07-19 07:09:43 UTC (rev 4646)
@@ -19,7 +19,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.0-CR4</version>
+ <version>2.3.0-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.component.ext.cache.impl.infinispan.v4</artifactId>
<name>eXo Kernel :: Cache Extension :: Infinispan Implementation</name>
Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2011-07-19 07:02:36 UTC (rev 4645)
+++ kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2011-07-19 07:09:43 UTC (rev 4646)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.0-CR4</version>
+ <version>2.3.0-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/trunk/exo.kernel.container/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.container/pom.xml 2011-07-19 07:02:36 UTC (rev 4645)
+++ kernel/trunk/exo.kernel.container/pom.xml 2011-07-19 07:09:43 UTC (rev 4646)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.0-CR4</version>
+ <version>2.3.0-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.container</artifactId>
<name>eXo Kernel :: Container</name>
Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2011-07-19 07:02:36 UTC (rev 4645)
+++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2011-07-19 07:09:43 UTC (rev 4646)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.3.0-CR4</version>
+ <version>2.3.0-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.mc-int</artifactId>
Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2011-07-19 07:02:36 UTC (rev 4645)
+++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2011-07-19 07:09:43 UTC (rev 4646)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.3.0-CR4</version>
+ <version>2.3.0-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.mc-int-demo</artifactId>
Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2011-07-19 07:02:36 UTC (rev 4645)
+++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2011-07-19 07:09:43 UTC (rev 4646)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.3.0-CR4</version>
+ <version>2.3.0-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.mc-int-tests</artifactId>
Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2011-07-19 07:02:36 UTC (rev 4645)
+++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2011-07-19 07:09:43 UTC (rev 4646)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.3.0-CR4</version>
+ <version>2.3.0-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.mc-kernel-extras</artifactId>
Modified: kernel/trunk/exo.kernel.mc-integration/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/pom.xml 2011-07-19 07:02:36 UTC (rev 4645)
+++ kernel/trunk/exo.kernel.mc-integration/pom.xml 2011-07-19 07:09:43 UTC (rev 4646)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.0-CR4</version>
+ <version>2.3.0-GA-SNAPSHOT</version>
</parent>
<artifactId>mc-integration-parent</artifactId>
Modified: kernel/trunk/packaging/module/pom.xml
===================================================================
--- kernel/trunk/packaging/module/pom.xml 2011-07-19 07:02:36 UTC (rev 4645)
+++ kernel/trunk/packaging/module/pom.xml 2011-07-19 07:09:43 UTC (rev 4646)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.0-CR4</version>
+ <version>2.3.0-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: kernel/trunk/pom.xml
===================================================================
--- kernel/trunk/pom.xml 2011-07-19 07:02:36 UTC (rev 4645)
+++ kernel/trunk/pom.xml 2011-07-19 07:09:43 UTC (rev 4646)
@@ -30,7 +30,7 @@
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.0-CR4</version>
+ <version>2.3.0-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.3.0-CR4</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/tags/2.3.0-CR4</developerConnection>
- <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/tags/2.3.0-CR4</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/trunk</url>
</scm>
<modules>
12 years, 10 months
exo-jcr SVN: r4645 - in ws/branches/2.1.x/patch: 2.1.10-GA and 1 other directories.
by do-not-reply＠jboss.org
Author: dkuleshov
Date: 2011-07-19 03:02:36 -0400 (Tue, 19 Jul 2011)
New Revision: 4645
Added:
ws/branches/2.1.x/patch/2.1.10-GA/
ws/branches/2.1.x/patch/2.1.10-GA/WS-268/
ws/branches/2.1.x/patch/2.1.10-GA/WS-268/WS-268.patch
Log:
WS-268: backported 'release' profile (patch proposed)
Added: ws/branches/2.1.x/patch/2.1.10-GA/WS-268/WS-268.patch
===================================================================
--- ws/branches/2.1.x/patch/2.1.10-GA/WS-268/WS-268.patch (rev 0)
+++ ws/branches/2.1.x/patch/2.1.10-GA/WS-268/WS-268.patch 2011-07-19 07:02:36 UTC (rev 4645)
@@ -0,0 +1,48 @@
+Index: pom.xml
+===================================================================
+--- pom.xml (revision 4640)
++++ pom.xml (working copy)
+@@ -181,5 +181,42 @@
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+- </dependencies>
++ </dependencies>
++
++ <profiles>
++ <profile>
++ <id>release</id>
++ <build>
++ <plugins>
++ <plugin>
++ <artifactId>maven-assembly-plugin</artifactId>
++ <dependencies>
++ <dependency>
++ <groupId>org.apache.apache.resources</groupId>
++ <artifactId>apache-source-release-assembly-descriptor</artifactId>
++ <version>1.0.2</version>
++ </dependency>
++ </dependencies>
++ <executions>
++ <execution>
++ <id>source-release-assembly</id>
++ <phase>package</phase>
++ <goals>
++ <goal>single</goal>
++ </goals>
++ <configuration>
++ <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
++ <descriptorRefs>
++ <descriptorRef>source-release</descriptorRef>
++ </descriptorRefs>
++ <tarLongFileFormat>gnu</tarLongFileFormat>
++ </configuration>
++ </execution>
++ </executions>
++ </plugin>
++ </plugins>
++ </build>
++ </profile>
++ </profiles>
++
+ </project>
Property changes on: ws/branches/2.1.x/patch/2.1.10-GA/WS-268/WS-268.patch
___________________________________________________________________
Added: svn:eol-style
+ native
12 years, 10 months
exo-jcr SVN: r4644 - kernel/tags.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-07-19 03:00:08 -0400 (Tue, 19 Jul 2011)
New Revision: 4644
Added:
kernel/tags/2.3.0-CR4/
Log:
[maven-scm] copy for tag 2.3.0-CR4
12 years, 10 months
exo-jcr SVN: r4643 - in kernel/trunk: exo.kernel.commons and 13 other directories.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-07-19 02:59:13 -0400 (Tue, 19 Jul 2011)
New Revision: 4643
Modified:
kernel/trunk/exo.kernel.commons.test/pom.xml
kernel/trunk/exo.kernel.commons/pom.xml
kernel/trunk/exo.kernel.component.cache/pom.xml
kernel/trunk/exo.kernel.component.command/pom.xml
kernel/trunk/exo.kernel.component.common/pom.xml
kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v4/pom.xml
kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml
kernel/trunk/exo.kernel.container/pom.xml
kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml
kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml
kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml
kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml
kernel/trunk/exo.kernel.mc-integration/pom.xml
kernel/trunk/packaging/module/pom.xml
kernel/trunk/pom.xml
Log:
[maven-release-plugin] prepare release 2.3.0-CR4
Modified: kernel/trunk/exo.kernel.commons/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.commons/pom.xml 2011-07-19 06:57:42 UTC (rev 4642)
+++ kernel/trunk/exo.kernel.commons/pom.xml 2011-07-19 06:59:13 UTC (rev 4643)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.0-GA-SNAPSHOT</version>
+ <version>2.3.0-CR4</version>
</parent>
<artifactId>exo.kernel.commons</artifactId>
Modified: kernel/trunk/exo.kernel.commons.test/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.commons.test/pom.xml 2011-07-19 06:57:42 UTC (rev 4642)
+++ kernel/trunk/exo.kernel.commons.test/pom.xml 2011-07-19 06:59:13 UTC (rev 4643)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.0-GA-SNAPSHOT</version>
+ <version>2.3.0-CR4</version>
</parent>
<artifactId>exo.kernel.commons.test</artifactId>
Modified: kernel/trunk/exo.kernel.component.cache/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.cache/pom.xml 2011-07-19 06:57:42 UTC (rev 4642)
+++ kernel/trunk/exo.kernel.component.cache/pom.xml 2011-07-19 06:59:13 UTC (rev 4643)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.0-GA-SNAPSHOT</version>
+ <version>2.3.0-CR4</version>
</parent>
<artifactId>exo.kernel.component.cache</artifactId>
Modified: kernel/trunk/exo.kernel.component.command/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.command/pom.xml 2011-07-19 06:57:42 UTC (rev 4642)
+++ kernel/trunk/exo.kernel.component.command/pom.xml 2011-07-19 06:59:13 UTC (rev 4643)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.0-GA-SNAPSHOT</version>
+ <version>2.3.0-CR4</version>
</parent>
<artifactId>exo.kernel.component.command</artifactId>
Modified: kernel/trunk/exo.kernel.component.common/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.common/pom.xml 2011-07-19 06:57:42 UTC (rev 4642)
+++ kernel/trunk/exo.kernel.component.common/pom.xml 2011-07-19 06:59:13 UTC (rev 4643)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.0-GA-SNAPSHOT</version>
+ <version>2.3.0-CR4</version>
</parent>
<artifactId>exo.kernel.component.common</artifactId>
Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v4/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v4/pom.xml 2011-07-19 06:57:42 UTC (rev 4642)
+++ kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v4/pom.xml 2011-07-19 06:59:13 UTC (rev 4643)
@@ -19,7 +19,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.0-GA-SNAPSHOT</version>
+ <version>2.3.0-CR4</version>
</parent>
<artifactId>exo.kernel.component.ext.cache.impl.infinispan.v4</artifactId>
<name>eXo Kernel :: Cache Extension :: Infinispan Implementation</name>
Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2011-07-19 06:57:42 UTC (rev 4642)
+++ kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2011-07-19 06:59:13 UTC (rev 4643)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.0-GA-SNAPSHOT</version>
+ <version>2.3.0-CR4</version>
</parent>
<artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId>
<name>eXo Kernel :: Cache Extension :: JBoss Cache Implementation</name>
Modified: kernel/trunk/exo.kernel.container/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.container/pom.xml 2011-07-19 06:57:42 UTC (rev 4642)
+++ kernel/trunk/exo.kernel.container/pom.xml 2011-07-19 06:59:13 UTC (rev 4643)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.0-GA-SNAPSHOT</version>
+ <version>2.3.0-CR4</version>
</parent>
<artifactId>exo.kernel.container</artifactId>
<name>eXo Kernel :: Container</name>
Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2011-07-19 06:57:42 UTC (rev 4642)
+++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2011-07-19 06:59:13 UTC (rev 4643)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.3.0-GA-SNAPSHOT</version>
+ <version>2.3.0-CR4</version>
</parent>
<artifactId>exo.kernel.mc-int</artifactId>
Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2011-07-19 06:57:42 UTC (rev 4642)
+++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2011-07-19 06:59:13 UTC (rev 4643)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.3.0-GA-SNAPSHOT</version>
+ <version>2.3.0-CR4</version>
</parent>
<artifactId>exo.kernel.mc-int-demo</artifactId>
Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2011-07-19 06:57:42 UTC (rev 4642)
+++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2011-07-19 06:59:13 UTC (rev 4643)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.3.0-GA-SNAPSHOT</version>
+ <version>2.3.0-CR4</version>
</parent>
<artifactId>exo.kernel.mc-int-tests</artifactId>
Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2011-07-19 06:57:42 UTC (rev 4642)
+++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2011-07-19 06:59:13 UTC (rev 4643)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.3.0-GA-SNAPSHOT</version>
+ <version>2.3.0-CR4</version>
</parent>
<artifactId>exo.kernel.mc-kernel-extras</artifactId>
Modified: kernel/trunk/exo.kernel.mc-integration/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/pom.xml 2011-07-19 06:57:42 UTC (rev 4642)
+++ kernel/trunk/exo.kernel.mc-integration/pom.xml 2011-07-19 06:59:13 UTC (rev 4643)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.0-GA-SNAPSHOT</version>
+ <version>2.3.0-CR4</version>
</parent>
<artifactId>mc-integration-parent</artifactId>
Modified: kernel/trunk/packaging/module/pom.xml
===================================================================
--- kernel/trunk/packaging/module/pom.xml 2011-07-19 06:57:42 UTC (rev 4642)
+++ kernel/trunk/packaging/module/pom.xml 2011-07-19 06:59:13 UTC (rev 4643)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.0-GA-SNAPSHOT</version>
+ <version>2.3.0-CR4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: kernel/trunk/pom.xml
===================================================================
--- kernel/trunk/pom.xml 2011-07-19 06:57:42 UTC (rev 4642)
+++ kernel/trunk/pom.xml 2011-07-19 06:59:13 UTC (rev 4643)
@@ -30,7 +30,7 @@
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.0-GA-SNAPSHOT</version>
+ <version>2.3.0-CR4</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/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/trunk</developerConnection>
- <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/tags/2.3.0-CR4</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/tags/2.3.0-CR4</developerConnection>
+ <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/tags/2.3.0-CR4</url>
</scm>
<modules>
12 years, 10 months
exo-jcr SVN: r4642 - in core/branches/2.3.x/patch/2.3.10: COR-243 and 1 other directory.
by do-not-reply＠jboss.org
Author: dkuleshov
Date: 2011-07-19 02:57:42 -0400 (Tue, 19 Jul 2011)
New Revision: 4642
Added:
core/branches/2.3.x/patch/2.3.10/COR-243/
core/branches/2.3.x/patch/2.3.10/COR-243/COR-243.patch
Log:
COR-243: backported 'release' profile
Added: core/branches/2.3.x/patch/2.3.10/COR-243/COR-243.patch
===================================================================
--- core/branches/2.3.x/patch/2.3.10/COR-243/COR-243.patch (rev 0)
+++ core/branches/2.3.x/patch/2.3.10/COR-243/COR-243.patch 2011-07-19 06:57:42 UTC (rev 4642)
@@ -0,0 +1,46 @@
+Index: pom.xml
+===================================================================
+--- pom.xml (revision 4640)
++++ pom.xml (working copy)
+@@ -379,4 +379,41 @@
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
++
++ <profiles>
++ <profile>
++ <id>release</id>
++ <build>
++ <plugins>
++ <plugin>
++ <artifactId>maven-assembly-plugin</artifactId>
++ <dependencies>
++ <dependency>
++ <groupId>org.apache.apache.resources</groupId>
++ <artifactId>apache-source-release-assembly-descriptor</artifactId>
++ <version>1.0.2</version>
++ </dependency>
++ </dependencies>
++ <executions>
++ <execution>
++ <id>source-release-assembly</id>
++ <phase>package</phase>
++ <goals>
++ <goal>single</goal>
++ </goals>
++ <configuration>
++ <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
++ <descriptorRefs>
++ <descriptorRef>source-release</descriptorRef>
++ </descriptorRefs>
++ <tarLongFileFormat>gnu</tarLongFileFormat>
++ </configuration>
++ </execution>
++ </executions>
++ </plugin>
++ </plugins>
++ </build>
++ </profile>
++ </profiles>
++
+ </project>
Property changes on: core/branches/2.3.x/patch/2.3.10/COR-243/COR-243.patch
___________________________________________________________________
Added: svn:eol-style
+ native
12 years, 10 months
exo-jcr SVN: r4641 - in kernel/branches/2.2.x/patch/2.2.10-GA: KER-176 and 1 other directory.
by do-not-reply＠jboss.org
Author: dkuleshov
Date: 2011-07-19 02:52:50 -0400 (Tue, 19 Jul 2011)
New Revision: 4641
Added:
kernel/branches/2.2.x/patch/2.2.10-GA/KER-176/
kernel/branches/2.2.x/patch/2.2.10-GA/KER-176/KER-176.patch
Log:
KER-176: backported profile 'release' tp branch
Added: kernel/branches/2.2.x/patch/2.2.10-GA/KER-176/KER-176.patch
===================================================================
--- kernel/branches/2.2.x/patch/2.2.10-GA/KER-176/KER-176.patch (rev 0)
+++ kernel/branches/2.2.x/patch/2.2.10-GA/KER-176/KER-176.patch 2011-07-19 06:52:50 UTC (rev 4641)
@@ -0,0 +1,45 @@
+Index: pom.xml
+===================================================================
+--- pom.xml (revision 4640)
++++ pom.xml (working copy)
+@@ -211,5 +211,40 @@
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
++ <profiles>
++ <profile>
++ <id>release</id>
++ <build>
++ <plugins>
++ <plugin>
++ <artifactId>maven-assembly-plugin</artifactId>
++ <dependencies>
++ <dependency>
++ <groupId>org.apache.apache.resources</groupId>
++ <artifactId>apache-source-release-assembly-descriptor</artifactId>
++ <version>1.0.2</version>
++ </dependency>
++ </dependencies>
++ <executions>
++ <execution>
++ <id>source-release-assembly</id>
++ <phase>package</phase>
++ <goals>
++ <goal>single</goal>
++ </goals>
++ <configuration>
++ <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
++ <descriptorRefs>
++ <descriptorRef>source-release</descriptorRef>
++ </descriptorRefs>
++ <tarLongFileFormat>gnu</tarLongFileFormat>
++ </configuration>
++ </execution>
++ </executions>
++ </plugin>
++ </plugins>
++ </build>
++ </profile>
++ </profiles>
+
+ </project>
Property changes on: kernel/branches/2.2.x/patch/2.2.10-GA/KER-176/KER-176.patch
___________________________________________________________________
Added: svn:eol-style
+ native
12 years, 10 months
exo-jcr SVN: r4640 - in jcr/trunk/exo.jcr.component.core/src: main/java/org/exoplatform/services/jcr/impl/core/version and 2 other directories.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-07-18 04:50:08 -0400 (Mon, 18 Jul 2011)
New Revision: 4640
Added:
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/version/TestOnParentVersionIgnore.java
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/ItemDataTraversingVisitor.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/FrozenNodeInitializer.java
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/test/nodetypes-usecase.xml
Log:
EXOJCR-1413: [Perf] ItemDataTraversingVisitor#visit(NodeData node) continue to visit deeper althought onParentVersion=IGNORE
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/ItemDataTraversingVisitor.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/ItemDataTraversingVisitor.java 2011-07-18 01:57:47 UTC (rev 4639)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/ItemDataTraversingVisitor.java 2011-07-18 08:50:08 UTC (rev 4640)
@@ -88,10 +88,10 @@
if (maxLevel == INFINITE_DEPTH || currentLevel < maxLevel)
{
currentLevel++;
- for (PropertyData data : dataManager.getChildPropertiesData(node))
- data.accept(this);
- for (NodeData data : dataManager.getChildNodesData(node))
- data.accept(this);
+
+ visitChildProperties(node);
+ visitChildNodes(node);
+
currentLevel--;
}
leaving(node, currentLevel);
@@ -101,10 +101,27 @@
currentLevel = 0;
throw re;
}
+ }
+ /**
+ * Visit all child properties.
+ */
+ protected void visitChildProperties(NodeData node) throws RepositoryException
+ {
+ for (PropertyData data : dataManager.getChildPropertiesData(node))
+ data.accept(this);
}
/**
+ * Visit all child nodes.
+ */
+ protected void visitChildNodes(NodeData node) throws RepositoryException
+ {
+ for (NodeData data : dataManager.getChildNodesData(node))
+ data.accept(this);
+ }
+
+ /**
* {@inheritDoc}
*/
public ItemDataConsumer getDataManager()
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/FrozenNodeInitializer.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/FrozenNodeInitializer.java 2011-07-18 01:57:47 UTC (rev 4639)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/FrozenNodeInitializer.java 2011-07-18 08:50:08 UTC (rev 4640)
@@ -88,6 +88,20 @@
this.contextNodes.push(frozen);
}
+ /**
+ * {@inheritDoc}
+ */
+ protected void visitChildNodes(NodeData node) throws RepositoryException
+ {
+ // It is not necessary to traverse child nodes since parent is null (OnParentVersion=IGNORE case)
+ if (currentNode() == null)
+ {
+ return;
+ }
+
+ super.visitChildNodes(node);
+ }
+
@Override
protected void entering(PropertyData property, int level) throws RepositoryException
{
Added: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/version/TestOnParentVersionIgnore.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/version/TestOnParentVersionIgnore.java (rev 0)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/version/TestOnParentVersionIgnore.java 2011-07-18 08:50:08 UTC (rev 4640)
@@ -0,0 +1,73 @@
+/*
+ * 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.impl.version;
+
+import org.exoplatform.services.jcr.JcrImplBaseTest;
+
+import javax.jcr.Node;
+import javax.jcr.version.Version;
+
+/**
+ * @author <a href="abazko(a)exoplatform.com">Anatoliy Bazko</a>
+ * @version $Id$
+ */
+public class TestOnParentVersionIgnore extends JcrImplBaseTest
+{
+ public void testFrozenInitialized_OnParentVersion_IGNORE_EXOJCR1413() throws Exception
+ {
+ Node testNode = session.getRootNode().addNode("test");
+ testNode.addMixin("mix:versionable");
+ testNode.addNode("page", "exo:page").addNode("page", "exo:page");
+ testNode.addNode("hello");
+ session.save();
+
+ Version ver = testNode.checkin();
+ testNode.checkout();
+
+ try
+ {
+ ver.getNode("jcr:frozenNode").getNode("page");
+ }
+ catch (Exception e)
+ {
+ fail("Node ../test/page should be accessable");
+ }
+
+ try
+ {
+ ver.getNode("jcr:frozenNode").getNode("hello");
+ }
+ catch (Exception e)
+ {
+ fail("Node ../test/hello should be accessable");
+ }
+
+ try
+ {
+ ver.getNode("jcr:frozenNode").getNode("page").getNode("page");
+ fail("Node ../test/page/page should not be accessable");
+ }
+ catch (Exception e)
+ {
+ }
+
+ testNode.remove();
+ session.save();
+ }
+}
Property changes on: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/version/TestOnParentVersionIgnore.java
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/test/nodetypes-usecase.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/test/nodetypes-usecase.xml 2011-07-18 01:57:47 UTC (rev 4639)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/test/nodetypes-usecase.xml 2011-07-18 08:50:08 UTC (rev 4640)
@@ -266,5 +266,18 @@
</childNodeDefinitions>
</nodeType>
-
+ <nodeType name="exo:page" isMixin="false" hasOrderableChildNodes="false">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ <supertype>nt:folder</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+ <childNodeDefinitions>
+ <childNodeDefinition name="page" defaultPrimaryType="" autoCreated="false" mandatory="false" onParentVersion="IGNORE" protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:page</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
</nodeTypes>
12 years, 10 months
exo-jcr SVN: r4639 - in jcr/branches/1.12.x: exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command and 3 other directories.
by do-not-reply＠jboss.org
Author: trang_vu
Date: 2011-07-17 21:57:47 -0400 (Sun, 17 Jul 2011)
New Revision: 4639
Added:
jcr/branches/1.12.x/patch/1.12.10-GA/JCR-1630/
Removed:
jcr/branches/1.12.x/patch/1.12.9-GA/JCR-1630/
Modified:
jcr/branches/1.12.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java
jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestCopy.java
jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestMove.java
jcr/branches/1.12.x/patch/1.12.10-GA/JCR-1630/JCR-1630.patch
Log:
JCR-1630: update WebDavServiceImpl to escape characters while MOVE.
Problem description
* In jcr 1.10.12, it is impossible to copy or move a file when the destination path contains space characters (see JCR-1628).
This problem is not reproduced in jcr 1.12.9-GA, but for easy maintenance, the same fix is applied also to jcr 1.12.x.
Fix description
* Update WebDavServiceImpl. Destination header might contain unescaped characters. If Exception has come during URI building, try to escape characters and build URI again.
* Add unit tests in TestMove and TestCopy.
Modified: jcr/branches/1.12.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java 2011-07-15 12:22:58 UTC (rev 4638)
+++ jcr/branches/1.12.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java 2011-07-18 01:57:47 UTC (rev 4639)
@@ -72,6 +72,7 @@
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.net.URI;
+import java.net.URISyntaxException;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.HashMap;
@@ -384,9 +385,12 @@
try
{
String serverURI = uriInfo.getBaseUriBuilder().path(getClass()).path(repoName).build().toString();
- URI dest = new URI(destinationHeader);
- URI base = new URI(serverURI);
+ // destinationHeader could begins from workspace name (passed from cms
+ // WebDAVServiceImpl) and doesn't contain neither host no repository name
+ URI dest = buildURI(destinationHeader);
+ URI base = buildURI(serverURI);
+
String destPath = dest.getPath();
int repoIndex = destPath.indexOf(repoName);
@@ -395,12 +399,12 @@
// or destination header is malformed
// we return BAD_GATEWAY(502) HTTP status
// more info here http://www.webdav.org/specs/rfc2518.html#METHOD_COPY
- if (!base.getHost().equals(dest.getHost()) || repoIndex == -1)
+ if (dest.getHost() != null && !base.getHost().equals(dest.getHost()))
{
return Response.status(HTTPStatus.BAD_GATEWAY).entity("Bad Gateway").build();
}
- destPath = normalizePath(dest.getPath().substring(repoIndex + repoName.length() + 1));
+ destPath = normalizePath(repoIndex == -1 ? destPath : destPath.substring(repoIndex + repoName.length() + 1));
String srcWorkspace = workspaceName(repoPath);
String srcNodePath = path(repoPath);
@@ -776,8 +780,10 @@
{
String serverURI = uriInfo.getBaseUriBuilder().path(getClass()).path(repoName).build().toString();
- URI dest = new URI(destinationHeader);
- URI base = new URI(serverURI);
+ // destinationHeader could begins from workspace name (passed from cms
+ // WebDAVServiceImpl) and doesn't contain neither host no repository name
+ URI dest = buildURI(destinationHeader);
+ URI base = buildURI(serverURI);
String destPath = dest.getPath();
int repoIndex = destPath.indexOf(repoName);
@@ -787,14 +793,12 @@
// or destination header is malformed
// we return BAD_GATEWAY(502) HTTP status
// more info here http://www.webdav.org/specs/rfc2518.html#METHOD_MOVE
- if (!base.getHost().equals(dest.getHost()) || repoIndex == -1)
-
- if (!destinationHeader.startsWith(serverURI))
+ if (dest.getHost() != null && !base.getHost().equals(dest.getHost()))
{
return Response.status(HTTPStatus.BAD_GATEWAY).entity("Bad Gateway").build();
}
- destPath = normalizePath(dest.getPath().substring(repoIndex + repoName.length() + 1));
+ destPath = normalizePath(repoIndex == -1 ? destPath : destPath.substring(repoIndex + repoName.length() + 1));
String destWorkspace = workspaceName(destPath);
String destNodePath = path(destPath);
@@ -1338,4 +1342,18 @@
return lockTokens;
}
+ /**
+ * Build URI from string.
+ */
+ private URI buildURI(String path) throws URISyntaxException
+ {
+ try
+ {
+ return new URI(path);
+ }
+ catch (URISyntaxException e)
+ {
+ return new URI(TextUtil.escape(path, '%', true));
+ }
+ }
}
Modified: jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestCopy.java
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestCopy.java 2011-07-15 12:22:58 UTC (rev 4638)
+++ jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestCopy.java 2011-07-18 01:57:47 UTC (rev 4639)
@@ -194,9 +194,130 @@
ContainerResponse response = service(WebDAVMethods.COPY, getPathWS() + filename, host, headers, null);
// check if operation completed successfully, we expect a new resource to be created
assertEquals(HTTPStatus.CREATED, response.getStatus());
+ }
+ public void testCopyDestinationHeaderBeginsFromWorkspaceName() throws Exception
+ {
+ String content = TestUtils.getFileContent();
+ String filename = TestUtils.getFileName();
+ InputStream inputStream = new ByteArrayInputStream(content.getBytes());
+ TestUtils.addContent(session, filename, inputStream, defaultFileNodeType, "");
+ String destFilename = TestUtils.getFileName();
+
+ MultivaluedMap<String, String> headers = new MultivaluedMapImpl();
+ headers.add(ExtHttpHeaders.DESTINATION, WORKSPACE + destFilename);
+
+ ContainerResponse response = service(WebDAVMethods.COPY, getPathWS() + filename, host, headers, null);
+
+ assertEquals(HTTPStatus.CREATED, response.getStatus());
+ assertTrue(session.getRootNode().hasNode(TextUtil.relativizePath(destFilename)));
+
+ Node nodeDest = session.getRootNode().getNode(TextUtil.relativizePath(destFilename));
+ assertTrue(nodeDest.hasNode("jcr:content"));
+
+ Node nodeDestContent = nodeDest.getNode("jcr:content");
+ assertTrue(nodeDestContent.hasProperty("jcr:data"));
+
+ ByteArrayInputStream streamDest = (ByteArrayInputStream)nodeDestContent.getProperty("jcr:data").getStream();
+ String getContentDest = TestUtils.stream2string(streamDest, null);
+ assertEquals(content, getContentDest);
+ assertTrue(session.getRootNode().hasNode(TextUtil.relativizePath(filename)));
+
+ Node nodeBase = session.getRootNode().getNode(TextUtil.relativizePath(filename));
+ assertTrue(nodeBase.hasNode("jcr:content"));
+
+ Node nodeBaseContent = nodeBase.getNode("jcr:content");
+ assertTrue(nodeBaseContent.hasProperty("jcr:data"));
+
+ ByteArrayInputStream streamBase = (ByteArrayInputStream)nodeBaseContent.getProperty("jcr:data").getStream();
+ String getContentBase = TestUtils.stream2string(streamBase, null);
+ assertEquals(content, getContentBase);
}
+ public void testCopyToFolderWithSpace() throws Exception
+ {
+ String folderNameWithSpace = "new folder - testCopyToFolderWithSpace";
+ session.getRootNode().addNode(folderNameWithSpace, "nt:folder");
+ session.save();
+
+ String content = TestUtils.getFileContent();
+ String filename = TestUtils.getFileName();
+ InputStream inputStream = new ByteArrayInputStream(content.getBytes());
+ TestUtils.addContent(session, filename, inputStream, defaultFileNodeType, "");
+ String destFilename = "/" + folderNameWithSpace + TestUtils.getFileName();
+
+ MultivaluedMap<String, String> headers = new MultivaluedMapImpl();
+ headers.add(ExtHttpHeaders.DESTINATION, WORKSPACE + destFilename);
+
+ ContainerResponse response = service(WebDAVMethods.COPY, getPathWS() + filename, host, headers, null);
+
+ assertEquals(HTTPStatus.CREATED, response.getStatus());
+ assertTrue(session.getRootNode().hasNode(TextUtil.relativizePath(destFilename)));
+
+ Node nodeDest = session.getRootNode().getNode(TextUtil.relativizePath(destFilename));
+ assertTrue(nodeDest.hasNode("jcr:content"));
+
+ Node nodeDestContent = nodeDest.getNode("jcr:content");
+ assertTrue(nodeDestContent.hasProperty("jcr:data"));
+
+ ByteArrayInputStream streamDest = (ByteArrayInputStream)nodeDestContent.getProperty("jcr:data").getStream();
+ String getContentDest = TestUtils.stream2string(streamDest, null);
+ assertEquals(content, getContentDest);
+ assertTrue(session.getRootNode().hasNode(TextUtil.relativizePath(filename)));
+
+ Node nodeBase = session.getRootNode().getNode(TextUtil.relativizePath(filename));
+ assertTrue(nodeBase.hasNode("jcr:content"));
+
+ Node nodeBaseContent = nodeBase.getNode("jcr:content");
+ assertTrue(nodeBaseContent.hasProperty("jcr:data"));
+
+ ByteArrayInputStream streamBase = (ByteArrayInputStream)nodeBaseContent.getProperty("jcr:data").getStream();
+ String getContentBase = TestUtils.stream2string(streamBase, null);
+ assertEquals(content, getContentBase);
+ }
+
+ public void testCopyToFolderWithSpaceUnescapedChars() throws Exception
+ {
+ String folderNameWithSpace = "new folder - testCopyToFolderWithSpaceUnescapedChars";
+ session.getRootNode().addNode(folderNameWithSpace, "nt:folder");
+ session.save();
+
+ String content = TestUtils.getFileContent();
+ String filename = TestUtils.getFileName();
+ InputStream inputStream = new ByteArrayInputStream(content.getBytes());
+ TestUtils.addContent(session, filename, inputStream, defaultFileNodeType, "");
+ String destFilename = TextUtil.unescape("/" + folderNameWithSpace + TestUtils.getFileName(), '%');
+
+ MultivaluedMap<String, String> headers = new MultivaluedMapImpl();
+ headers.add(ExtHttpHeaders.DESTINATION, WORKSPACE + destFilename);
+
+ ContainerResponse response = service(WebDAVMethods.COPY, getPathWS() + filename, host, headers, null);
+
+ assertEquals(HTTPStatus.CREATED, response.getStatus());
+ assertTrue(session.getRootNode().hasNode(TextUtil.relativizePath(destFilename)));
+
+ Node nodeDest = session.getRootNode().getNode(TextUtil.relativizePath(destFilename));
+ assertTrue(nodeDest.hasNode("jcr:content"));
+
+ Node nodeDestContent = nodeDest.getNode("jcr:content");
+ assertTrue(nodeDestContent.hasProperty("jcr:data"));
+
+ ByteArrayInputStream streamDest = (ByteArrayInputStream)nodeDestContent.getProperty("jcr:data").getStream();
+ String getContentDest = TestUtils.stream2string(streamDest, null);
+ assertEquals(content, getContentDest);
+ assertTrue(session.getRootNode().hasNode(TextUtil.relativizePath(filename)));
+
+ Node nodeBase = session.getRootNode().getNode(TextUtil.relativizePath(filename));
+ assertTrue(nodeBase.hasNode("jcr:content"));
+
+ Node nodeBaseContent = nodeBase.getNode("jcr:content");
+ assertTrue(nodeBaseContent.hasProperty("jcr:data"));
+
+ ByteArrayInputStream streamBase = (ByteArrayInputStream)nodeBaseContent.getProperty("jcr:data").getStream();
+ String getContentBase = TestUtils.stream2string(streamBase, null);
+ assertEquals(content, getContentBase);
+ }
+
@Override
protected String getRepositoryName()
{
Modified: jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestMove.java
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestMove.java 2011-07-15 12:22:58 UTC (rev 4638)
+++ jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestMove.java 2011-07-18 01:57:47 UTC (rev 4639)
@@ -182,6 +182,98 @@
}
+ public void testMoveHeaderBeginsFromWorkspaceName() throws Exception
+ {
+ String content = TestUtils.getFileContent();
+ String filename = TestUtils.getFileName();
+ InputStream inputStream = new ByteArrayInputStream(content.getBytes());
+ TestUtils.addContent(session, filename, inputStream, defaultFileNodeType, "");
+ String destFilename = TestUtils.getFileName();
+
+ MultivaluedMap<String, String> headers = new MultivaluedMapImpl();
+
+ headers.add(ExtHttpHeaders.DESTINATION, WORKSPACE + destFilename);
+ ContainerResponse response = service(WebDAVMethods.MOVE, getPathWS() + filename, host, headers, null);
+
+ assertEquals(HTTPStatus.CREATED, response.getStatus());
+ assertTrue(session.getRootNode().hasNode(TextUtil.relativizePath(destFilename)));
+
+ Node nodeDest = session.getRootNode().getNode(TextUtil.relativizePath(destFilename));
+ assertTrue(nodeDest.hasNode("jcr:content"));
+
+ Node nodeDestContent = nodeDest.getNode("jcr:content");
+ assertTrue(nodeDestContent.hasProperty("jcr:data"));
+
+ ByteArrayInputStream streamDest = (ByteArrayInputStream)nodeDestContent.getProperty("jcr:data").getStream();
+ String getContentDest = TestUtils.stream2string(streamDest, null);
+ assertEquals(content, getContentDest);
+ assertFalse(session.getRootNode().hasNode(TextUtil.relativizePath(filename)));
+ }
+
+ public void testMoveToFolderWithSpace() throws Exception
+ {
+ String folderNameWithSpace = "new folder - testMoveToFolderWithSpace";
+ session.getRootNode().addNode(folderNameWithSpace, "nt:folder");
+ session.save();
+
+ String content = TestUtils.getFileContent();
+ String filename = TestUtils.getFileName();
+ InputStream inputStream = new ByteArrayInputStream(content.getBytes());
+ TestUtils.addContent(session, filename, inputStream, defaultFileNodeType, "");
+ String destFilename = "/" + folderNameWithSpace + TestUtils.getFileName();
+
+ MultivaluedMap<String, String> headers = new MultivaluedMapImpl();
+
+ headers.add(ExtHttpHeaders.DESTINATION, WORKSPACE + destFilename);
+ ContainerResponse response = service(WebDAVMethods.MOVE, getPathWS() + filename, host, headers, null);
+
+ assertEquals(HTTPStatus.CREATED, response.getStatus());
+ assertTrue(session.getRootNode().hasNode(TextUtil.relativizePath(destFilename)));
+
+ Node nodeDest = session.getRootNode().getNode(TextUtil.relativizePath(destFilename));
+ assertTrue(nodeDest.hasNode("jcr:content"));
+
+ Node nodeDestContent = nodeDest.getNode("jcr:content");
+ assertTrue(nodeDestContent.hasProperty("jcr:data"));
+
+ ByteArrayInputStream streamDest = (ByteArrayInputStream)nodeDestContent.getProperty("jcr:data").getStream();
+ String getContentDest = TestUtils.stream2string(streamDest, null);
+ assertEquals(content, getContentDest);
+ assertFalse(session.getRootNode().hasNode(TextUtil.relativizePath(filename)));
+ }
+
+ public void testMoveToFolderWithSpaceUnescapedChars() throws Exception
+ {
+ String folderNameWithSpace = "new folder - testMoveToFolderWithSpaceUnescapedChars";
+ session.getRootNode().addNode(folderNameWithSpace, "nt:folder");
+ session.save();
+
+ String content = TestUtils.getFileContent();
+ String filename = TestUtils.getFileName();
+ InputStream inputStream = new ByteArrayInputStream(content.getBytes());
+ TestUtils.addContent(session, filename, inputStream, defaultFileNodeType, "");
+ String destFilename = TextUtil.unescape("/" + folderNameWithSpace + TestUtils.getFileName(), '%');
+
+ MultivaluedMap<String, String> headers = new MultivaluedMapImpl();
+
+ headers.add(ExtHttpHeaders.DESTINATION, WORKSPACE + destFilename);
+ ContainerResponse response = service(WebDAVMethods.MOVE, getPathWS() + filename, host, headers, null);
+
+ assertEquals(HTTPStatus.CREATED, response.getStatus());
+ assertTrue(session.getRootNode().hasNode(TextUtil.relativizePath(destFilename)));
+
+ Node nodeDest = session.getRootNode().getNode(TextUtil.relativizePath(destFilename));
+ assertTrue(nodeDest.hasNode("jcr:content"));
+
+ Node nodeDestContent = nodeDest.getNode("jcr:content");
+ assertTrue(nodeDestContent.hasProperty("jcr:data"));
+
+ ByteArrayInputStream streamDest = (ByteArrayInputStream)nodeDestContent.getProperty("jcr:data").getStream();
+ String getContentDest = TestUtils.stream2string(streamDest, null);
+ assertEquals(content, getContentDest);
+ assertFalse(session.getRootNode().hasNode(TextUtil.relativizePath(filename)));
+ }
+
@Override
protected String getRepositoryName()
{
Modified: jcr/branches/1.12.x/patch/1.12.10-GA/JCR-1630/JCR-1630.patch
===================================================================
--- jcr/branches/1.12.x/patch/1.12.9-GA/JCR-1630/JCR-1630.patch 2011-07-08 08:01:53 UTC (rev 4614)
+++ jcr/branches/1.12.x/patch/1.12.10-GA/JCR-1630/JCR-1630.patch 2011-07-18 01:57:47 UTC (rev 4639)
@@ -1,6 +1,6 @@
Index: exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestMove.java
===================================================================
---- exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestMove.java (revision 4383)
+--- exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestMove.java (revision 4614)
+++ exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestMove.java (working copy)
@@ -182,6 +182,98 @@
@@ -103,7 +103,7 @@
{
Index: exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestCopy.java
===================================================================
---- exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestCopy.java (revision 4383)
+--- exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestCopy.java (revision 4614)
+++ exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestCopy.java (working copy)
@@ -194,9 +194,130 @@
ContainerResponse response = service(WebDAVMethods.COPY, getPathWS() + filename, host, headers, null);
@@ -238,7 +238,7 @@
{
Index: exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java
===================================================================
---- exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java (revision 4383)
+--- exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java (revision 4614)
+++ exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java (working copy)
@@ -72,6 +72,7 @@
import java.lang.annotation.Annotation;
@@ -308,7 +308,7 @@
String destWorkspace = workspaceName(destPath);
String destNodePath = path(destPath);
-@@ -1335,4 +1339,18 @@
+@@ -1338,4 +1342,18 @@
return lockTokens;
}
12 years, 10 months