exo-jcr SVN: r2037 - parent/trunk.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-03-05 11:17:20 -0500 (Fri, 05 Mar 2010)
New Revision: 2037
Modified:
parent/trunk/pom.xml
Log:
EXOJCR-553 Application servers versions updated
Modified: parent/trunk/pom.xml
===================================================================
--- parent/trunk/pom.xml 2010-03-05 13:44:02 UTC (rev 2036)
+++ parent/trunk/pom.xml 2010-03-05 16:17:20 UTC (rev 2037)
@@ -108,8 +108,8 @@
<exo.projects.app.mvn.repo>${exo.projects.directory.dependencies}/repository</exo.projects.app.mvn.repo>
- <exo.projects.app.tomcat.version>tomcat-6.0.16</exo.projects.app.tomcat.version>
- <exo.projects.app.jboss.version>jboss-4.2.3.GA</exo.projects.app.jboss.version>
+ <exo.projects.app.tomcat.version>tomcat-6.0.24</exo.projects.app.tomcat.version>
+ <exo.projects.app.jboss.version>jboss-5.1.0.GA</exo.projects.app.jboss.version>
<exo.projects.app.jonas.version>JONAS_4_8_5</exo.projects.app.jonas.version>
<exo.dev.resources.version>1.2.0</exo.dev.resources.version>
16 years, 2 months
exo-jcr SVN: r2036 - in jcr/trunk: exo.jcr.component.core and 2 other directories.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-03-05 08:44:02 -0500 (Fri, 05 Mar 2010)
New Revision: 2036
Modified:
jcr/trunk/exo.jcr.component.core/pom.xml
jcr/trunk/exo.jcr.component.webdav/pom.xml
jcr/trunk/exo.jcr.framework.command/pom.xml
jcr/trunk/pom.xml
Log:
EXOJCR-553 exo.test properties usage removed
Modified: jcr/trunk/exo.jcr.component.core/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/pom.xml 2010-03-05 12:44:24 UTC (rev 2035)
+++ jcr/trunk/exo.jcr.component.core/pom.xml 2010-03-05 13:44:02 UTC (rev 2036)
@@ -676,7 +676,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<phase>test</phase>
- <forkMode>${exo.test.forkMode}</forkMode>
<!-- argLine>${env.MAVEN_OPTS}</argLine -->
<goals>
<goal>test</goal>
Modified: jcr/trunk/exo.jcr.component.webdav/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/pom.xml 2010-03-05 12:44:24 UTC (rev 2035)
+++ jcr/trunk/exo.jcr.component.webdav/pom.xml 2010-03-05 13:44:02 UTC (rev 2036)
@@ -103,11 +103,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <includes>
- <include>**/Test*</include>
- </includes>
<excludes>
<exclude>**/TestUtils.java</exclude>
+ <exclude>**/OrderPatchTest.java</exclude>
<!-- Related issue: http://jira.exoplatform.org/browse/JCR-1149 -->
<exclude>**/TestEncoding.java</exclude>
<exclude>**/TestPropFindContent.java</exclude>
Modified: jcr/trunk/exo.jcr.framework.command/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.framework.command/pom.xml 2010-03-05 12:44:24 UTC (rev 2035)
+++ jcr/trunk/exo.jcr.framework.command/pom.xml 2010-03-05 13:44:02 UTC (rev 2036)
@@ -86,20 +86,4 @@
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/TestJCRCommands.java</include>
- <include>**/cli/Test*.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
</project>
\ No newline at end of file
Modified: jcr/trunk/pom.xml
===================================================================
--- jcr/trunk/pom.xml 2010-03-05 12:44:24 UTC (rev 2035)
+++ jcr/trunk/pom.xml 2010-03-05 13:44:02 UTC (rev 2036)
@@ -209,12 +209,12 @@
<artifactId>slf4j-api</artifactId>
<version>1.5.8</version>
<scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.5.8</version>
- <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.8</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>stax</groupId>
@@ -365,11 +365,11 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
<build>
@@ -426,9 +426,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <includes>
- <include>**/${exo.test.includes}.java</include>
- </includes>
<excludes>
<exclude>**/ftpclient/**/*.java</exclude>
<exclude>**/TestCleanableFileStreamValueData.java</exclude>
16 years, 2 months
exo-jcr SVN: r2035 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent.
by do-not-reply＠jboss.org
Author: pnedonosko
Date: 2010-03-05 07:44:24 -0500 (Fri, 05 Mar 2010)
New Revision: 2035
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java
Log:
EXOJCR-483 cleanup
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java 2010-03-05 12:42:51 UTC (rev 2034)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java 2010-03-05 12:44:24 UTC (rev 2035)
@@ -271,7 +271,7 @@
protected PlainChangesLogImpl save(PlainChangesLog changesLog) throws InvalidItemStateException,
RepositoryException, IOException
- { //LOG.info(changesLog.dump())
+ {
// copy state
PlainChangesLogImpl newLog =
new PlainChangesLogImpl(new ArrayList<ItemState>(), changesLog.getSessionId(), changesLog.getEventType(),
@@ -367,7 +367,7 @@
prevState.isInternallyCreated(), prevState.isPersisted());
newLog.add(itemState);
-
+
// save state
if (itemState.isPersisted())
{
16 years, 2 months
exo-jcr SVN: r2034 - jcr/trunk.
by do-not-reply＠jboss.org
Author: pnedonosko
Date: 2010-03-05 07:42:51 -0500 (Fri, 05 Mar 2010)
New Revision: 2034
Modified:
jcr/trunk/pom.xml
Log:
EXOJCR-483 docs added to a root reactor
Modified: jcr/trunk/pom.xml
===================================================================
--- jcr/trunk/pom.xml 2010-03-05 12:31:42 UTC (rev 2033)
+++ jcr/trunk/pom.xml 2010-03-05 12:42:51 UTC (rev 2034)
@@ -448,6 +448,7 @@
<module>exo.jcr.framework.web</module>
<module>exo.jcr.framework.ftpclient</module>
<module>applications</module>
+ <module>docs</module>
<module>packaging/module</module>
</modules>
</project>
16 years, 2 months
exo-jcr SVN: r2033 - jcr/trunk/docs/reference/en.
by do-not-reply＠jboss.org
Author: pnedonosko
Date: 2010-03-05 07:31:42 -0500 (Fri, 05 Mar 2010)
New Revision: 2033
Modified:
jcr/trunk/docs/reference/en/pom.xml
Log:
EXOJCR-483 deps on docs-style 1
Modified: jcr/trunk/docs/reference/en/pom.xml
===================================================================
--- jcr/trunk/docs/reference/en/pom.xml 2010-03-05 12:29:22 UTC (rev 2032)
+++ jcr/trunk/docs/reference/en/pom.xml 2010-03-05 12:31:42 UTC (rev 2033)
@@ -59,12 +59,12 @@
<dependency>
<groupId>org.exoplatform.doc</groupId>
<artifactId>exo-docbook-xslt</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1</version>
</dependency>
<dependency>
<groupId>org.exoplatform.doc</groupId>
<artifactId>exo-jdocbook-style</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1</version>
<type>jdocbook-style</type>
</dependency>
<!-- dependency>
16 years, 2 months
exo-jcr SVN: r2032 - in docs-style/trunk: exo-jdocbook-style and 1 other directory.
by do-not-reply＠jboss.org
Author: pnedonosko
Date: 2010-03-05 07:29:22 -0500 (Fri, 05 Mar 2010)
New Revision: 2032
Modified:
docs-style/trunk/exo-docbook-xslt/pom.xml
docs-style/trunk/exo-jdocbook-style/pom.xml
Log:
EXOJCR-483 pom cleanup
Modified: docs-style/trunk/exo-docbook-xslt/pom.xml
===================================================================
--- docs-style/trunk/exo-docbook-xslt/pom.xml 2010-03-05 12:28:11 UTC (rev 2031)
+++ docs-style/trunk/exo-docbook-xslt/pom.xml 2010-03-05 12:29:22 UTC (rev 2032)
@@ -18,19 +18,6 @@
eXoJCR Documentation.
</description>
- <contributors>
- <contributor>
- <name>Pete Muir</name>
- </contributor>
- <contributor>
- <name>Mark Newton</name>
- </contributor>
- <contributor>
- <name>Thomas Heute</name>
- </contributor>
- </contributors>
-
-
<dependencies>
<dependency>
<groupId>net.sf.docbook</groupId>
@@ -44,7 +31,6 @@
</dependency>
</dependencies>
-
<build>
<extensions>
<extension>
@@ -54,5 +40,4 @@
</extension>
</extensions>
</build>
-
</project>
Modified: docs-style/trunk/exo-jdocbook-style/pom.xml
===================================================================
--- docs-style/trunk/exo-jdocbook-style/pom.xml 2010-03-05 12:28:11 UTC (rev 2031)
+++ docs-style/trunk/exo-jdocbook-style/pom.xml 2010-03-05 12:29:22 UTC (rev 2032)
@@ -17,18 +17,6 @@
The JDocBook styles for the eXoJCR Documentation.
</description>
- <contributors>
- <contributor>
- <name>Pete Muir</name>
- </contributor>
- <contributor>
- <name>Mark Newton</name>
- </contributor>
- <contributor>
- <name>Thomas Heute</name>
- </contributor>
- </contributors>
-
<build>
<plugins>
<plugin>
@@ -47,6 +35,4 @@
</extension>
</extensions>
</build>
-
-
</project>
16 years, 2 months
exo-jcr SVN: r2031 - in docs-style/tags/1: exo-jdocbook-style and 1 other directory.
by do-not-reply＠jboss.org
Author: pnedonosko
Date: 2010-03-05 07:28:11 -0500 (Fri, 05 Mar 2010)
New Revision: 2031
Modified:
docs-style/tags/1/exo-docbook-xslt/pom.xml
docs-style/tags/1/exo-jdocbook-style/pom.xml
Log:
EXOJCR-483 pom cleanup
Modified: docs-style/tags/1/exo-docbook-xslt/pom.xml
===================================================================
--- docs-style/tags/1/exo-docbook-xslt/pom.xml 2010-03-05 12:27:51 UTC (rev 2030)
+++ docs-style/tags/1/exo-docbook-xslt/pom.xml 2010-03-05 12:28:11 UTC (rev 2031)
@@ -18,19 +18,6 @@
eXoJCR Documentation.
</description>
- <contributors>
- <contributor>
- <name>Pete Muir</name>
- </contributor>
- <contributor>
- <name>Mark Newton</name>
- </contributor>
- <contributor>
- <name>Thomas Heute</name>
- </contributor>
- </contributors>
-
-
<dependencies>
<dependency>
<groupId>net.sf.docbook</groupId>
@@ -44,7 +31,6 @@
</dependency>
</dependencies>
-
<build>
<extensions>
<extension>
Modified: docs-style/tags/1/exo-jdocbook-style/pom.xml
===================================================================
--- docs-style/tags/1/exo-jdocbook-style/pom.xml 2010-03-05 12:27:51 UTC (rev 2030)
+++ docs-style/tags/1/exo-jdocbook-style/pom.xml 2010-03-05 12:28:11 UTC (rev 2031)
@@ -17,18 +17,6 @@
The JDocBook styles for the eXoJCR Documentation.
</description>
- <contributors>
- <contributor>
- <name>Pete Muir</name>
- </contributor>
- <contributor>
- <name>Mark Newton</name>
- </contributor>
- <contributor>
- <name>Thomas Heute</name>
- </contributor>
- </contributors>
-
<build>
<plugins>
<plugin>
@@ -47,6 +35,4 @@
</extension>
</extensions>
</build>
-
-
</project>
16 years, 2 months
exo-jcr SVN: r2030 - in jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr: impl/dataflow/persistent and 1 other directory.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2010-03-05 07:27:51 -0500 (Fri, 05 Mar 2010)
New Revision: 2030
Removed:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PairChangesLog.java
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java
Log:
EXOJCR-575: remove PairChangesLog
Deleted: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PairChangesLog.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PairChangesLog.java 2010-03-05 12:27:37 UTC (rev 2029)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PairChangesLog.java 2010-03-05 12:27:51 UTC (rev 2030)
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2009 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.dataflow;
-
-import java.util.List;
-
-/**
- * Created by The eXo Platform SAS.
- *
- * <br/>Date: 04.03.2009
- *
- * @author <a href="mailto:alex.reshetnyak@exoplatform.com.ua">Alex Reshetnyak</a>
- * @version $Id$
- */
-public class PairChangesLog extends PlainChangesLogImpl
-{
-
- /**
- * Pair log constructor.
- *
- * @param items List of ItemStates
- * @param sessionId String
- * @param eventType int
- * @param pairId String
- */
- public PairChangesLog(List<ItemState> items, String sessionId, int eventType, String pairId)
- {
- super(items, sessionId, eventType);
- this.pairId = pairId;
- }
-}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java 2010-03-05 12:27:37 UTC (rev 2029)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java 2010-03-05 12:27:51 UTC (rev 2030)
@@ -22,7 +22,6 @@
import org.exoplatform.services.jcr.dataflow.CompositeChangesLog;
import org.exoplatform.services.jcr.dataflow.DataManager;
import org.exoplatform.services.jcr.dataflow.ItemState;
-import org.exoplatform.services.jcr.dataflow.PairChangesLog;
import org.exoplatform.services.jcr.dataflow.PlainChangesLog;
import org.exoplatform.services.jcr.dataflow.PlainChangesLogImpl;
import org.exoplatform.services.jcr.dataflow.TransactionChangesLog;
@@ -48,7 +47,7 @@
* mix:versionable
*
* @author <a href="mailto:gennady.azarenkov@exoplatform.com">Gennady Azarenkov</a>
- * @version $Id$
+ * @version $Id$ * @version $Id: VersionableWorkspaceDataManager.java 1518 2010-01-20 23:33:30Z
*/
public class VersionableWorkspaceDataManager extends ACLInheritanceSupportedWorkspaceDataManager
@@ -83,7 +82,7 @@
return versionDataManager.getChildNodesData(nodeData);
}
return super.getChildNodesData(nodeData);
- }
+ }
/**
* {@inheritDoc}
@@ -210,9 +209,10 @@
// we have pair of logs for system and non-system (this) workspaces
final String pairId = IdGenerator.generate();
- versionLogs.addLog(new PairChangesLog(vstates, changes.getSessionId(), changes.getEventType(), pairId));
- nonVersionLogs.addLog(new PairChangesLog(nvstates, changes.getSessionId(), changes.getEventType(),
+ versionLogs.addLog(new PlainChangesLogImpl(vstates, changes.getSessionId(), changes.getEventType(),
pairId));
+ nonVersionLogs.addLog(new PlainChangesLogImpl(nvstates, changes.getSessionId(), changes.getEventType(),
+ pairId));
}
else
{
16 years, 2 months
exo-jcr SVN: r2029 - ws/trunk.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-03-05 07:27:37 -0500 (Fri, 05 Mar 2010)
New Revision: 2029
Modified:
ws/trunk/pom.xml
Log:
EXOJCR-553 exo.test.includes property usage removed
Modified: ws/trunk/pom.xml
===================================================================
--- ws/trunk/pom.xml 2010-03-05 12:24:41 UTC (rev 2028)
+++ ws/trunk/pom.xml 2010-03-05 12:27:37 UTC (rev 2029)
@@ -46,8 +46,6 @@
<org.exoplatform.kernel.version>2.2.1-GA-SNAPSHOT</org.exoplatform.kernel.version>
<org.exoplatform.core.version>2.3.1-GA-SNAPSHOT</org.exoplatform.core.version>
-
- <exo.test.includes>*Test*</exo.test.includes>
</properties>
<modules>
@@ -162,20 +160,20 @@
<groupId>xpp3</groupId>
<artifactId>xpp3</artifactId>
<version>1.1.3.4.O</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.5.8</version>
- <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.8</version>
+ <scope>test</scope>
</dependency>
</dependencies>
- </dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
+ </dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
16 years, 2 months
exo-jcr SVN: r2028 - jcr/tags/1.12.0-GA/docs/reference/en.
by do-not-reply＠jboss.org
Author: pnedonosko
Date: 2010-03-05 07:24:41 -0500 (Fri, 05 Mar 2010)
New Revision: 2028
Modified:
jcr/tags/1.12.0-GA/docs/reference/en/pom.xml
Log:
EXOJCR-483 deps on docs-style 1
Modified: jcr/tags/1.12.0-GA/docs/reference/en/pom.xml
===================================================================
--- jcr/tags/1.12.0-GA/docs/reference/en/pom.xml 2010-03-05 12:23:17 UTC (rev 2027)
+++ jcr/tags/1.12.0-GA/docs/reference/en/pom.xml 2010-03-05 12:24:41 UTC (rev 2028)
@@ -59,12 +59,12 @@
<dependency>
<groupId>org.exoplatform.doc</groupId>
<artifactId>exo-docbook-xslt</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1</version>
</dependency>
<dependency>
<groupId>org.exoplatform.doc</groupId>
<artifactId>exo-jdocbook-style</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1</version>
<type>jdocbook-style</type>
</dependency>
<!-- dependency>
16 years, 2 months