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 {