exo-jcr SVN: r5413 - jcr/branches/1.15.x/exo.jcr.component.core.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-12-30 08:15:06 -0500 (Fri, 30 Dec 2011)
New Revision: 5413
Added:
jcr/branches/1.15.x/exo.jcr.component.core/developer-notes.txt
Log:
EXOJCR-1595: added developer-notes
Added: jcr/branches/1.15.x/exo.jcr.component.core/developer-notes.txt
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/developer-notes.txt (rev 0)
+++ jcr/branches/1.15.x/exo.jcr.component.core/developer-notes.txt 2011-12-30 13:15:06 UTC (rev 5413)
@@ -0,0 +1,4 @@
+* Removed JCR_SCONTAINER table
+* Removed StorageUpdateManager class
+* "update-storage" parameter in Workspace data container configuration is not supported anymore
+* Removed support of FileSystemLockPersister
\ No newline at end of file
12 years, 4 months
- 1
- 0
exo-jcr SVN: r5412 - jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-12-30 06:52:27 -0500 (Fri, 30 Dec 2011)
New Revision: 5412
Modified:
jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/TestMultiDbJDBCConnection.java
Log:
EXOJCR-803: Removed StorageUpdateManager feature
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/TestMultiDbJDBCConnection.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/TestMultiDbJDBCConnection.java 2011-12-30 10:09:39 UTC (rev 5411)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/TestMultiDbJDBCConnection.java 2011-12-30 11:52:27 UTC (rev 5412)
@@ -81,7 +81,6 @@
st.executeUpdate("drop table JCR_MREF");
st.executeUpdate("drop table JCR_MVALUE");
st.executeUpdate("drop table JCR_MITEM");
- st.executeUpdate("drop table JCR_MCONTAINER");
st.close();
}
12 years, 4 months
- 1
- 0
exo-jcr SVN: r5411 - in jcr/branches/1.15.x/exo.jcr.component.core/src: main/java/org/exoplatform/services/jcr/impl/core and 2 other directories.
by do-not-reply＠jboss.org
Author: andrew.plotnikov
Date: 2011-12-30 05:09:39 -0500 (Fri, 30 Dec 2011)
New Revision: 5411
Modified:
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PlainChangesLogImpl.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/TransactionChangesLog.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLog.java
jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/version/TestFrozenNodeInitializer.java
Log:
EXOJCR-1336: Improved TransactionChangesLog
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PlainChangesLogImpl.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PlainChangesLogImpl.java 2011-12-30 09:54:01 UTC (rev 5410)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PlainChangesLogImpl.java 2011-12-30 10:09:39 UTC (rev 5411)
@@ -19,6 +19,12 @@
package org.exoplatform.services.jcr.dataflow;
import org.exoplatform.services.jcr.core.ExtendedSession;
+import org.exoplatform.services.jcr.datamodel.IllegalPathException;
+import org.exoplatform.services.jcr.datamodel.ItemData;
+import org.exoplatform.services.jcr.datamodel.ItemType;
+import org.exoplatform.services.jcr.datamodel.NodeData;
+import org.exoplatform.services.jcr.datamodel.QPath;
+import org.exoplatform.services.jcr.datamodel.QPathEntry;
import org.exoplatform.services.jcr.impl.Constants;
import java.io.Externalizable;
@@ -26,7 +32,10 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* Created by The eXo Platform SAS.
@@ -37,21 +46,86 @@
*/
public class PlainChangesLogImpl implements Externalizable, PlainChangesLog
{
+ /**
+ * Constant null value
+ */
private static final int NULL_VALUE = -1;
+ /**
+ * Constant not null value
+ */
private static final int NOT_NULL_VALUE = 1;
+ /**
+ * Constant serial Version UID
+ */
private static final long serialVersionUID = 5624550860372364084L;
+ /**
+ * Collect of all item
+ */
protected List<ItemState> items;
+ /**
+ * Value session id
+ */
protected String sessionId;
+ /**
+ * Value event type
+ */
protected int eventType;
+ /**
+ * Value session
+ */
protected ExtendedSession session;
/**
+ * ItemState index storage. Used in getItemState() by id and path.
+ */
+ protected Map<Object, ItemState> index = new HashMap<Object, ItemState>();
+
+ /**
+ * ItemState index storage. Used to store last child nodes states.
+ */
+ protected Map<String, Map<String, ItemState>> lastChildNodeStates = new HashMap<String, Map<String, ItemState>>();
+
+ /**
+ * ItemState index storage. Used to store last child properties states.
+ */
+ protected Map<String, Map<String, ItemState>> lastChildPropertyStates =
+ new HashMap<String, Map<String, ItemState>>();
+
+ /**
+ * ItemState index storage. Used to store child nodes states.
+ */
+ protected Map<String, List<ItemState>> childNodeStates = new HashMap<String, List<ItemState>>();
+
+ /**
+ * ItemState index storage. Used to store child properties states.
+ */
+ protected Map<String, List<ItemState>> childPropertyStates = new HashMap<String, List<ItemState>>();
+
+ /**
+ * Stores info for persisted child nodes by parent identifier.
+ * <br>Index in array points to:
+ * <br>0 - child nodes count.
+ * <br>1 - last child order number
+ */
+ protected Map<String, int[]> childNodesInfo = new HashMap<String, int[]>();
+
+ /**
+ * Index in <code>childNodesInfo<code> value array to store child nodes count.
+ */
+ protected final int CHILD_NODES_COUNT = 0;
+
+ /**
+ * Index in <code>childNodesInfo<code> value array to store last child order number.
+ */
+ protected final int CHILD_NODES_LAST_ORDER_NUMBER = 1;
+
+ /**
* Identifier of system and non-system logs pair. Null if no pair found.
*/
protected String pairId;
@@ -92,7 +166,7 @@
}
/**
- * An empty log.
+ * PlainChangesLogImpl constructor with an empty log.
*
* @param session Session
*/
@@ -102,7 +176,7 @@
}
/**
- * An empty log.
+ * PlainChangesLogImpl constructor with an empty log.
*
* @param sessionId String
*/
@@ -112,47 +186,39 @@
}
/**
- * default constructor (for externalizable mainly)
+ * Default PlainChangesLogImpl constructor with an empty log. constructor (for externalizable mainly)
*/
public PlainChangesLogImpl()
{
this(new ArrayList<ItemState>(), (String)null, -1);
}
- /*
- * (non-Javadoc)
- *
- * @see org.exoplatform.services.jcr.dataflow.ItemDataChangesLog#getAllStates()
+ /**
+ * {@inheritDoc}
*/
public List<ItemState> getAllStates()
{
return items;
}
- /*
- * (non-Javadoc)
- *
- * @see org.exoplatform.services.jcr.dataflow.ItemDataChangesLog#getSize()
+ /**
+ * {@inheritDoc}
*/
public int getSize()
{
return items.size();
}
- /*
- * (non-Javadoc)
- *
- * @see org.exoplatform.services.jcr.dataflow.PlainChangesLog#getEventType()
+ /**
+ * {@inheritDoc}
*/
public int getEventType()
{
return eventType;
}
- /*
- * (non-Javadoc)
- *
- * @see org.exoplatform.services.jcr.dataflow.ItemDataChangesLog#getSessionId()
+ /**
+ * {@inheritDoc}
*/
public String getSessionId()
{
@@ -167,50 +233,56 @@
return session;
}
- /*
- * (non-Javadoc)
- *
- * @see org.exoplatform.services.jcr.dataflow.PlainChangesLog#add(org.exoplatform.services.jcr.dataflow
- * .ItemState)
+ /**
+ * {@inheritDoc}
*/
public PlainChangesLog add(ItemState change)
{
items.add(change);
+ addItem(change);
+
return this;
}
- /*
- * (non-Javadoc)
- *
- * @see org.exoplatform.services.jcr.dataflow.PlainChangesLog#addAll(java.util.List)
+ /**
+ * {@inheritDoc}
*/
public PlainChangesLog addAll(List<ItemState> changes)
{
items.addAll(changes);
+ for (int i = 0, length = changes.size(); i < length; i++)
+ {
+ addItem(changes.get(i));
+ }
+
return this;
}
- /*
- * (non-Javadoc)
- *
- * @see org.exoplatform.services.jcr.dataflow.PlainChangesLog#clear()
+ /**
+ * {@inheritDoc}
*/
public void clear()
{
items.clear();
+ index.clear();
+ lastChildNodeStates.clear();
+ lastChildPropertyStates.clear();
+ childNodeStates.clear();
+ childPropertyStates.clear();
+ childNodesInfo.clear();
}
/**
- * Return pair Id for linked logs (when original log splitted into two, for system and non-system workspaces).
- *
- * @return String
- * pair identifier
+ * {@inheritDoc}
*/
public String getPairId()
{
return pairId;
}
+ /**
+ * {@inheritDoc}
+ */
public String dump()
{
StringBuilder str = new StringBuilder("ChangesLog: \n");
@@ -238,11 +310,12 @@
protected PlainChangesLogImpl(List<ItemState> items, String sessionId, int eventType, String pairId,
ExtendedSession session)
{
- this.items = items;
this.session = session;
this.sessionId = sessionId;
this.eventType = eventType;
this.pairId = pairId;
+ this.items = new ArrayList<ItemState>();
+ addAll(items);
}
/**
@@ -276,6 +349,622 @@
return new PlainChangesLogImpl(items, originalLog.getSessionId(), originalLog.getEventType(), pairId, null);
}
+ /**
+ * Adds item to the changes log.
+ *
+ * @param item
+ * the item
+ */
+ protected void addItem(ItemState item)
+ {
+ index.put(item.getData().getIdentifier(), item);
+ index.put(item.getData().getQPath(), item);
+ index.put(new ParentIDQPathBasedKey(item), item);
+ index.put(new IDStateBasedKey(item.getData().getIdentifier(), item.getState()), item);
+
+ if (item.getData().isNode())
+ {
+ Map<String, ItemState> children = lastChildNodeStates.get(item.getData().getParentIdentifier());
+ if (children == null)
+ {
+ children = new HashMap<String, ItemState>();
+ lastChildNodeStates.put(item.getData().getParentIdentifier(), children);
+ }
+ children.put(item.getData().getIdentifier(), item);
+
+ List<ItemState> listItemState = childNodeStates.get(item.getData().getParentIdentifier());
+ if (listItemState == null)
+ {
+ listItemState = new ArrayList<ItemState>();
+ childNodeStates.put(item.getData().getParentIdentifier(), listItemState);
+ }
+ listItemState.add(item);
+ }
+ else
+ {
+ Map<String, ItemState> children = lastChildPropertyStates.get(item.getData().getParentIdentifier());
+ if (children == null)
+ {
+ children = new HashMap<String, ItemState>();
+ lastChildPropertyStates.put(item.getData().getParentIdentifier(), children);
+ }
+ children.put(item.getData().getIdentifier(), item);
+
+ List<ItemState> listItemState = childPropertyStates.get(item.getData().getParentIdentifier());
+ if (listItemState == null)
+ {
+ listItemState = new ArrayList<ItemState>();
+ childPropertyStates.put(item.getData().getParentIdentifier(), listItemState);
+ }
+ listItemState.add(item);
+ }
+
+ if (item.isNode() && item.isPersisted())
+ {
+ int[] childInfo = childNodesInfo.get(item.getData().getParentIdentifier());
+ if (childInfo == null)
+ {
+ childInfo = new int[2];
+ }
+
+ if (item.isDeleted())
+ {
+ --childInfo[CHILD_NODES_COUNT];
+ }
+ else if (item.isAdded())
+ {
+ ++childInfo[CHILD_NODES_COUNT];
+ childInfo[CHILD_NODES_LAST_ORDER_NUMBER] = ((NodeData)item.getData()).getOrderNumber();
+
+ }
+ childNodesInfo.put(item.getData().getParentIdentifier(), childInfo);
+ }
+ }
+
+ public int getChildNodesCount(String rootIdentifier)
+ {
+ int[] childInfo = childNodesInfo.get(rootIdentifier);
+ return childInfo == null ? 0 : childInfo[CHILD_NODES_COUNT];
+ }
+
+ public int getLastChildOrderNumber(String rootIdentifier)
+ {
+ int[] childInfo = childNodesInfo.get(rootIdentifier);
+ return childInfo == null ? -1 : childInfo[CHILD_NODES_LAST_ORDER_NUMBER];
+ }
+
+ /**
+ * Removes the item at the rootPath and all descendants from the log
+ *
+ * @param root
+ * path
+ */
+ public void remove(QPath rootPath)
+ {
+ for (int i = items.size() - 1; i >= 0; i--)
+ {
+ ItemState item = items.get(i);
+
+ QPath qPath = item.getData().getQPath();
+ if (qPath.isDescendantOf(rootPath) || item.getAncestorToSave().isDescendantOf(rootPath)
+ || item.getAncestorToSave().equals(rootPath) || qPath.equals(rootPath))
+ {
+ items.remove(i);
+ index.remove(item.getData().getIdentifier());
+ index.remove(item.getData().getQPath());
+ index.remove(new ParentIDQPathBasedKey(item));
+ index.remove(new IDStateBasedKey(item.getData().getIdentifier(), item.getState()));
+ childNodesInfo.remove(item.getData().getIdentifier());
+ lastChildNodeStates.remove(item.getData().getIdentifier());
+ lastChildPropertyStates.remove(item.getData().getIdentifier());
+ childNodeStates.remove(item.getData().getIdentifier());
+ childPropertyStates.remove(item.getData().getIdentifier());
+
+ if (item.isNode() && item.isPersisted())
+ {
+
+ int childInfo[] = childNodesInfo.get(item.getData().getParentIdentifier());
+
+ if (childInfo != null)
+ {
+ if (item.isDeleted())
+ {
+ ++childInfo[CHILD_NODES_COUNT];
+ }
+ else if (item.isAdded())
+ {
+ --childInfo[CHILD_NODES_COUNT];
+ }
+
+ childNodesInfo.put(item.getData().getParentIdentifier(), childInfo);
+ }
+ }
+
+ if (item.getData().isNode())
+ {
+ Map<String, ItemState> children = lastChildNodeStates.get(item.getData().getParentIdentifier());
+ if (children != null)
+ {
+ children.remove(item.getData().getIdentifier());
+ }
+
+ List<ItemState> listItemStates = childNodeStates.get(item.getData().getParentIdentifier());
+ if (listItemStates != null)
+ {
+ listItemStates.remove(item);
+ }
+ }
+ else
+ {
+ Map<String, ItemState> children = lastChildPropertyStates.get(item.getData().getParentIdentifier());
+ if (children != null)
+ {
+ children.remove(item.getData().getIdentifier());
+ }
+
+ List<ItemState> listItemStates = childPropertyStates.get(item.getData().getParentIdentifier());
+ if (listItemStates != null)
+ {
+ listItemStates.remove(item);
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Collect last in ChangesLog order item child changes.
+ *
+ * @param rootData
+ * - a item root of the changes scan
+ * @param forNodes
+ * retrieves nodes' ItemStates is true, or properties' otherwise
+ * @return child items states
+ */
+ public Collection<ItemState> getLastChildrenStates(ItemData rootData, boolean forNodes)
+ {
+ Map<String, ItemState> children =
+ forNodes ? lastChildNodeStates.get(rootData.getIdentifier()) : lastChildPropertyStates.get(rootData
+ .getIdentifier());
+
+ return children == null ? new ArrayList<ItemState>() : children.values();
+ }
+
+ /**
+ * Return the last item state from ChangesLog.
+ *
+ * @param item
+ * an item data the last state which need to be taken
+ * @param forNode
+ * retrieves nodes' ItemStates is true, or properties' otherwise
+ * @return the last item state
+ */
+ public ItemState getLastState(ItemData item, boolean forNode)
+ {
+ Map<String, ItemState> children =
+ forNode ? lastChildNodeStates.get(item.getParentIdentifier()) : lastChildPropertyStates.get(item
+ .getParentIdentifier());
+
+ return children == null ? null : children.get(item.getIdentifier());
+ }
+ /**
+ * Collect changes of all item direct childs. Including the item itself.
+ * @param rootIdentifier root identifier
+ * @param forNodes must be returned nodes or properties
+ * @return Collect changes of all item direct childs
+ */
+ public List<ItemState> getChildrenChanges(String rootIdentifier, boolean forNodes)
+ {
+ List<ItemState> children =
+ forNodes ? childNodeStates.get(rootIdentifier) : childPropertyStates.get(rootIdentifier);
+
+ return children == null ? new ArrayList<ItemState>() : children;
+ }
+
+ /**
+ * Get ItemState by identifier and state.
+ *
+ * NOTE: Uses index HashMap.
+ *
+ * @param itemIdentifier
+ * @param sate
+ * @return
+ */
+ public ItemState getItemState(String itemIdentifier, int state)
+ {
+ return index.get(new IDStateBasedKey(itemIdentifier, state));
+ }
+
+ /**
+ * Get ItemState by identifier
+ * @param itemIdentifier
+ * @return
+ */
+ public ItemState getItemState(String itemIdentifier)
+ {
+ return index.get(itemIdentifier);
+ }
+
+ /**
+ * Get ItemState by absolute path.
+ *
+ * NOTE: Uses index HashMap.
+ *
+ * @param itemPath
+ * @return
+ */
+ public ItemState getItemState(QPath itemPath)
+ {
+ return index.get(itemPath);
+ }
+
+ /**
+ * Get ItemState by parent and item name.
+ *
+ * @param parentData
+ * parent
+ * @param name
+ * item name
+ * @param itemType
+ * item type
+ * @return
+ * @throws IllegalPathException
+ */
+ public ItemState getItemState(NodeData parentData, QPathEntry name, ItemType itemType) throws IllegalPathException
+ {
+ if (itemType != ItemType.UNKNOWN)
+ {
+ return index.get(new ParentIDQPathBasedKey(parentData.getIdentifier(), name, itemType));
+ }
+ else
+ {
+ ItemState state = index.get(new ParentIDQPathBasedKey(parentData.getIdentifier(), name, ItemType.NODE));
+ if (state == null)
+ {
+ state = index.get(new ParentIDQPathBasedKey(parentData.getIdentifier(), name, ItemType.PROPERTY));
+ }
+ return state;
+ }
+ }
+
+ /**
+ * @param rootPath
+ * @return item state at the rootPath and its descendants
+ */
+ public List<ItemState> getDescendantsChanges(QPath rootPath)
+ {
+ List<ItemState> list = new ArrayList<ItemState>();
+ if (rootPath.equals(Constants.ROOT_PATH))
+ {
+ list.addAll(items);
+ }
+ else
+ {
+ for (int i = 0, length = items.size(); i < length; i++)
+ {
+ ItemState item = items.get(i);
+ if (item.isDescendantOf(rootPath))
+ {
+ list.add(item);
+ }
+ }
+ }
+
+ return list;
+ }
+
+ /**
+ * Gets items by identifier.
+ *
+ * @param itemIdentifier
+ * @return
+ */
+ public List<ItemState> getItemStates(String itemIdentifier)
+ {
+ List<ItemState> states = new ArrayList<ItemState>();
+ List<ItemState> currentStates = getAllStates();
+ for (int i = 0, length = currentStates.size(); i < length; i++)
+ {
+ ItemState state = currentStates.get(i);
+ if (state.getData().getIdentifier().equals(itemIdentifier))
+ {
+ states.add(state);
+ }
+ }
+ return states;
+ }
+
+ /**
+ * Collect last in ChangesLog order node (and direct childs) changes.
+ *
+ * @param rootData
+ * - a item root of the changes scan
+ * @return this item (!) and child items last modify states (i.e. updates, not adds or deletes)
+ */
+ public Collection<ItemState> getLastModifyStates(NodeData rootData)
+ {
+ HashMap<String, ItemState> changes = new HashMap<String, ItemState>();
+
+ for (int i = 0; i < items.size(); i++)
+ {
+ ItemData item = items.get(i).getData();
+ if (item.getIdentifier().equals(rootData.getIdentifier()))
+ {
+ // the node
+ if (items.get(i).isAdded())
+ {
+ // if a new item - no modify changes can be
+ return new ArrayList<ItemState>();
+ }
+
+ if (!items.get(i).isDeleted())
+ {
+ changes.put(item.getIdentifier(), items.get(i));
+ }
+ }
+ else if (item.getParentIdentifier().equals(rootData.getIdentifier()))
+ {
+ // childs
+ changes.put(item.getIdentifier(), items.get(i));
+ }
+ }
+
+ return changes.values();
+ }
+
+ /**
+ * Search for an item state of item with given id and filter parameters.
+ *
+ * @param id
+ * - item id
+ * @param states
+ * - filter only the given list states (ORed), or all if it's null
+ * @param isPersisted
+ * - filter only persisted/not persisted, or all if it's null
+ * @param orAncestor
+ * - may return the item ancestor if true and the ancestor was changed last, or only item
+ * with given path if it's null
+ * @return - filtered {@link ItemState}
+ * @throws IllegalPathException
+ */
+ public ItemState findItemState(String id, Boolean isPersisted, int... states) throws IllegalPathException
+ {
+ List<ItemState> allStates = getAllStates();
+ // search from the end for state
+ for (int i = allStates.size() - 1; i >= 0; i--)
+ {
+ ItemState istate = allStates.get(i);
+ boolean byState = false;
+ if (states != null)
+ {
+ for (int state : states)
+ {
+ if (istate.getState() == state)
+ {
+ byState = true;
+ break;
+ }
+ }
+ }
+ else
+ {
+ byState = true;
+ }
+ if (byState && (isPersisted != null ? istate.isPersisted() == isPersisted : true)
+ && istate.getData().getIdentifier().equals(id))
+ {
+ return istate;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * This class is used as a key for index map.
+ */
+ protected class IDStateBasedKey
+ {
+
+ /**
+ * Item identifier.
+ */
+ private final String identifier;
+
+ /**
+ * Item state.
+ */
+ private final int state;
+
+ /**
+ * KeyUUIDState constructor.
+ *
+ * @param identifier
+ * item identifier
+ * @param state
+ * item state
+ */
+ public IDStateBasedKey(String identifier, int state)
+ {
+ this.identifier = identifier;
+ this.state = state;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + identifier.hashCode();
+ result = prime * result + state;
+
+ return result;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (this == obj)
+ {
+ return true;
+ }
+ if (obj == null)
+ {
+ return false;
+ }
+ if (getClass() != obj.getClass())
+ {
+ return false;
+ }
+ IDStateBasedKey other = (IDStateBasedKey)obj;
+
+ if (identifier == null)
+ {
+ if (other.identifier != null)
+ {
+ return false;
+ }
+ }
+ else if (!identifier.equals(other.identifier))
+ {
+ return false;
+ }
+ if (state != other.state)
+ {
+ return false;
+ }
+ return true;
+ }
+ }
+
+ /**
+ * This class is used as a key for index map.
+ */
+ protected class ParentIDQPathBasedKey
+ {
+ /**
+ * Item name.
+ */
+ private final QPathEntry name;
+
+ /**
+ * Parent identifier.
+ */
+ private final String parentIdentifier;
+
+ private final ItemType itemType;
+
+ /**
+ * KeyParentUUIDQPath constructor.
+ *
+ * @param item
+ * the item
+ */
+ public ParentIDQPathBasedKey(ItemState item)
+ {
+ this.name = item.getData().getQPath().getEntries()[item.getData().getQPath().getEntries().length - 1];
+ this.parentIdentifier = item.getData().getParentIdentifier();
+ this.itemType = ItemType.getItemType(item.getData());
+ }
+
+ /**
+ * KeyParentUUIDQPath constructor.
+ *
+ * @param parentIdentifier
+ * the parent identifier
+ * @param name
+ * item name
+ */
+ ParentIDQPathBasedKey(String parentIdentifier, QPathEntry name, ItemType itemType)
+ {
+ this.name = name;
+ this.parentIdentifier = parentIdentifier;
+ this.itemType = itemType;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + name.getName().hashCode();
+ result = prime * result + name.getNamespace().hashCode();
+ result = prime * result + name.getIndex();
+ result = prime * result + (parentIdentifier == null ? 0 : parentIdentifier.hashCode());
+ result = prime * result + itemType.ordinal();
+
+ return result;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (this == obj)
+ {
+ return true;
+ }
+ if (obj == null)
+ {
+ return false;
+ }
+ if (getClass() != obj.getClass())
+ {
+ return false;
+ }
+ ParentIDQPathBasedKey other = (ParentIDQPathBasedKey)obj;
+
+ if (name == null)
+ {
+ if (other.name != null)
+ {
+ return false;
+ }
+ }
+ else if (!name.getName().equals(other.name.getName())
+ || !name.getNamespace().equals(other.name.getNamespace()) || name.getIndex() != other.name.getIndex())
+ {
+ return false;
+ }
+
+ if (parentIdentifier == null)
+ {
+ if (other.parentIdentifier != null)
+ {
+ return false;
+ }
+ }
+ else if (!parentIdentifier.equals(other.parentIdentifier))
+ {
+ return false;
+ }
+
+ if (itemType == null)
+ {
+ if (other.itemType != null)
+ {
+ return false;
+ }
+ }
+ else if (!itemType.equals(other.itemType))
+ {
+ return false;
+ }
+
+ return true;
+ }
+ }
+
// Need for Externalizable
// ------------------ [ BEGIN ] ------------------
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/TransactionChangesLog.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/TransactionChangesLog.java 2011-12-30 09:54:01 UTC (rev 5410)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/TransactionChangesLog.java 2011-12-30 10:09:39 UTC (rev 5411)
@@ -18,7 +18,7 @@
*/
package org.exoplatform.services.jcr.dataflow;
-import org.exoplatform.services.jcr.datamodel.ItemData;
+import org.exoplatform.services.jcr.datamodel.IllegalPathException;
import org.exoplatform.services.jcr.datamodel.ItemType;
import org.exoplatform.services.jcr.datamodel.NodeData;
import org.exoplatform.services.jcr.datamodel.QPathEntry;
@@ -37,7 +37,6 @@
* @author Gennady Azarenkov
* @version $Id: TransactionChangesLog.java 11907 2008-03-13 15:36:21Z ksm $
*/
-
public class TransactionChangesLog implements CompositeChangesLog, Externalizable
{
@@ -74,10 +73,8 @@
changesLogs.remove(log);
}
- /*
- * (non-Javadoc)
- *
- * @see org.exoplatform.services.jcr.dataflow.CompositeChangesLog#getLogIterator()
+ /**
+ * {@inheritDoc}
*/
public ChangesLogIterator getLogIterator()
{
@@ -133,26 +130,35 @@
public ItemState getItemState(String itemIdentifier)
{
- List<ItemState> allStates = getAllStates();
- for (int i = allStates.size() - 1; i >= 0; i--)
+ ItemState state;
+ for (PlainChangesLog changesLog : changesLogs)
{
- ItemState state = allStates.get(i);
- if (state.getData().getIdentifier().equals(itemIdentifier))
+ state = ((PlainChangesLogImpl)changesLog).getItemState(itemIdentifier);
+ if (state != null)
+ {
return state;
+ }
}
return null;
}
public ItemState getItemState(NodeData parentData, QPathEntry name, ItemType itemType)
{
- List<ItemState> allStates = getAllStates();
- for (int i = allStates.size() - 1; i >= 0; i--)
+ ItemState state;
+ for (PlainChangesLog changesLog : changesLogs)
{
- ItemState state = allStates.get(i);
- if (state.getData().getParentIdentifier().equals(parentData.getIdentifier())
- && state.getData().getQPath().getEntries()[state.getData().getQPath().getEntries().length - 1].isSame(name)
- && itemType.isSuitableFor(state.getData()))
- return state;
+ try
+ {
+ state = ((PlainChangesLogImpl)changesLog).getItemState(parentData, name, itemType);
+ if (state != null)
+ {
+ return state;
+ }
+ }
+ catch (IllegalPathException e)
+ {
+
+ }
}
return null;
}
@@ -160,13 +166,10 @@
public List<ItemState> getChildrenChanges(String rootIdentifier, boolean forNodes)
{
List<ItemState> list = new ArrayList<ItemState>();
- for (ItemState state : getAllStates())
+ for (PlainChangesLog changesLog : changesLogs)
{
- ItemData item = state.getData();
- if (item.getParentIdentifier().equals(rootIdentifier) && item.isNode() == forNodes)
- {
- list.add(state);
- }
+ List<ItemState> subList = ((PlainChangesLogImpl)changesLog).getChildrenChanges(rootIdentifier, forNodes);
+ list.addAll(subList);
}
return list;
}
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2011-12-30 09:54:01 UTC (rev 5410)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2011-12-30 10:09:39 UTC (rev 5411)
@@ -817,11 +817,11 @@
return nodeChanges.size() > 0;
}
- List<ItemState> states = changesLog.getItemStates(item.getIdentifier());
- if (states.size() > 0)
+ ItemState state = changesLog.getLastState(item, false);
+
+ if (state != null)
{
- ItemState lastState = states.get(states.size() - 1);
- if (lastState.isAdded() || lastState.isDeleted())
+ if (state.isAdded() || state.isDeleted())
{
return false;
}
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLog.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLog.java 2011-12-30 09:54:01 UTC (rev 5410)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLog.java 2011-12-30 10:09:39 UTC (rev 5411)
@@ -22,17 +22,9 @@
import org.exoplatform.services.jcr.dataflow.ItemState;
import org.exoplatform.services.jcr.dataflow.PlainChangesLog;
import org.exoplatform.services.jcr.dataflow.PlainChangesLogImpl;
-import org.exoplatform.services.jcr.datamodel.IllegalPathException;
-import org.exoplatform.services.jcr.datamodel.ItemData;
-import org.exoplatform.services.jcr.datamodel.ItemType;
-import org.exoplatform.services.jcr.datamodel.NodeData;
import org.exoplatform.services.jcr.datamodel.QPath;
-import org.exoplatform.services.jcr.datamodel.QPathEntry;
import org.exoplatform.services.jcr.impl.Constants;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -47,40 +39,6 @@
{
/**
- * ItemState index storage. Used in getItemState() by id and path.
- */
- protected Map<Object, ItemState> index = new HashMap<Object, ItemState>();
-
- /**
- * ItemState index storage. Used to store last nodes states.
- */
- protected Map<String, Map<String, ItemState>> lastChildNodeStates = new HashMap<String, Map<String, ItemState>>();
-
- /**
- * ItemState index storage. Used to store last properties states.
- */
- protected Map<String, Map<String, ItemState>> lastChildPropertyStates =
- new HashMap<String, Map<String, ItemState>>();
-
- /**
- * Stores info for persisted child nodes by parent identifier.
- * <br>Index in array points to:
- * <br>0 - child nodes count.
- * <br>1 - last child order number
- */
- protected Map<String, int[]> childNodesInfo = new HashMap<String, int[]>();
-
- /**
- * Index in <code>childNodesInfo<code> value array to store child nodes count.
- */
- protected final int CHILD_NODES_COUNT_INDEX = 0;
-
- /**
- * Index in <code>childNodesInfo<code> value array to store last child order number.
- */
- protected final int CHILD_NODES_LAST_ORDER_NUMBER_INDEX = 1;
-
- /**
* Create empty ChangesLog.
*
* @param sessionId
@@ -107,149 +65,6 @@
}
/**
- * {@inheritDoc}
- */
- @Override
- public PlainChangesLog add(ItemState change)
- {
- super.add(change);
- addItem(change);
-
- return this;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public PlainChangesLog addAll(List<ItemState> changes)
- {
- super.addAll(changes);
- for (int i = 0, length = changes.size(); i < length; i++)
- {
- ItemState change = changes.get(i);
- addItem(change);
- }
- return this;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void clear()
- {
- super.clear();
- index.clear();
- lastChildNodeStates.clear();
- lastChildPropertyStates.clear();
- childNodesInfo.clear();
- }
-
- /**
- * Removes the item at the rootPath and all descendants from the log
- *
- * @param root
- * path
- */
- public void remove(QPath rootPath)
- {
- for (int i = items.size() - 1; i >= 0; i--)
- {
- ItemState item = items.get(i);
-
- QPath qPath = item.getData().getQPath();
- if (qPath.isDescendantOf(rootPath) || item.getAncestorToSave().isDescendantOf(rootPath)
- || item.getAncestorToSave().equals(rootPath) || qPath.equals(rootPath))
- {
- items.remove(i);
- index.remove(item.getData().getIdentifier());
- index.remove(item.getData().getQPath());
- index.remove(new ParentIDQPathBasedKey(item));
- index.remove(new IDStateBasedKey(item.getData().getIdentifier(), item.getState()));
- childNodesInfo.remove(item.getData().getIdentifier());
- lastChildNodeStates.remove(item.getData().getIdentifier());
- lastChildPropertyStates.remove(item.getData().getIdentifier());
-
- if (item.isNode() && item.isPersisted())
- {
- int childInfo[] = childNodesInfo.get(item.getData().getParentIdentifier());
- if (childInfo != null)
- {
- if (item.isDeleted())
- {
- ++childInfo[CHILD_NODES_COUNT_INDEX];
- }
- else if (item.isAdded())
- {
- --childInfo[CHILD_NODES_COUNT_INDEX];
- }
-
- childNodesInfo.put(item.getData().getParentIdentifier(), childInfo);
- }
- }
-
- if (item.getData().isNode())
- {
- Map<String, ItemState> children = lastChildNodeStates.get(item.getData().getParentIdentifier());
- if (children != null)
- {
- children.remove(item.getData().getIdentifier());
- }
- }
- else
- {
- Map<String, ItemState> children = lastChildPropertyStates.get(item.getData().getParentIdentifier());
- if (children != null)
- {
- children.remove(item.getData().getIdentifier());
- }
- }
- }
- }
- }
-
- /**
- * Returns list with changes of this node and its descendants. NOTE: this operation may cost more
- * than use of getDescendantsChanges() by path
- *
- * @param rootIdentifier
- */
- public List<ItemState> getDescendantsChanges(String rootIdentifier)
- {
- List<ItemState> changesList = new ArrayList<ItemState>();
-
- traverseChangesByIdentifier(rootIdentifier, changesList);
-
- return changesList;
- }
-
- private void traverseChangesByIdentifier(String identifier, List<ItemState> changesList)
- {
- ItemState item = getItemState(identifier);
- if (item != null)
- {
- changesList.add(item);
- Map<String, ItemState> children = lastChildPropertyStates.get(identifier);
- if (children != null)
- {
- // Add all the properties
- changesList.addAll(children.values());
- }
- children = lastChildNodeStates.get(identifier);
- if (children != null)
- {
- // Recursively call the method traverseChangesByIdentifier(String identifier, List<ItemState> changesList)
- // for each sub node
- for (ItemState child : children.values())
- {
- traverseChangesByIdentifier(child.getData().getIdentifier(), changesList);
- }
- }
- }
- }
-
- /**
* An example of use: transient changes of item added and removed in same session. These changes
* must not fire events in observation.
*
@@ -283,45 +98,6 @@
}
/**
- * @param rootPath
- * @return item state at the rootPath and its descendants
- */
- public List<ItemState> getDescendantsChanges(QPath rootPath)
- {
- List<ItemState> list = new ArrayList<ItemState>();
- for (int i = 0, length = items.size(); i < length; i++)
- {
- ItemState item = items.get(i);
- if (item.isDescendantOf(rootPath))
- {
- list.add(item);
- }
- }
- return list;
- }
-
- /**
- * Gets items by identifier.
- *
- * @param itemIdentifier
- * @return
- */
- public List<ItemState> getItemStates(String itemIdentifier)
- {
- List<ItemState> states = new ArrayList<ItemState>();
- List<ItemState> currentStates = getAllStates();
- for (int i = 0, length = currentStates.size(); i < length; i++)
- {
- ItemState state = currentStates.get(i);
- if (state.getData().getIdentifier().equals(itemIdentifier))
- {
- states.add(state);
- }
- }
- return states;
- }
-
- /**
* Creates new changes log with rootPath and its descendants of this one and removes those
* entries.
*
@@ -331,604 +107,15 @@
public PlainChangesLog pushLog(QPath rootPath)
{
// session instance is always present in SessionChangesLog
- PlainChangesLog cLog = new PlainChangesLogImpl(session);
-
+ PlainChangesLog cLog = new PlainChangesLogImpl(getDescendantsChanges(rootPath), session);
if (rootPath.equals(Constants.ROOT_PATH))
{
- cLog.addAll(items);
clear();
}
else
{
- cLog.addAll(getDescendantsChanges(rootPath));
remove(rootPath);
}
-
return cLog;
}
-
- /**
- * Get ItemState by parent and item name.
- *
- * @param parentData
- * parent
- * @param name
- * item name
- * @param itemType
- * item type
- * @return
- * @throws IllegalPathException
- */
- public ItemState getItemState(NodeData parentData, QPathEntry name, ItemType itemType) throws IllegalPathException
- {
- if (itemType != ItemType.UNKNOWN)
- {
- return index.get(new ParentIDQPathBasedKey(parentData.getIdentifier(), name, itemType));
- }
- else
- {
- ItemState state = index.get(new ParentIDQPathBasedKey(parentData.getIdentifier(), name, ItemType.NODE));
- if (state == null)
- {
- state = index.get(new ParentIDQPathBasedKey(parentData.getIdentifier(), name, ItemType.PROPERTY));
- }
- return state;
- }
- }
-
- /**
- * Get ItemState by identifier.
- *
- * NOTE: Uses index HashMap.
- *
- * @param itemIdentifier
- * @return
- */
- public ItemState getItemState(String itemIdentifier)
- {
- return index.get(itemIdentifier);
- }
-
- /**
- * Get ItemState by absolute path.
- *
- * NOTE: Uses index HashMap.
- *
- * @param itemPath
- * @return
- */
- public ItemState getItemState(QPath itemPath)
- {
- return index.get(itemPath);
- }
-
- /**
- * Get ItemState by identifier and state.
- *
- * NOTE: Uses index HashMap.
- *
- * @param itemIdentifier
- * @param sate
- * @return
- */
- public ItemState getItemState(String itemIdentifier, int state)
- {
- return index.get(new IDStateBasedKey(itemIdentifier, state));
- }
-
- /**
- * Collect changes of all item direct childs (only). Including the item itself.
- *
- * @param rootIdentifier
- * @return
- */
- public List<ItemState> getChildrenChanges(String rootIdentifier)
- {
- List<ItemState> list = new ArrayList<ItemState>();
- for (int i = 0; i < items.size(); i++)
- {
- ItemData item = items.get(i).getData();
- if (item.getParentIdentifier().equals(rootIdentifier) || item.getIdentifier().equals(rootIdentifier))
- {
- list.add(items.get(i));
- }
- }
- return list;
- }
-
- public int getChildNodesCount(String rootIdentifier)
- {
- int[] childInfo = childNodesInfo.get(rootIdentifier);
- return childInfo == null ? 0 : childInfo[CHILD_NODES_COUNT_INDEX];
- }
-
- public int getLastChildOrderNumber(String rootIdentifier)
- {
-
- int[] childInfo = childNodesInfo.get(rootIdentifier);
- return childInfo == null ? -1 : childInfo[CHILD_NODES_LAST_ORDER_NUMBER_INDEX];
- }
-
- /**
- * Collect last in ChangesLog order item child changes.
- *
- * @param rootData
- * - a item root of the changes scan
- * @param forNodes
- * retrieves nodes' ItemStates is true, or properties' otherwice
- * @return child items states
- */
- public Collection<ItemState> getLastChildrenStates(ItemData rootData, boolean forNodes)
- {
- Map<String, ItemState> children =
- forNodes ? lastChildNodeStates.get(rootData.getIdentifier()) : lastChildPropertyStates.get(rootData
- .getIdentifier());
-
- return children == null ? new ArrayList<ItemState>() : children.values();
- }
-
- /**
- * Collect last in ChangesLog order node (and direct childs) changes.
- *
- * @param rootData
- * - a item root of the changes scan
- * @param forNodes
- * retrieves nodes' ItemStates is true, or properties' otherwice
- * @return this item (!) and child items last modify states (i.e. updates, not adds or deletes)
- */
- public Collection<ItemState> getLastModifyStates(NodeData rootData)
- {
- HashMap<String, ItemState> changes = new HashMap<String, ItemState>();
-
- for (int i = 0; i < items.size(); i++)
- {
- ItemData item = items.get(i).getData();
- if (item.getIdentifier().equals(rootData.getIdentifier()))
- {
- // the node
- if (items.get(i).isAdded())
- {
- // if a new item - no modify changes can be
- return new ArrayList<ItemState>();
- }
-
- if (!items.get(i).isDeleted())
- {
- changes.put(item.getIdentifier(), items.get(i));
- }
- }
- else if (item.getParentIdentifier().equals(rootData.getIdentifier()))
- {
- // childs
- changes.put(item.getIdentifier(), items.get(i));
- }
- }
-
- return changes.values();
- }
-
- /**
- * EXPERIMENTAL. NOT USED. Find a rename operation pair of states by path of DELETED item. Search
- * from the end of log for DELETED state first. Then repeat the search for RENAMED state.
- *
- * @param deletedPath
- * - target node path
- * @return - the pair of states of item (or its ancestors), ItemState[] {DELETED, RENAMED} or null
- * if renaming is not detected.
- * @throws IllegalPathException
- */
- @Deprecated
- public ItemState[] findRenamed(QPath deletedPath) throws IllegalPathException
- {
- List<ItemState> allStates = getAllStates();
- // search from the end for DELETED state.
- // RENAMED comes after the DELETED in the log immediately (in back order)
- for (int i = allStates.size() - 1; i >= 0; i--)
- {
- ItemState state = allStates.get(i);
- if (state.getState() == ItemState.DELETED
- && !state.isPersisted()
- && (deletedPath.isDescendantOf(state.getData().getQPath()) || deletedPath
- .equals(state.getData().getQPath())))
- {
- // 1. if it's an item or ancestor of logged data
- try
- {
- ItemState delete = state;
- ItemState rename = allStates.get(i + 1);
-
- if (rename.getState() == ItemState.RENAMED && rename.isPersisted()
- && rename.getData().getIdentifier().equals(delete.getData().getIdentifier()))
- {
-
- // 2. search of most fresh state for searched rename state
- for (int bi = allStates.size() - 1; bi >= i + 2; bi--)
- {
- state = allStates.get(bi);
- if (state.getState() == ItemState.RENAMED && state.isPersisted()
- && state.getData().getIdentifier().equals(rename.getData().getIdentifier()))
- {
- // got much fresh
- rename = state;
- delete = allStates.get(i - 1); // try the fresh delete state
- if (delete.getData().getIdentifier().equals(rename.getData().getIdentifier()))
- {
- return new ItemState[]{delete, rename}; // 3. ok, got it
- }
- }
- }
-
- return new ItemState[]{delete, rename}; // 4. ok, there are no
- // more fresh we have
- // found before p.2
- } // else, it's not a rename, search deeper
- }
- catch (IndexOutOfBoundsException e)
- {
- // the pair not found
- return null;
- }
- }
- }
- return null;
- }
-
- /**
- * NOT USED. Search for an item state of item with given path (or its ancestor) and filter
- * parameters.
- *
- * @param rootPath
- * - item path (root path)
- * @param states
- * - filter only the given list states, or all if it's null
- * @param isPersisted
- * - filter only persisted/not persisted, or all if it's null
- * @param orAncestor
- * - may return the item ancestor if true and the ancestor was changed last, or only item
- * with given path if it's null
- * @return - filtered {@link ItemState}
- * @throws IllegalPathException
- */
- public ItemState findItemState(QPath rootPath, Boolean isPersisted, Boolean orAncestor, int... states)
- throws IllegalPathException
- {
- List<ItemState> allStates = getAllStates();
- // search from the end for state
- for (int i = allStates.size() - 1; i >= 0; i--)
- {
- ItemState istate = allStates.get(i);
- boolean byState = false;
- if (states != null)
- {
- for (int state : states)
- {
- if (istate.getState() == state)
- {
- byState = true;
- break;
- }
- }
- }
- else
- {
- byState = true;
- }
- if (byState
- && (isPersisted != null ? istate.isPersisted() == isPersisted : true)
- && ((orAncestor != null && orAncestor ? rootPath.isDescendantOf(istate.getData().getQPath()) : true) || rootPath
- .equals(istate.getData().getQPath())))
- {
- return istate;
- }
- }
- return null;
- }
-
- /**
- * Search for an item state of item with given id and filter parameters.
- *
- * @param id
- * - item id
- * @param states
- * - filter only the given list states (ORed), or all if it's null
- * @param isPersisted
- * - filter only persisted/not persisted, or all if it's null
- * @param orAncestor
- * - may return the item ancestor if true and the ancestor was changed last, or only item
- * with given path if it's null
- * @return - filtered {@link ItemState}
- * @throws IllegalPathException
- */
- public ItemState findItemState(String id, Boolean isPersisted, int... states) throws IllegalPathException
- {
- List<ItemState> allStates = getAllStates();
- // search from the end for state
- for (int i = allStates.size() - 1; i >= 0; i--)
- {
- ItemState istate = allStates.get(i);
- boolean byState = false;
- if (states != null)
- {
- for (int state : states)
- {
- if (istate.getState() == state)
- {
- byState = true;
- break;
- }
- }
- }
- else
- {
- byState = true;
- }
- if (byState && (isPersisted != null ? istate.isPersisted() == isPersisted : true)
- && istate.getData().getIdentifier().equals(id))
- {
- return istate;
- }
- }
- return null;
- }
-
- /**
- * Adds item to the changes log.
- *
- * @param item
- * the item
- */
- private void addItem(ItemState item)
- {
- index.put(item.getData().getIdentifier(), item);
- index.put(item.getData().getQPath(), item);
- index.put(new ParentIDQPathBasedKey(item), item);
- index.put(new IDStateBasedKey(item.getData().getIdentifier(), item.getState()), item);
-
- if (item.getData().isNode())
- {
- Map<String, ItemState> children = lastChildNodeStates.get(item.getData().getParentIdentifier());
- if (children == null)
- {
- children = new HashMap<String, ItemState>();
- lastChildNodeStates.put(item.getData().getParentIdentifier(), children);
- }
- children.put(item.getData().getIdentifier(), item);
- }
- else
- {
- Map<String, ItemState> children = lastChildPropertyStates.get(item.getData().getParentIdentifier());
- if (children == null)
- {
- children = new HashMap<String, ItemState>();
- lastChildPropertyStates.put(item.getData().getParentIdentifier(), children);
- }
- children.put(item.getData().getIdentifier(), item);
- }
-
- if (item.isNode() && item.isPersisted())
- {
- int[] childInfo = childNodesInfo.get(item.getData().getParentIdentifier());
- if (childInfo == null)
- {
- childInfo = new int[2];
- }
-
- if (item.isDeleted())
- {
- --childInfo[CHILD_NODES_COUNT_INDEX];
- }
- else if (item.isAdded())
- {
- ++childInfo[CHILD_NODES_COUNT_INDEX];
- childInfo[CHILD_NODES_LAST_ORDER_NUMBER_INDEX] = ((NodeData)item.getData()).getOrderNumber();
- }
- childNodesInfo.put(item.getData().getParentIdentifier(), childInfo);
- }
- }
-
- /**
- * This class is used as a key for index map.
- */
- private class IDStateBasedKey
- {
-
- /**
- * Item identifier.
- */
- private final String identifier;
-
- /**
- * Item state.
- */
- private final int state;
-
- /**
- * KeyUUIDState constructor.
- *
- * @param identifier
- * item identifier
- * @param state
- * item state
- */
- IDStateBasedKey(String identifier, int state)
- {
- this.identifier = identifier;
- this.state = state;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public int hashCode()
- {
- final int prime = 31;
- int result = 1;
- result = prime * result + identifier.hashCode();
- result = prime * result + state;
-
- return result;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- {
- return true;
- }
- if (obj == null)
- {
- return false;
- }
- if (getClass() != obj.getClass())
- {
- return false;
- }
- IDStateBasedKey other = (IDStateBasedKey)obj;
-
- if (identifier == null)
- {
- if (other.identifier != null)
- {
- return false;
- }
- }
- else if (!identifier.equals(other.identifier))
- {
- return false;
- }
- if (state != other.state)
- {
- return false;
- }
- return true;
- }
- }
-
- /**
- * This class is used as a key for index map.
- */
- private class ParentIDQPathBasedKey
- {
- /**
- * Item name.
- */
- private final QPathEntry name;
-
- /**
- * Parent identifier.
- */
- private final String parentIdentifier;
-
- private final ItemType itemType;
-
- /**
- * KeyParentUUIDQPath constructor.
- *
- * @param item
- * the item
- */
- ParentIDQPathBasedKey(ItemState item)
- {
- this.name = item.getData().getQPath().getEntries()[item.getData().getQPath().getEntries().length - 1];
- this.parentIdentifier = item.getData().getParentIdentifier();
- this.itemType = ItemType.getItemType(item.getData());
- }
-
- /**
- * KeyParentUUIDQPath constructor.
- *
- * @param parentIdentifier
- * the parent identifier
- * @param name
- * item name
- */
- ParentIDQPathBasedKey(String parentIdentifier, QPathEntry name, ItemType itemType)
- {
- this.name = name;
- this.parentIdentifier = parentIdentifier;
- this.itemType = itemType;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public int hashCode()
- {
- final int prime = 31;
- int result = 1;
- result = prime * result + name.getName().hashCode();
- result = prime * result + name.getNamespace().hashCode();
- result = prime * result + name.getIndex();
- result = prime * result + (parentIdentifier == null ? 0 : parentIdentifier.hashCode());
- result = prime * result + itemType.ordinal();
-
- return result;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- {
- return true;
- }
- if (obj == null)
- {
- return false;
- }
- if (getClass() != obj.getClass())
- {
- return false;
- }
- ParentIDQPathBasedKey other = (ParentIDQPathBasedKey)obj;
-
- if (name == null)
- {
- if (other.name != null)
- {
- return false;
- }
- }
- else if (!name.getName().equals(other.name.getName())
- || !name.getNamespace().equals(other.name.getNamespace()) || name.getIndex() != other.name.getIndex())
- {
- return false;
- }
-
- if (parentIdentifier == null)
- {
- if (other.parentIdentifier != null)
- {
- return false;
- }
- }
- else if (!parentIdentifier.equals(other.parentIdentifier))
- {
- return false;
- }
-
- if (itemType == null)
- {
- if (other.itemType != null)
- {
- return false;
- }
- }
- else if (!itemType.equals(other.itemType))
- {
- return false;
- }
-
- return true;
- }
- }
}
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/version/TestFrozenNodeInitializer.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/version/TestFrozenNodeInitializer.java 2011-12-30 09:54:01 UTC (rev 5410)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/version/TestFrozenNodeInitializer.java 2011-12-30 10:09:39 UTC (rev 5411)
@@ -30,6 +30,7 @@
import org.exoplatform.services.jcr.impl.Constants;
import org.exoplatform.services.jcr.impl.dataflow.TransientNodeData;
+import java.util.ArrayList;
import java.util.List;
import javax.jcr.version.VersionException;
@@ -52,9 +53,14 @@
versionable.accept(visitor);
// ask for nt:frozenNode
- List<ItemState> versionableChanges = versionableLog.getChildrenChanges(versionable.getIdentifier());
- List<ItemState> testChanges = changesLog.getChildrenChanges(frozenRoot.getIdentifier());
+ List<ItemState> versionableChanges = new ArrayList<ItemState>();
+ versionableChanges.addAll(versionableLog.getChildrenChanges(versionable.getIdentifier(), true));
+ versionableChanges.addAll(versionableLog.getChildrenChanges(versionable.getIdentifier(), false));
+ List<ItemState> testChanges = new ArrayList<ItemState>();
+ testChanges.addAll(changesLog.getChildrenChanges(frozenRoot.getIdentifier(), true));
+ testChanges.addAll(changesLog.getChildrenChanges(frozenRoot.getIdentifier(), false));
+
next : for (ItemState state : versionableChanges)
{
if (versionable.equals(state.getData()))
12 years, 4 months
- 1
- 0
exo-jcr SVN: r5410 - in jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules: jcr and 3 other directories.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-12-30 04:54:01 -0500 (Fri, 30 Dec 2011)
New Revision: 5410
Modified:
jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/faq/jcr-faq.xml
jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr-with-gtn/how-to-extend-my-gatein-instance.xml
jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/backup/backup-client.xml
jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/cluster-config.xml
jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/external-value-storages.xml
Log:
EXOJCR-803: removed StorageUpdateManager feature
Modified: jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/faq/jcr-faq.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/faq/jcr-faq.xml 2011-12-30 09:39:06 UTC (rev 5409)
+++ jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/faq/jcr-faq.xml 2011-12-30 09:54:01 UTC (rev 5410)
@@ -214,7 +214,6 @@
<property name="source-name" value="jdbcjcr" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws" />
<property name="swap-directory" value="target/temp/swap/ws" />
Modified: jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/backup/backup-client.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/backup/backup-client.xml 2011-12-30 09:39:06 UTC (rev 5409)
+++ jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/backup/backup-client.xml 2011-12-30 09:54:01 UTC (rev 5410)
@@ -686,9 +686,6 @@
{ "name" : "multi-db",
"value" : "false"
},
- { "name" : "update-storage",
- "value" : "false"
- },
{ "name" : "max-buffer-size",
"value" : "200k"
},
@@ -824,9 +821,6 @@
{ "name" : "multi-db",
"value" : "false"
},
- { "name" : "update-storage",
- "value" : "false"
- },
{ "name" : "max-buffer-size",
"value" : "200k"
},
@@ -1593,7 +1587,6 @@
<property name="source-name" value="jdbcjcr" />
<property name="dialect" value="pgsql" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="../temp/swap/backup" />
</properties>
@@ -1765,7 +1758,6 @@
<properties>
<property name="source-name" value="jdbcjcr" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="../temp/swap/production" />
</properties>
@@ -1811,7 +1803,6 @@
<properties>
<property name="source-name" value="jdbcjcr" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="../temp/swap/backup" />
</properties>
@@ -1849,7 +1840,6 @@
<properties>
<property name="source-name" value="jdbcjcr" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="../temp/swap/digital-assets" />
</properties>
Modified: jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/cluster-config.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/cluster-config.xml 2011-12-30 09:39:06 UTC (rev 5409)
+++ jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/cluster-config.xml 2011-12-30 09:54:01 UTC (rev 5410)
@@ -89,7 +89,6 @@
<property name="source-name" value="jdbcjcr" />
<property name="dialect" value="oracle" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="../temp/swap/production" />
</properties>
Modified: jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/external-value-storages.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/external-value-storages.xml 2011-12-30 09:39:06 UTC (rev 5409)
+++ jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/external-value-storages.xml 2011-12-30 09:54:01 UTC (rev 5410)
@@ -177,7 +177,6 @@
<property name="source-name" value="jdbcjcr"/>
<property name="dialect" value="oracle"/>
<property name="multi-db" value="false"/>
- <property name="update-storage" value="false"/>
<property name="max-buffer-size" value="200k"/>
<property name="swap-directory" value="target/temp/swap/ws"/>
</properties>
Modified: jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr-with-gtn/how-to-extend-my-gatein-instance.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr-with-gtn/how-to-extend-my-gatein-instance.xml 2011-12-30 09:39:06 UTC (rev 5409)
+++ jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr-with-gtn/how-to-extend-my-gatein-instance.xml 2011-12-30 09:54:01 UTC (rev 5410)
@@ -1457,7 +1457,6 @@
<property name="source-name" value="jdbcexo${container.name.suffix}" />
<property name="dialect" value="hsqldb" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="true" />
<property name="max-buffer-size" value="204800" />
<property name="swap-directory" value="../temp/swap/sample-ws${container.name.suffix}" />
</properties>
12 years, 4 months
- 1
- 0
exo-jcr SVN: r5409 - in jcr/branches/1.15.x: exo.jcr.component.core/src/main/resources/conf/portal and 11 other directories.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-12-30 04:39:06 -0500 (Fri, 30 Dec 2011)
New Revision: 5409
Removed:
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/update/
jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/sql-benchmark-configuration.xml
jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/sql-benchmark-jcr-config.xml
Modified:
jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/portal/exo-jcr-ispn-config.xml
jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-jcr-config.xml
jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml
jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/test-jcr-config.xml
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-config.xml
jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-jbc-config.xml
jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2.sql
jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2v8.sql
jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.derby.sql
jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.h2.sql
jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ingres.sql
jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mssql.sql
jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-myisam-utf8.sql
jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-myisam.sql
jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-utf8.sql
jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql.sql
jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora-analyze.sql
jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora.sql
jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.pgsql.sql
jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sql
jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sybase.sql
jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2.sql
jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2v8.sql
jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.derby.sql
jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.h2.sql
jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ingres.sql
jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mssql.sql
jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-myisam-utf8.sql
jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-myisam.sql
jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-utf8.sql
jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql.sql
jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora-analyze.sql
jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora.sql
jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.pgsql.sql
jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql
jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sybase.sql
jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/TestSingleDbJDBCConnection.java
jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/util/TesterConfigurationHelper.java
jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config-jbc.xml
jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-jbc.xml
jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc-jbc.xml
jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config-backup.xml
jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config-replication.xml
jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config.xml
jcr/branches/1.15.x/exo.jcr.component.ftp/src/test/resources/conf/standalone/test-jcr-config.xml
jcr/branches/1.15.x/exo.jcr.component.webdav/src/test/resources/conf/standalone/test-jcr-config.xml
Log:
EXOJCR-803: Removed StorageUpdateManager feature
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java 2011-12-30 09:39:06 UTC (rev 5409)
@@ -57,7 +57,6 @@
import org.exoplatform.services.jcr.impl.storage.jdbc.init.PgSQLDBInitializer;
import org.exoplatform.services.jcr.impl.storage.jdbc.init.StorageDBInitializer;
import org.exoplatform.services.jcr.impl.storage.jdbc.statistics.StatisticsJDBCStorageConnection;
-import org.exoplatform.services.jcr.impl.storage.jdbc.update.StorageUpdateManager;
import org.exoplatform.services.jcr.impl.storage.value.fs.FileValueStorage;
import org.exoplatform.services.jcr.impl.util.io.DirectoryHelper;
import org.exoplatform.services.jcr.impl.util.io.FileCleaner;
@@ -464,12 +463,6 @@
initDatabase();
- // enableStorageUpdate left unchanged since it is never used in StorageUpdateManager.checkVersion
- boolean enableStorageUpdate = false;
- this.storageVersion =
- StorageUpdateManager.checkVersion(dbSourceName, this.connFactory.getJdbcConnection(), multiDb,
- enableStorageUpdate);
-
LOG.info(getInfo());
}
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-config.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-config.xml 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-config.xml 2011-12-30 09:39:06 UTC (rev 5409)
@@ -31,7 +31,6 @@
<properties>
<property name="source-name" value="jdbcjcr" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="${exo.jcr.parent.dir:..}/temp/swap/production" />
</properties>
@@ -77,7 +76,6 @@
<properties>
<property name="source-name" value="jdbcjcr" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="${exo.jcr.parent.dir:..}/temp/swap/backup" />
</properties>
@@ -123,7 +121,6 @@
<properties>
<property name="source-name" value="jdbcjcr" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="${exo.jcr.parent.dir:..}/temp/swap/digital-assets" />
</properties>
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-jbc-config.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-jbc-config.xml 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-jbc-config.xml 2011-12-30 09:39:06 UTC (rev 5409)
@@ -31,7 +31,6 @@
<properties>
<property name="source-name" value="jdbcjcr" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="${exo.jcr.parent.dir:..}/temp/swap/production" />
</properties>
@@ -99,7 +98,6 @@
<properties>
<property name="source-name" value="jdbcjcr" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="${exo.jcr.parent.dir:..}/temp/swap/backup" />
</properties>
@@ -167,7 +165,6 @@
<properties>
<property name="source-name" value="jdbcjcr" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="${exo.jcr.parent.dir:..}/temp/swap/digital-assets" />
</properties>
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2.sql
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2.sql 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2.sql 2011-12-30 09:39:06 UTC (rev 5409)
@@ -1,7 +1,3 @@
-CREATE TABLE JCR_MCONTAINER(
- VERSION VARCHAR(96) NOT NULL,
- CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION)
-);
CREATE TABLE JCR_MITEM(
ID VARCHAR(96) NOT NULL,
PARENT_ID VARCHAR(96) NOT NULL,
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2v8.sql
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2v8.sql 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2v8.sql 2011-12-30 09:39:06 UTC (rev 5409)
@@ -1,7 +1,3 @@
-CREATE TABLE JCR_MCONTAINER(
- VERSION VARCHAR(96) NOT NULL,
- CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION)
-);
CREATE TABLE JCR_MITEM(
ID VARCHAR(96) NOT NULL,
PARENT_ID VARCHAR(96) NOT NULL,
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.derby.sql
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.derby.sql 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.derby.sql 2011-12-30 09:39:06 UTC (rev 5409)
@@ -1,7 +1,3 @@
-CREATE TABLE JCR_MCONTAINER(
- VERSION VARCHAR(96) NOT NULL,
- CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION)
-);
CREATE TABLE JCR_MITEM(
ID VARCHAR(96) NOT NULL,
PARENT_ID VARCHAR(96) NOT NULL,
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.h2.sql
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.h2.sql 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.h2.sql 2011-12-30 09:39:06 UTC (rev 5409)
@@ -1,7 +1,3 @@
-CREATE TABLE JCR_MCONTAINER(
- VERSION VARCHAR(96) NOT NULL,
- CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION)
-);
CREATE TABLE JCR_MITEM(
ID VARCHAR(96) NOT NULL,
PARENT_ID VARCHAR(96) NOT NULL,
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ingres.sql
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ingres.sql 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ingres.sql 2011-12-30 09:39:06 UTC (rev 5409)
@@ -1,7 +1,3 @@
-CREATE TABLE JCR_MCONTAINER(
- VERSION VARCHAR(96) NOT NULL,
- CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION)
-);
CREATE TABLE JCR_MITEM(
ID VARCHAR(96) NOT NULL,
PARENT_ID VARCHAR(96) NOT NULL,
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mssql.sql
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mssql.sql 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mssql.sql 2011-12-30 09:39:06 UTC (rev 5409)
@@ -1,7 +1,3 @@
-CREATE TABLE JCR_MCONTAINER(
- VERSION VARCHAR(96) NOT NULL,
- CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION)
-);
CREATE TABLE JCR_MITEM(
ID VARCHAR(96) NOT NULL,
PARENT_ID VARCHAR(96) NOT NULL,
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-myisam-utf8.sql
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-myisam-utf8.sql 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-myisam-utf8.sql 2011-12-30 09:39:06 UTC (rev 5409)
@@ -1,7 +1,3 @@
-CREATE TABLE JCR_MCONTAINER(
- VERSION VARCHAR(56) NOT NULL,
- CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION)
-) ENGINE=MyISAM;
CREATE TABLE JCR_MITEM(
ID VARCHAR(56) NOT NULL,
PARENT_ID VARCHAR(56) NOT NULL,
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-myisam.sql
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-myisam.sql 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-myisam.sql 2011-12-30 09:39:06 UTC (rev 5409)
@@ -1,7 +1,3 @@
-CREATE TABLE JCR_MCONTAINER(
- VERSION VARCHAR(96) NOT NULL,
- CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION)
-) ENGINE=MyISAM;
CREATE TABLE JCR_MITEM(
ID VARCHAR(96) NOT NULL,
PARENT_ID VARCHAR(96) NOT NULL,
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-utf8.sql
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-utf8.sql 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-utf8.sql 2011-12-30 09:39:06 UTC (rev 5409)
@@ -1,7 +1,3 @@
-CREATE TABLE JCR_MCONTAINER(
- VERSION VARCHAR(56) NOT NULL,
- CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION)
-) ENGINE=InnoDB;
CREATE TABLE JCR_MITEM(
ID VARCHAR(56) NOT NULL,
PARENT_ID VARCHAR(56) NOT NULL,
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql.sql
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql.sql 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql.sql 2011-12-30 09:39:06 UTC (rev 5409)
@@ -1,7 +1,3 @@
-CREATE TABLE JCR_MCONTAINER(
- VERSION VARCHAR(96) NOT NULL,
- CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION)
-) ENGINE=InnoDB;
CREATE TABLE JCR_MITEM(
ID VARCHAR(96) NOT NULL,
PARENT_ID VARCHAR(96) NOT NULL,
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora-analyze.sql
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora-analyze.sql 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora-analyze.sql 2011-12-30 09:39:06 UTC (rev 5409)
@@ -1,9 +1,4 @@
/*$DELIMITER:/ */
-CREATE TABLE JCR_MCONTAINER(
- VERSION VARCHAR2(96) NOT NULL,
- CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION)
-)
-/
CREATE TABLE JCR_MITEM(
ID VARCHAR2(96) NOT NULL,
PARENT_ID VARCHAR2(96) NOT NULL,
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora.sql
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora.sql 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora.sql 2011-12-30 09:39:06 UTC (rev 5409)
@@ -1,9 +1,4 @@
/*$DELIMITER:/ */
-CREATE TABLE JCR_MCONTAINER(
- VERSION VARCHAR2(96) NOT NULL,
- CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION)
-)
-/
CREATE TABLE JCR_MITEM(
ID VARCHAR2(96) NOT NULL,
PARENT_ID VARCHAR2(96) NOT NULL,
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.pgsql.sql
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.pgsql.sql 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.pgsql.sql 2011-12-30 09:39:06 UTC (rev 5409)
@@ -1,7 +1,3 @@
-CREATE TABLE JCR_MCONTAINER(
- VERSION VARCHAR(96) NOT NULL,
- CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION)
-);
CREATE TABLE JCR_MITEM(
ID VARCHAR(96) NOT NULL,
PARENT_ID VARCHAR(96) NOT NULL,
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sql
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sql 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sql 2011-12-30 09:39:06 UTC (rev 5409)
@@ -1,7 +1,3 @@
-CREATE TABLE JCR_MCONTAINER(
- VERSION VARCHAR(96) NOT NULL,
- CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION)
-);
CREATE TABLE JCR_MITEM(
ID VARCHAR(96) NOT NULL,
PARENT_ID VARCHAR(96) NOT NULL,
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sybase.sql
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sybase.sql 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sybase.sql 2011-12-30 09:39:06 UTC (rev 5409)
@@ -1,7 +1,3 @@
-CREATE TABLE JCR_MCONTAINER(
- VERSION VARCHAR(96) NOT NULL,
- CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION)
-);
CREATE TABLE JCR_MITEM(
ID VARCHAR(96) NOT NULL,
PARENT_ID VARCHAR(96) NOT NULL,
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2.sql
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2.sql 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2.sql 2011-12-30 09:39:06 UTC (rev 5409)
@@ -1,7 +1,3 @@
-CREATE TABLE JCR_SCONTAINER(
- VERSION VARCHAR(96) NOT NULL,
- CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION)
-);
CREATE TABLE JCR_SITEM(
ID VARCHAR(96) NOT NULL,
PARENT_ID VARCHAR(96) NOT NULL,
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2v8.sql
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2v8.sql 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2v8.sql 2011-12-30 09:39:06 UTC (rev 5409)
@@ -1,7 +1,3 @@
-CREATE TABLE JCR_SCONTAINER(
- VERSION VARCHAR(96) NOT NULL,
- CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION)
-);
CREATE TABLE JCR_SITEM(
ID VARCHAR(96) NOT NULL,
PARENT_ID VARCHAR(96) NOT NULL,
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.derby.sql
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.derby.sql 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.derby.sql 2011-12-30 09:39:06 UTC (rev 5409)
@@ -1,7 +1,3 @@
-CREATE TABLE JCR_SCONTAINER(
- VERSION VARCHAR(96) NOT NULL,
- CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION)
-);
CREATE TABLE JCR_SITEM(
ID VARCHAR(96) NOT NULL,
PARENT_ID VARCHAR(96) NOT NULL,
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.h2.sql
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.h2.sql 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.h2.sql 2011-12-30 09:39:06 UTC (rev 5409)
@@ -1,7 +1,3 @@
-CREATE TABLE JCR_SCONTAINER(
- VERSION VARCHAR(96) NOT NULL,
- CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION)
-);
CREATE TABLE JCR_SITEM(
ID VARCHAR(96) NOT NULL,
PARENT_ID VARCHAR(96) NOT NULL,
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ingres.sql
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ingres.sql 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ingres.sql 2011-12-30 09:39:06 UTC (rev 5409)
@@ -1,7 +1,3 @@
-CREATE TABLE JCR_SCONTAINER(
- VERSION VARCHAR(96) NOT NULL,
- CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION)
-);
CREATE TABLE JCR_SITEM(
ID VARCHAR(96) NOT NULL,
PARENT_ID VARCHAR(96) NOT NULL,
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mssql.sql
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mssql.sql 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mssql.sql 2011-12-30 09:39:06 UTC (rev 5409)
@@ -1,7 +1,3 @@
-CREATE TABLE JCR_SCONTAINER(
- VERSION VARCHAR(96) NOT NULL,
- CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION)
-);
CREATE TABLE JCR_SITEM(
ID VARCHAR(96) NOT NULL,
PARENT_ID VARCHAR(96) NOT NULL,
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-myisam-utf8.sql
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-myisam-utf8.sql 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-myisam-utf8.sql 2011-12-30 09:39:06 UTC (rev 5409)
@@ -1,7 +1,3 @@
-CREATE TABLE JCR_SCONTAINER(
- VERSION VARCHAR(56) NOT NULL,
- CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION)
-) ENGINE=MyISAM;
CREATE TABLE JCR_SITEM(
ID VARCHAR(56) NOT NULL,
PARENT_ID VARCHAR(56) NOT NULL,
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-myisam.sql
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-myisam.sql 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-myisam.sql 2011-12-30 09:39:06 UTC (rev 5409)
@@ -1,7 +1,3 @@
-CREATE TABLE JCR_SCONTAINER(
- VERSION VARCHAR(96) NOT NULL,
- CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION)
-) ENGINE=MyISAM;
CREATE TABLE JCR_SITEM(
ID VARCHAR(96) NOT NULL,
PARENT_ID VARCHAR(96) NOT NULL,
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-utf8.sql
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-utf8.sql 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-utf8.sql 2011-12-30 09:39:06 UTC (rev 5409)
@@ -1,7 +1,3 @@
-CREATE TABLE JCR_SCONTAINER(
- VERSION VARCHAR(56) NOT NULL,
- CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION)
-) ENGINE=InnoDB;
CREATE TABLE JCR_SITEM(
ID VARCHAR(56) NOT NULL,
PARENT_ID VARCHAR(56) NOT NULL,
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql.sql
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql.sql 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql.sql 2011-12-30 09:39:06 UTC (rev 5409)
@@ -1,7 +1,3 @@
-CREATE TABLE JCR_SCONTAINER(
- VERSION VARCHAR(96) NOT NULL,
- CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION)
-) ENGINE=InnoDB;
CREATE TABLE JCR_SITEM(
ID VARCHAR(96) NOT NULL,
PARENT_ID VARCHAR(96) NOT NULL,
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora-analyze.sql
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora-analyze.sql 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora-analyze.sql 2011-12-30 09:39:06 UTC (rev 5409)
@@ -1,9 +1,4 @@
/*$DELIMITER:/ */
-CREATE TABLE JCR_SCONTAINER(
- VERSION VARCHAR2(96) NOT NULL,
- CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION)
-)
-/
CREATE TABLE JCR_SITEM(
ID VARCHAR2(96) NOT NULL,
PARENT_ID VARCHAR2(96) NOT NULL,
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora.sql
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora.sql 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora.sql 2011-12-30 09:39:06 UTC (rev 5409)
@@ -1,9 +1,4 @@
/*$DELIMITER:/ */
-CREATE TABLE JCR_SCONTAINER(
- VERSION VARCHAR2(96) NOT NULL,
- CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION)
-)
-/
CREATE TABLE JCR_SITEM(
ID VARCHAR2(96) NOT NULL,
PARENT_ID VARCHAR2(96) NOT NULL,
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.pgsql.sql
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.pgsql.sql 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.pgsql.sql 2011-12-30 09:39:06 UTC (rev 5409)
@@ -1,7 +1,3 @@
-CREATE TABLE JCR_SCONTAINER(
- VERSION VARCHAR(96) NOT NULL,
- CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION)
-);
CREATE TABLE JCR_SITEM(
ID VARCHAR(96) NOT NULL,
PARENT_ID VARCHAR(96) NOT NULL,
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql 2011-12-30 09:39:06 UTC (rev 5409)
@@ -1,7 +1,3 @@
-CREATE TABLE JCR_SCONTAINER(
- VERSION VARCHAR(96) NOT NULL,
- CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION)
-);
CREATE TABLE JCR_SITEM(
ID VARCHAR(96) NOT NULL,
PARENT_ID VARCHAR(96) NOT NULL,
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sybase.sql
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sybase.sql 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sybase.sql 2011-12-30 09:39:06 UTC (rev 5409)
@@ -1,7 +1,3 @@
-CREATE TABLE JCR_SCONTAINER(
- VERSION VARCHAR(96) NOT NULL,
- CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION)
-);
CREATE TABLE JCR_SITEM(
ID VARCHAR(96) NOT NULL,
PARENT_ID VARCHAR(96) NOT NULL,
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/TestSingleDbJDBCConnection.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/TestSingleDbJDBCConnection.java 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/TestSingleDbJDBCConnection.java 2011-12-30 09:39:06 UTC (rev 5409)
@@ -79,7 +79,6 @@
st.executeUpdate("drop table JCR_SREF");
st.executeUpdate("drop table JCR_SVALUE");
st.executeUpdate("drop table JCR_SITEM");
- st.executeUpdate("drop table JCR_SCONTAINER");
st.close();
}
catch (SQLException se)
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/util/TesterConfigurationHelper.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/util/TesterConfigurationHelper.java 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/util/TesterConfigurationHelper.java 2011-12-30 09:39:06 UTC (rev 5409)
@@ -301,7 +301,6 @@
params.add(new SimpleParameterEntry("source-name", dsName));
params.add(new SimpleParameterEntry("db-type", "generic"));
params.add(new SimpleParameterEntry("multi-db", isMultiDb ? "true" : "false"));
- params.add(new SimpleParameterEntry("update-storage", "true"));
params.add(new SimpleParameterEntry("max-buffer-size", "204800"));
if (dbDialect != null)
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config-jbc.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config-jbc.xml 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config-jbc.xml 2011-12-30 09:39:06 UTC (rev 5409)
@@ -24,7 +24,6 @@
<properties>
<property name="source-name" value="jdbcjcr" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws" />
<property name="dialect" value="auto" />
@@ -95,7 +94,6 @@
<properties>
<property name="source-name" value="jdbcjcr1" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1" />
<property name="dialect" value="auto" />
@@ -171,7 +169,6 @@
<properties>
<property name="source-name" value="jdbcjcr2" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws2" />
<property name="dialect" value="auto" />
@@ -248,7 +245,6 @@
<properties>
<property name="source-name" value="jdbcjcr3" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws3" />
<property name="dialect" value="auto" />
@@ -350,7 +346,6 @@
<properties>
<property name="source-name" value="jdbcjcrdb2" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/wsdb2" />
<property name="dialect" value="auto" />
@@ -420,7 +415,6 @@
<properties>
<property name="source-name" value="jdbcjcr1db2" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1db2" />
<property name="dialect" value="auto" />
@@ -501,7 +495,6 @@
<properties>
<property name="source-name" value="jdbcjcrtck" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/wstck" />
<property name="dialect" value="auto" />
@@ -584,7 +577,6 @@
<properties>
<property name="source-name" value="jdbcjcr1tck" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1tck" />
<property name="dialect" value="auto" />
@@ -665,7 +657,6 @@
<properties>
<property name="source-name" value="jdbcjcr2tck" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws2tck" />
<property name="dialect" value="auto" />
Deleted: jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/sql-benchmark-configuration.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/sql-benchmark-configuration.xml 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/sql-benchmark-configuration.xml 2011-12-30 09:39:06 UTC (rev 5409)
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- 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.
-
--->
-<configuration
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"
- xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
- <component>
- <key>org.exoplatform.services.log.LogConfigurationInitializer</key>
- <type>org.exoplatform.services.log.LogConfigurationInitializer</type>
- <init-params>
- <value-param>
- <name>logger</name>
- <value>org.exoplatform.services.log.impl.BufferedLog4JLogger</value>
- </value-param>
- <value-param>
- <name>configurator</name>
- <value>org.exoplatform.services.log.impl.Log4JConfigurator</value>
- </value-param>
- <properties-param>
- <name>properties</name>
- <description>Log4J properties</description>
- <property name="log4j.rootLogger" value="INFO, stdout, file"/>
-
- <property name="log4j.appender.stdout" value="org.apache.log4j.ConsoleAppender"/>
- <property name="log4j.appender.stdout.threshold" value="DEBUG"/>
-
- <property name="log4j.appender.stdout.layout" value="org.apache.log4j.PatternLayout"/>
- <property name="log4j.appender.stdout.layout.ConversionPattern"
- value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n"/>
-
- <property name="log4j.appender.file" value="org.apache.log4j.FileAppender"/>
- <property name="log4j.appender.file.File" value="target/jcr.log"/>
-
- <property name="log4j.appender.file.layout" value="org.apache.log4j.PatternLayout"/>
- <property name="log4j.appender.file.layout.ConversionPattern"
- value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n"/>
-
- <property name="log4j.category.jcr.FileCleaner" value="DEBUG"/>
-
- <!-- property name="log4j.category.jcr.JDBCStorageConnection" value="DEBUG"/>
- <property name="log4j.category.jcr.NodeImpl" value="DEBUG"/ -->
-
- <!-- property name="log4j.category.jcr.WorkspaceStorageCacheImpl" value="DEBUG"/ -->
- <!-- property name="log4j.category.database.DBSchemaCreator" value="DEBUG"/ -->
- <!-- property name="log4j.category.jcr.WorkspaceDataReplicator" value="DEBUG"/ -->
-
- <!-- property name="log4j.category.jcr.WorkspaceStorageCacheImpl" value="DEBUG"/ -->
- <!-- property name="log4j.category.jcr.WorkspacePersistentDataManager" value="DEBUG"/ -->
- <!-- property name="log4j.category.jcr.SessionDataManager" value="DEBUG"/ -->
- </properties-param>
-
- <!-- value-param>
- <name>logger</name>
- <value>org.exoplatform.services.log.impl.BufferedSimpleLog</value>
- </value-param>
- <value-param>
- <name>configurator</name>
- <value>org.exoplatform.services.log.impl.SimpleLogConfigurator</value>
- </value-param>
- <properties-param>
- <name>properties</name>
- <description>SimpleLog properties</description>
- <property name="org.apache.commons.logging.simplelog.defaultlog" value="debug"/>
- <property name="org.apache.commons.logging.simplelog.showdatetime" value="true"/>
- </properties-param -->
-
- <!-- value-param>
- <name>logger</name>
- <value>org.exoplatform.services.log.impl.BufferedJdk14Logger</value>
- </value-param>
- <value-param>
- <name>configurator</name>
- <value>org.exoplatform.services.log.impl.Jdk14Configurator</value>
- </value-param>
- <properties-param>
- <name>properties</name>
- <description>jdk1.4 Logger properties</description>
- <property name="handlers" value="java.util.logging.ConsoleHandler"/>
- <property name=".level" value="FINE"/>
- <property name="java.util.logging.ConsoleHandler.level" value="FINE"/>
- </properties-param -->
-
- </init-params>
- </component>
-
- <component>
- <key>org.exoplatform.services.jcr.RepositoryService</key>
- <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type>
- <component-plugins>
- <component-plugin>
- <name>add.namespaces</name>
- <set-method>addPlugin</set-method>
- <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type>
- <init-params>
- <properties-param>
- <name>namespaces</name>
- <property name="test" value="http://www.apache.org/jackrabbit/test"/>
- <property name="exojcrtest" value="http://www.exoplatform.org/jcr/test/1.0"/>
- <property name="rma" value="http://www.rma.com/jcr/"/>
- <property name="metadata" value="http://www.exoplatform.com/jcr/metadata/1.1/"/>
- <property name="dc" value="http://purl.org/dc/elements/1.1/"/>
- </properties-param>
- </init-params>
- </component-plugin>
- </component-plugins>
- </component>
-
- <component>
- <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key>
- <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type>
- <init-params>
- <value-param>
- <name>conf-path</name>
- <description>JCR configuration file</description>
- <value>jar:/conf/standalone/sql-benchmark-jcr-config.xml</value>
- </value-param>
- </init-params>
- </component>
-
- <component>
- <type>org.exoplatform.services.organization.impl.mock.DummyOrganizationService</type>
- </component>
-
- <component>
- <key>org.exoplatform.services.security.Authenticator</key>
- <type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type>
- </component>
-
- <component>
- <type>org.exoplatform.services.jcr.impl.ext.action.SessionActionCatalog</type>
- </component>
-
- <component>
- <key>org.exoplatform.services.transaction.TransactionService</key>
- <type>org.exoplatform.services.transaction.impl.jotm.TransactionServiceJotmImpl</type>
- <init-params>
- <value-param>
- <name>timeout</name>
- <value>5</value>
- </value-param>
- </init-params>
- </component>
-
- <external-component-plugins>
- <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component>
- <component-plugin>
- <name>bind.datasource</name>
- <set-method>addPlugin</set-method>
- <type>org.exoplatform.services.naming.BindReferencePlugin</type>
- <init-params>
- <value-param>
- <name>bind-name</name>
- <value>jdbcexo</value>
- </value-param>
- <value-param>
- <name>class-name</name>
- <value>javax.sql.DataSource</value>
- </value-param>
- <value-param>
- <name>factory</name>
- <value>org.apache.commons.dbcp.BasicDataSourceFactory</value>
- </value-param>
- <properties-param>
- <name>ref-addresses</name>
- <description>ref-addresses</description>
- <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
- <property name="url" value="jdbc:mysql://localhost:3306/exodb?relaxAutoCommit=true&autoReconnect=true&useUnicode=true&characterEncoding=utf8"/>
- <property name="username" value="root"/>
- <property name="password" value="root"/>
- <property name="maxActive" value="50" />
- <property name="maxIdle" value="5" />
- <property name="initialSize" value="50" />
- </properties-param>
- </init-params>
- </component-plugin>
- </external-component-plugins>
-
- <remove-configuration>org.exoplatform.services.scheduler.JobSchedulerService</remove-configuration>
-</configuration>
Deleted: jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/sql-benchmark-jcr-config.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/sql-benchmark-jcr-config.xml 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/sql-benchmark-jcr-config.xml 2011-12-30 09:39:06 UTC (rev 5409)
@@ -1,474 +0,0 @@
-<repository-service default-repository="repository">
- <repositories>
- <repository name="repository1" system-workspace="system"
- default-workspace="collaboration">
- <security-domain>exo-domain</security-domain>
- <access-control>optional</access-control>
- <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy>
- <workspaces>
- <workspace name="system">
- <container
- class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
- <properties>
- <property name="source-name" value="jdbcexo" />
- <property name="dialect" value="MySQL" />
- <!--<property name="dialect" value="hsqldb"/>-->
- <property name="multi-db" value="false" />
- <property name="max-buffer-size" value="200k" />
- <property name="swap-directory" value="../temp/swap/system" />
- </properties>
- <value-storages>
- <value-storage id="system"
- class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
- <properties>
- <property name="path" value="../temp/values/system" />
- </properties>
- <filters>
- <filter property-type="Binary" />
- </filters>
- </value-storage>
- </value-storages>
- </container>
- <initializer
- class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
- <properties>
- <property name="root-nodetype" value="nt:unstructured" />
- <property name="root-permissions"
- value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" />
- </properties>
- </initializer>
- <cache enabled="true"
- class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl">
- <properties>
- <property name="max-size" value="20k" />
- <property name="live-time" value="1h" />
- </properties>
- </cache>
-<!-- <query-handler-->
-<!-- class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">-->
-<!-- <properties>-->
-<!-- <property name="index-dir" value="../temp/jcrlucenedb/system" />-->
-<!-- <property name="support-highlighting" value="true" />-->
-<!-- <property name="excerptprovider-class"-->
-<!-- value="org.exoplatform.services.jcr.impl.core.query.lucene.DefaultHTMLExcerpt" />-->
-<!-- </properties>-->
-<!-- </query-handler>-->
- <lock-manager>
- <time-out>15m</time-out>
- <persister
- class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister">
- <properties>
- <property name="path" value="../temp/lock/system" />
- </properties>
- </persister>
- </lock-manager>
- </workspace>
- <workspace name="collaboration">
- <container
- class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
- <properties>
- <property name="source-name" value="jdbcexo" />
- <property name="dialect" value="MySQL" />
- <!--<property name="dialect" value="hsqldb"/> -->
- <property name="multi-db" value="false" />
- <property name="max-buffer-size" value="200k" />
- <property name="swap-directory" value="../temp/swap/collaboration" />
- </properties>
- <value-storages>
- <value-storage id="collaboration"
- class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
- <properties>
- <property name="path" value="../temp/values/collaboration" />
- </properties>
- <filters>
- <filter property-type="Binary" />
- </filters>
- </value-storage>
- </value-storages>
- </container>
- <initializer
- class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
- <properties>
- <property name="root-nodetype" value="nt:unstructured" />
- <property name="root-permissions"
- value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" />
- </properties>
- </initializer>
- <cache enabled="true"
- class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl">
- <properties>
- <property name="max-size" value="20k" />
- <property name="live-time" value="1h" />
- </properties>
- </cache>
-<!-- <query-handler-->
-<!-- class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">-->
-<!-- <properties>-->
-<!-- <property name="index-dir" value="../temp/jcrlucenedb/collaboration" />-->
-<!-- <property name="support-highlighting" value="true" />-->
-<!-- <property name="excerptprovider-class"-->
-<!-- value="org.exoplatform.services.jcr.impl.core.query.lucene.DefaultHTMLExcerpt" />-->
-<!-- </properties>-->
-<!-- </query-handler>-->
- <lock-manager>
- <time-out>15m</time-out>
- <persister
- class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister">
- <properties>
- <property name="path" value="../temp/lock/collaboration" />
- </properties>
- </persister>
- </lock-manager>
- </workspace>
- <workspace name="backup">
- <container
- class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
- <properties>
- <property name="source-name" value="jdbcexo" />
- <property name="dialect" value="MySQL" />
- <!--<property name="dialect" value="hsqldb"/> -->
- <property name="multi-db" value="false" />
- <property name="max-buffer-size" value="200k" />
- <property name="swap-directory" value="../temp/swap/backup" />
- </properties>
- <value-storages>
- <value-storage id="backup"
- class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
- <properties>
- <property name="path" value="../temp/values/backup" />
- </properties>
- <filters>
- <filter property-type="Binary" />
- </filters>
- </value-storage>
- </value-storages>
- </container>
- <initializer
- class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
- <properties>
- <property name="root-nodetype" value="nt:unstructured" />
- <property name="root-permissions"
- value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" />
- </properties>
- </initializer>
- <cache enabled="true"
- class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl">
- <properties>
- <property name="max-size" value="5k" />
- <property name="live-time" value="20m" />
- </properties>
- </cache>
-<!-- <query-handler-->
-<!-- class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">-->
-<!-- <properties>-->
-<!-- <property name="index-dir" value="../temp/jcrlucenedb/backup" />-->
-<!-- <property name="support-highlighting" value="true" />-->
-<!-- <property name="excerptprovider-class"-->
-<!-- value="org.exoplatform.services.jcr.impl.core.query.lucene.DefaultHTMLExcerpt" />-->
-<!-- </properties>-->
-<!-- </query-handler>-->
- <lock-manager>
- <time-out>15m</time-out>
- <persister
- class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister">
- <properties>
- <property name="path" value="../temp/lock/backup" />
- </properties>
- </persister>
- </lock-manager>
- </workspace>
- <workspace name="gadgets">
- <!-- for system storage -->
- <container
- class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
- <properties>
- <property name="source-name" value="jdbcexo" />
- <property name="dialect" value="MySQL" />
- <!--<property name="dialect" value="hsqldb"/> -->
- <property name="multi-db" value="false" />
- <property name="update-storage" value="true" />
- <property name="max-buffer-size" value="200k" />
- <property name="swap-directory" value="../temp/swap/gadgets" />
- </properties>
- <value-storages>
- <value-storage id="gadgets"
- class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
- <properties>
- <property name="path" value="../temp/values/gadgets" />
- </properties>
- <filters>
- <filter property-type="Binary" />
- </filters>
- </value-storage>
- </value-storages>
- </container>
- <initializer
- class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
- <properties>
- <property name="root-nodetype" value="nt:unstructured" />
- <property name="root-permissions"
- value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" />
- </properties>
- </initializer>
- <cache enabled="true"
- class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl">
- <properties>
- <property name="max-size" value="20k" />
- <property name="live-time" value="1h" />
- </properties>
- </cache>
-<!-- <query-handler-->
-<!-- class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">-->
-<!-- <properties>-->
-<!-- <property name="index-dir" value="../temp/jcrlucenedb/gadgets" />-->
-<!-- </properties>-->
-<!-- </query-handler>-->
- <lock-manager>
- <time-out>15m</time-out><!-- 15min -->
- <persister
- class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister">
- <properties>
- <property name="path" value="../temp/lock/gadgets" />
- </properties>
- </persister>
- </lock-manager>
- </workspace>
- </workspaces>
- </repository>
- <repository name="repository2" system-workspace="system"
- default-workspace="collaboration">
- <security-domain>exo-domain</security-domain>
- <access-control>optional</access-control>
- <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy>
- <workspaces>
- <workspace name="system">
- <container
- class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
- <properties>
- <property name="source-name" value="jdbcexo" />
- <property name="dialect" value="MySQL" />
- <!--<property name="dialect" value="hsqldb"/>-->
- <property name="multi-db" value="false" />
- <property name="max-buffer-size" value="200k" />
- <property name="swap-directory" value="../temp/swap/system" />
- </properties>
- <value-storages>
- <value-storage id="system"
- class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
- <properties>
- <property name="path" value="../temp/values/system" />
- </properties>
- <filters>
- <filter property-type="Binary" />
- </filters>
- </value-storage>
- </value-storages>
- </container>
- <initializer
- class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
- <properties>
- <property name="root-nodetype" value="nt:unstructured" />
- <property name="root-permissions"
- value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" />
- </properties>
- </initializer>
- <cache enabled="true"
- class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl">
- <properties>
- <property name="max-size" value="20k" />
- <property name="live-time" value="1h" />
- </properties>
- </cache>
-<!-- <query-handler-->
-<!-- class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">-->
-<!-- <properties>-->
-<!-- <property name="index-dir" value="../temp/jcrlucenedb/system2" />-->
-<!-- <property name="support-highlighting" value="true" />-->
-<!-- <property name="excerptprovider-class"-->
-<!-- value="org.exoplatform.services.jcr.impl.core.query.lucene.DefaultHTMLExcerpt" />-->
-<!-- </properties>-->
-<!-- </query-handler>-->
- <lock-manager>
- <time-out>15m</time-out>
- <persister
- class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister">
- <properties>
- <property name="path" value="../temp/lock/system" />
- </properties>
- </persister>
- </lock-manager>
- </workspace>
- <workspace name="collaboration">
- <container
- class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
- <properties>
- <property name="source-name" value="jdbcexo" />
- <property name="dialect" value="MySQL" />
- <!--<property name="dialect" value="hsqldb"/> -->
- <property name="multi-db" value="false" />
- <property name="max-buffer-size" value="200k" />
- <property name="swap-directory" value="../temp/swap/collaboration" />
- </properties>
- <value-storages>
- <value-storage id="collaboration"
- class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
- <properties>
- <property name="path" value="../temp/values/collaboration" />
- </properties>
- <filters>
- <filter property-type="Binary" />
- </filters>
- </value-storage>
- </value-storages>
- </container>
- <initializer
- class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
- <properties>
- <property name="root-nodetype" value="nt:unstructured" />
- <property name="root-permissions"
- value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" />
- </properties>
- </initializer>
- <cache enabled="true"
- class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl">
- <properties>
- <property name="max-size" value="20k" />
- <property name="live-time" value="1h" />
- </properties>
- </cache>
-<!-- <query-handler-->
-<!-- class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">-->
-<!-- <properties>-->
-<!-- <property name="index-dir" value="../temp/jcrlucenedb/collaboration2" />-->
-<!-- <property name="support-highlighting" value="true" />-->
-<!-- <property name="excerptprovider-class"-->
-<!-- value="org.exoplatform.services.jcr.impl.core.query.lucene.DefaultHTMLExcerpt" />-->
-<!-- </properties>-->
-<!-- </query-handler>-->
- <lock-manager>
- <time-out>15m</time-out>
- <persister
- class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister">
- <properties>
- <property name="path" value="../temp/lock/collaboration" />
- </properties>
- </persister>
- </lock-manager>
- </workspace>
- <workspace name="backup">
- <container
- class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
- <properties>
- <property name="source-name" value="jdbcexo" />
- <property name="dialect" value="MySQL" />
- <!--<property name="dialect" value="hsqldb"/> -->
- <property name="multi-db" value="false" />
- <property name="max-buffer-size" value="200k" />
- <property name="swap-directory" value="../temp/swap/backup" />
- </properties>
- <value-storages>
- <value-storage id="backup"
- class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
- <properties>
- <property name="path" value="../temp/values/backup" />
- </properties>
- <filters>
- <filter property-type="Binary" />
- </filters>
- </value-storage>
- </value-storages>
- </container>
- <initializer
- class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
- <properties>
- <property name="root-nodetype" value="nt:unstructured" />
- <property name="root-permissions"
- value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" />
- </properties>
- </initializer>
- <cache enabled="true"
- class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl">
- <properties>
- <property name="max-size" value="5k" />
- <property name="live-time" value="20m" />
- </properties>
- </cache>
-<!-- <query-handler-->
-<!-- class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">-->
-<!-- <properties>-->
-<!-- <property name="index-dir" value="../temp/jcrlucenedb/backup2" />-->
-<!-- <property name="support-highlighting" value="true" />-->
-<!-- <property name="excerptprovider-class"-->
-<!-- value="org.exoplatform.services.jcr.impl.core.query.lucene.DefaultHTMLExcerpt" />-->
-<!-- </properties>-->
-<!-- </query-handler>-->
- <lock-manager>
- <time-out>15m</time-out>
- <persister
- class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister">
- <properties>
- <property name="path" value="../temp/lock/backup" />
- </properties>
- </persister>
- </lock-manager>
- </workspace>
- <workspace name="gadgets">
- <!-- for system storage -->
- <container
- class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
- <properties>
- <property name="source-name" value="jdbcexo" />
- <property name="dialect" value="MySQL" />
- <!--<property name="dialect" value="hsqldb"/> -->
- <property name="multi-db" value="false" />
- <property name="update-storage" value="true" />
- <property name="max-buffer-size" value="200k" />
- <property name="swap-directory" value="../temp/swap/gadgets" />
- </properties>
- <value-storages>
- <value-storage id="gadgets"
- class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
- <properties>
- <property name="path" value="../temp/values/gadgets" />
- </properties>
- <filters>
- <filter property-type="Binary" />
- </filters>
- </value-storage>
- </value-storages>
- </container>
- <initializer
- class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
- <properties>
- <property name="root-nodetype" value="nt:unstructured" />
- <property name="root-permissions"
- value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" />
- </properties>
- </initializer>
- <cache enabled="true"
- class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl">
- <properties>
- <property name="max-size" value="20k" />
- <property name="live-time" value="1h" />
- </properties>
- </cache>
-<!-- <query-handler-->
-<!-- class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">-->
-<!-- <properties>-->
-<!-- <property name="index-dir" value="../temp/jcrlucenedb/gadgets2" />-->
-<!-- </properties>-->
-<!-- </query-handler>-->
- <lock-manager>
- <time-out>15m</time-out><!-- 15min -->
- <persister
- class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister">
- <properties>
- <property name="path" value="../temp/lock/gadgets" />
- </properties>
- </persister>
- </lock-manager>
- </workspace>
- </workspaces>
- </repository>
- </repositories>
-</repository-service>
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-jbc.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-jbc.xml 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-jbc.xml 2011-12-30 09:39:06 UTC (rev 5409)
@@ -35,7 +35,6 @@
<property name="source-name" value="jdbcjcr" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws" />
</properties>
@@ -96,7 +95,6 @@
<property name="source-name" value="jdbcjcr1" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1" />
</properties>
@@ -155,7 +153,6 @@
<property name="source-name" value="jdbcjcr2" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws2" />
</properties>
@@ -215,7 +212,6 @@
<property name="source-name" value="jdbcjcr3" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws3" />
</properties>
@@ -305,7 +301,6 @@
<property name="source-name" value="jdbcjcrdb2" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/wsdb2" />
</properties>
@@ -364,7 +359,6 @@
<property name="source-name" value="jdbcjcr1db2" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1db2" />
</properties>
@@ -432,7 +426,6 @@
<property name="source-name" value="jdbcjcrtck" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/wstck" />
</properties>
@@ -500,7 +493,6 @@
<property name="source-name" value="jdbcjcr1tck" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1tck" />
</properties>
@@ -567,7 +559,6 @@
<property name="source-name" value="jdbcjcr2tck" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws2tck" />
</properties>
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc-jbc.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc-jbc.xml 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc-jbc.xml 2011-12-30 09:39:06 UTC (rev 5409)
@@ -35,7 +35,6 @@
<property name="source-name" value="jdbcjcr" />
<property name="dialect" value="auto" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws" />
</properties>
@@ -97,7 +96,6 @@
<property name="source-name" value="jdbcjcr" />
<property name="dialect" value="auto" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1" />
</properties>
@@ -157,7 +155,6 @@
<property name="source-name" value="jdbcjcr" />
<property name="dialect" value="auto" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws2" />
</properties>
@@ -218,7 +215,6 @@
<property name="source-name" value="jdbcjcr" />
<property name="dialect" value="auto" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws3" />
</properties>
@@ -312,7 +308,6 @@
<property name="source-name" value="jdbcjcrdb2" />
<property name="dialect" value="auto" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/wsdb2" />
</properties>
@@ -371,7 +366,6 @@
<property name="source-name" value="jdbcjcrdb2" />
<property name="dialect" value="auto" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1db2" />
</properties>
@@ -439,7 +433,6 @@
<property name="source-name" value="jdbcjcrtck" />
<property name="dialect" value="auto" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/wstck" />
</properties>
@@ -507,7 +500,6 @@
<property name="source-name" value="jdbcjcrtck" />
<property name="dialect" value="auto" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1tck" />
</properties>
@@ -574,7 +566,6 @@
<property name="source-name" value="jdbcjcrtck" />
<property name="dialect" value="auto" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws2tck" />
</properties>
Modified: jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/portal/exo-jcr-ispn-config.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/portal/exo-jcr-ispn-config.xml 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/portal/exo-jcr-ispn-config.xml 2011-12-30 09:39:06 UTC (rev 5409)
@@ -31,7 +31,6 @@
<properties>
<property name="source-name" value="jdbcjcr" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="${exo.jcr.parent.dir:..}/temp/swap/production" />
</properties>
@@ -92,7 +91,6 @@
<properties>
<property name="source-name" value="jdbcjcr" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="${exo.jcr.parent.dir:..}/temp/swap/backup" />
</properties>
@@ -153,7 +151,6 @@
<properties>
<property name="source-name" value="jdbcjcr" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="${exo.jcr.parent.dir:..}/temp/swap/digital-assets" />
</properties>
Modified: jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-jcr-config.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-jcr-config.xml 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-jcr-config.xml 2011-12-30 09:39:06 UTC (rev 5409)
@@ -25,7 +25,6 @@
<property name="source-name" value="jdbcjcr" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws" />
</properties>
@@ -94,7 +93,6 @@
<property name="source-name" value="jdbcjcr1" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1" />
</properties>
@@ -161,7 +159,6 @@
<property name="source-name" value="jdbcjcr2" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws2" />
</properties>
@@ -229,7 +226,6 @@
<property name="source-name" value="jdbcjcr3" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws3" />
</properties>
@@ -329,7 +325,6 @@
<property name="source-name" value="jdbcjcrdb2" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/wsdb2" />
</properties>
@@ -395,7 +390,6 @@
<property name="source-name" value="jdbcjcr1db2" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1db2" />
</properties>
@@ -470,7 +464,6 @@
<property name="source-name" value="jdbcjcrtck" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/wstck" />
</properties>
@@ -545,7 +538,6 @@
<property name="source-name" value="jdbcjcr1tck" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1tck" />
</properties>
@@ -619,7 +611,6 @@
<property name="source-name" value="jdbcjcr2tck" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws2tck" />
</properties>
Modified: jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml 2011-12-30 09:39:06 UTC (rev 5409)
@@ -35,7 +35,6 @@
<property name="source-name" value="jdbcjcr" />
<property name="dialect" value="auto" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws" />
</properties>
@@ -92,7 +91,6 @@
<property name="source-name" value="jdbcjcr" />
<property name="dialect" value="auto" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1" />
</properties>
@@ -146,7 +144,6 @@
<property name="source-name" value="jdbcjcr" />
<property name="dialect" value="auto" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws2" />
</properties>
@@ -201,7 +198,6 @@
<property name="source-name" value="jdbcjcr" />
<property name="dialect" value="auto" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws3" />
</properties>
@@ -287,7 +283,6 @@
<property name="source-name" value="jdbcjcrdb2" />
<property name="dialect" value="auto" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/wsdb2" />
</properties>
@@ -341,7 +336,6 @@
<property name="source-name" value="jdbcjcrdb2" />
<property name="dialect" value="auto" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1db2" />
</properties>
@@ -406,7 +400,6 @@
<property name="source-name" value="jdbcjcrtck" />
<property name="dialect" value="auto" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/wstck" />
</properties>
@@ -467,7 +460,6 @@
<property name="source-name" value="jdbcjcrtck" />
<property name="dialect" value="auto" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1tck" />
</properties>
@@ -527,7 +519,6 @@
<property name="source-name" value="jdbcjcrtck" />
<property name="dialect" value="auto" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws2tck" />
</properties>
Modified: jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/test-jcr-config.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/test-jcr-config.xml 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/test-jcr-config.xml 2011-12-30 09:39:06 UTC (rev 5409)
@@ -35,7 +35,6 @@
<property name="source-name" value="jdbcjcr" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws" />
</properties>
@@ -92,7 +91,6 @@
<property name="source-name" value="jdbcjcr1" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1" />
</properties>
@@ -146,7 +144,6 @@
<property name="source-name" value="jdbcjcr2" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws2" />
</properties>
@@ -201,7 +198,6 @@
<property name="source-name" value="jdbcjcr3" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws3" />
</properties>
@@ -287,7 +283,6 @@
<property name="source-name" value="jdbcjcrdb2" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/wsdb2" />
</properties>
@@ -341,7 +336,6 @@
<property name="source-name" value="jdbcjcr1db2" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1db2" />
</properties>
@@ -406,7 +400,6 @@
<property name="source-name" value="jdbcjcrtck" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/wstck" />
</properties>
@@ -467,7 +460,6 @@
<property name="source-name" value="jdbcjcr1tck" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1tck" />
</properties>
@@ -527,7 +519,6 @@
<property name="source-name" value="jdbcjcr2tck" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws2tck" />
</properties>
Modified: jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config-backup.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config-backup.xml 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config-backup.xml 2011-12-30 09:39:06 UTC (rev 5409)
@@ -30,7 +30,6 @@
<properties>
<property name="source-name" value="jdbcjcr6" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/db3ws" />
</properties>
@@ -71,7 +70,6 @@
<properties>
<property name="source-name" value="jdbcjcr6" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/db3ws1" />
</properties>
@@ -119,7 +117,6 @@
<properties>
<property name="source-name" value="jdbcjcr7" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/db4ws" />
</properties>
@@ -160,7 +157,6 @@
<properties>
<property name="source-name" value="jdbcjcr8" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/db4ws1" />
</properties>
Modified: jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config-replication.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config-replication.xml 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config-replication.xml 2011-12-30 09:39:06 UTC (rev 5409)
@@ -35,7 +35,6 @@
<property name="source-name" value="jdbcjcr2" />
<property name="dialect" value="generic" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="true" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp1/swap/ws" />
</properties>
@@ -77,7 +76,6 @@
<property name="source-name" value="jdbcjcr1" />
<property name="dialect" value="generic" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="true" />
<property name="max-buffer-size" value="204800" />
<property name="swap-directory" value="target/temp2/swap/ws" />
</properties>
@@ -128,7 +126,6 @@
<property name="source-name" value="jdbcjcr1" />
<property name="dialect" value="generic" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="true" />
<property name="max-buffer-size" value="204800" />
<property name="swap-directory" value="target/temp1/swap/ws" />
</properties>
@@ -170,7 +167,6 @@
<property name="source-name" value="jdbcjcr1" />
<property name="dialect" value="generic" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="true" />
<property name="max-buffer-size" value="204800" />
<property name="swap-directory" value="target/temp1/swap/ws" />
</properties>
Modified: jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config.xml 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config.xml 2011-12-30 09:39:06 UTC (rev 5409)
@@ -32,7 +32,6 @@
<property name="source-name" value="jdbcjcr" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="true" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws" />
</properties>
@@ -65,7 +64,6 @@
<property name="source-name" value="jdbcjcr1" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="true" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1" />
</properties>
@@ -88,7 +86,6 @@
<property name="source-name" value="jdbcjcr2" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="true" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws2" />
</properties>
@@ -111,7 +108,6 @@
<property name="source-name" value="jdbcjcr3" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="true" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws3" />
</properties>
@@ -134,7 +130,6 @@
<property name="source-name" value="jdbcjcr4" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="true" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws4" />
</properties>
@@ -157,7 +152,6 @@
<property name="source-name" value="jdbcjcr5" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="true" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws5" />
</properties>
@@ -188,7 +182,6 @@
<property name="source-name" value="jdbcjcr19" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="true" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/db2_ws" />
</properties>
@@ -218,7 +211,6 @@
<properties>
<property name="source-name" value="jdbcjcr6" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/db3ws" />
</properties>
@@ -259,7 +251,6 @@
<properties>
<property name="source-name" value="jdbcjcr6" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/db3ws1" />
</properties>
@@ -307,7 +298,6 @@
<properties>
<property name="source-name" value="jdbcjcr7" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/db4ws" />
</properties>
@@ -348,7 +338,6 @@
<properties>
<property name="source-name" value="jdbcjcr8" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/db4ws1" />
</properties>
@@ -398,7 +387,6 @@
<property name="source-name" value="jdbcjcr21" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="true" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/db5_ws" />
</properties>
@@ -422,7 +410,6 @@
<property name="source-name" value="jdbcjcr23" />
<property name="dialect" value="auto" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="true" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/db5_ws1" />
</properties>
@@ -453,7 +440,6 @@
<property name="source-name" value="jdbcjcr24" />
<property name="dialect" value="auto" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="true" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/db6_ws" />
</properties>
@@ -476,7 +462,6 @@
<property name="source-name" value="jdbcjcr25" />
<property name="dialect" value="auto" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="true" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/db6_ws1" />
</properties>
@@ -499,7 +484,6 @@
<property name="source-name" value="jdbcjcr26" />
<property name="dialect" value="auto" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="true" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/db6_ws2" />
</properties>
@@ -531,7 +515,6 @@
<property name="source-name" value="jdbcjcr_to_repository_restore_singel_db" />
<property name="dialect" value="auto" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="true" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/db7_ws" />
</properties>
@@ -564,7 +547,6 @@
<property name="source-name" value="jdbcjcr_to_repository_restore_singel_db" />
<property name="dialect" value="auto" />
<property name="multi-db" value="false" />
- <property name="update-storage" value="true" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/db7_ws1" />
</properties>
Modified: jcr/branches/1.15.x/exo.jcr.component.ftp/src/test/resources/conf/standalone/test-jcr-config.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.ftp/src/test/resources/conf/standalone/test-jcr-config.xml 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.ftp/src/test/resources/conf/standalone/test-jcr-config.xml 2011-12-30 09:39:06 UTC (rev 5409)
@@ -31,10 +31,7 @@
<properties>
<property name="sourceName" value="jdbcjcr" />
<property name="dialect" value="generic" />
- <!-- example of direct jdbc connection usage (without JNDI), see docs for details -->
-
<property name="multi-db" value="false" />
- <property name="update-storage" value="true" />
<property name="max-buffer-size" value="204800" />
<property name="swap-directory" value="target/temp/swap/ws" />
</properties>
@@ -59,15 +56,14 @@
</persister>
</lock-manager>
</workspace>
+
<workspace name="ws2" auto-init-root-nodetype="nt:unstructured">
<!-- for system storage -->
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
<property name="sourceName" value="jdbcjcr" />
<property name="dialect" value="generic" />
- <!-- example of direct jdbc connection usage (without JNDI), see docs for details -->
<property name="multi-db" value="false" />
- <property name="update-storage" value="true" />
<property name="max-buffer-size" value="204800" />
<property name="swap-directory" value="target/temp/swap/ws2" />
</properties>
Modified: jcr/branches/1.15.x/exo.jcr.component.webdav/src/test/resources/conf/standalone/test-jcr-config.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.webdav/src/test/resources/conf/standalone/test-jcr-config.xml 2011-12-30 08:52:49 UTC (rev 5408)
+++ jcr/branches/1.15.x/exo.jcr.component.webdav/src/test/resources/conf/standalone/test-jcr-config.xml 2011-12-30 09:39:06 UTC (rev 5409)
@@ -32,7 +32,6 @@
<property name="source-name" value="jdbcjcr" />
<property name="dialect" value="hsqldb" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws" />
</properties>
@@ -83,7 +82,6 @@
<property name="source-name" value="jdbcjcr1" />
<property name="dialect" value="hsqldb" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws1" />
</properties>
@@ -117,7 +115,6 @@
<property name="source-name" value="jdbcjcr2" />
<property name="dialect" value="hsqldb" />
<property name="multi-db" value="true" />
- <property name="update-storage" value="false" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws2" />
</properties>
12 years, 4 months
- 1
- 0
exo-jcr SVN: r5408 - jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-12-30 03:52:49 -0500 (Fri, 30 Dec 2011)
New Revision: 5408
Modified:
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleaner.java
Log:
EXOJCR-1595: cleanup DBCleaner
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleaner.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleaner.java 2011-12-30 08:50:25 UTC (rev 5407)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleaner.java 2011-12-30 08:52:49 UTC (rev 5408)
@@ -196,15 +196,7 @@
LOG.debug("Execute script: \n[" + sql + "]");
}
- if ((sql.startsWith("ALTER INDEX") || sql.startsWith("DROP INDEX"))
- && (sql.contains("JCR_IDX_SITEM_N_ORDER_NUM") || sql.contains("JCR_IDX_MITEM_N_ORDER_NUM")))
- {
- executeQueryAndCatchException(st, sql);
- }
- else
- {
- executeQuery(st, sql);
- }
+ executeQuery(st, sql);
}
}
}
@@ -238,19 +230,4 @@
}
});
}
-
- protected void executeQueryAndCatchException(final Statement statement, final String sql)
- {
- try
- {
- executeQuery(statement, sql);
- }
- catch (SQLException e)
- {
- if (LOG.isDebugEnabled())
- {
- LOG.debug("Can not execute query : '" + sql + "'.", e);
- }
- }
- }
}
12 years, 4 months
- 1
- 0
exo-jcr SVN: r5407 - jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-12-30 03:50:25 -0500 (Fri, 30 Dec 2011)
New Revision: 5407
Removed:
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/LocalWorkspaceStorageDataManagerProxy.java
Log:
EXOJCR-1595: remove unused classes and packages
Deleted: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/LocalWorkspaceStorageDataManagerProxy.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/LocalWorkspaceStorageDataManagerProxy.java 2011-12-30 08:49:30 UTC (rev 5406)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/LocalWorkspaceStorageDataManagerProxy.java 2011-12-30 08:50:25 UTC (rev 5407)
@@ -1,324 +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.impl.dataflow.session;
-
-import org.exoplatform.services.jcr.access.AccessControlList;
-import org.exoplatform.services.jcr.dataflow.ChangesLogIterator;
-import org.exoplatform.services.jcr.dataflow.CompositeChangesLog;
-import org.exoplatform.services.jcr.dataflow.ItemState;
-import org.exoplatform.services.jcr.dataflow.ItemStateChangesLog;
-import org.exoplatform.services.jcr.dataflow.PlainChangesLog;
-import org.exoplatform.services.jcr.dataflow.PlainChangesLogImpl;
-import org.exoplatform.services.jcr.dataflow.TransactionChangesLog;
-import org.exoplatform.services.jcr.datamodel.ItemData;
-import org.exoplatform.services.jcr.datamodel.ItemType;
-import org.exoplatform.services.jcr.datamodel.NodeData;
-import org.exoplatform.services.jcr.datamodel.PropertyData;
-import org.exoplatform.services.jcr.datamodel.QPathEntry;
-import org.exoplatform.services.jcr.datamodel.ValueData;
-import org.exoplatform.services.jcr.impl.core.itemfilters.QPathEntryFilter;
-import org.exoplatform.services.jcr.impl.core.value.ValueFactoryImpl;
-import org.exoplatform.services.jcr.impl.dataflow.AbstractPersistedValueData;
-import org.exoplatform.services.jcr.impl.dataflow.TransientItemData;
-import org.exoplatform.services.jcr.impl.dataflow.TransientNodeData;
-import org.exoplatform.services.jcr.impl.dataflow.TransientPropertyData;
-import org.exoplatform.services.jcr.impl.dataflow.persistent.LocalWorkspaceDataManagerStub;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.jcr.InvalidItemStateException;
-import javax.jcr.RepositoryException;
-
-/**
- * Created by The eXo Platform SAS.<br/> proxy of local workspace storage. "local" means that
- * backended workspace data manager is located on the same JVM as session layer.
- * WorkspaceStorageDataManagerProxy can be pluggable in a case of other storage-session transport
- * applied (for ex RMI) this implementation is responsible for making copy of persisted (shared)
- * data objects for session data manager and pass it on top (to TransactionableDM) (and vice versa?)
- *
- * @author Gennady Azarenkov
- * @version $Id: LocalWorkspaceStorageDataManagerProxy.java 11907 2008-03-13 15:36:21Z ksm $
- */
-
-public class LocalWorkspaceStorageDataManagerProxy implements WorkspaceStorageDataManagerProxy
-{
-
- protected final LocalWorkspaceDataManagerStub storageDataManager;
-
- protected final ValueFactoryImpl valueFactory;
-
- public LocalWorkspaceStorageDataManagerProxy(LocalWorkspaceDataManagerStub storageDataManager,
- ValueFactoryImpl valueFactory)
- {
- this.storageDataManager = storageDataManager;
- this.valueFactory = valueFactory;
- }
-
- /**
- * {@inheritDoc}
- */
- public void save(ItemStateChangesLog changesLog) throws InvalidItemStateException, UnsupportedOperationException,
- RepositoryException
- {
-
- ChangesLogIterator logIterator = ((CompositeChangesLog)changesLog).getLogIterator();
- TransactionChangesLog newLog = new TransactionChangesLog();
-
- while (logIterator.hasNextLog())
- {
- List<ItemState> states = new ArrayList<ItemState>(changesLog.getSize());
- PlainChangesLog changes = logIterator.nextLog();
- for (ItemState change : changes.getAllStates())
- {
- states.add(new ItemState(copyItemData(change.getData()), change.getState(), change.isEventFire(), change
- .getAncestorToSave(), change.isInternallyCreated(), change.isPersisted(), change.getOldPath()));
- }
-
- newLog.addLog(PlainChangesLogImpl.createCopy(states, changes));
- }
-
- storageDataManager.save(newLog);
- }
-
- /**
- * {@inheritDoc}
- */
- public ItemData getItemData(NodeData parentData, QPathEntry name) throws RepositoryException
- {
- return getItemData(parentData, name, ItemType.UNKNOWN);
- }
-
- /**
- * {@inheritDoc}
- */
- public ItemData getItemData(NodeData parentData, QPathEntry name, ItemType itemType) throws RepositoryException
- {
- return copyItemData(storageDataManager.getItemData(parentData, name, itemType));
- }
-
- /**
- * {@inheritDoc}
- */
- public ItemData getItemData(NodeData parentData, QPathEntry name, ItemType itemType, boolean createNullItemData)
- throws RepositoryException
- {
- return copyItemData(storageDataManager.getItemData(parentData, name, itemType, createNullItemData));
- }
-
- /**
- * {@inheritDoc}
- */
- public ItemData getItemData(String identifier) throws RepositoryException
- {
- return copyItemData(storageDataManager.getItemData(identifier));
- }
-
- /**
- * {@inheritDoc}
- */
- public List<NodeData> getChildNodesData(NodeData parent) throws RepositoryException
- {
- return copyNodes(storageDataManager.getChildNodesData(parent));
- }
-
- /**
- * {@inheritDoc}
- */
- public List<NodeData> getChildNodesData(NodeData parent, List<QPathEntryFilter> patternFilters)
- throws RepositoryException
- {
- return copyNodes(storageDataManager.getChildNodesData(parent, patternFilters));
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean getChildNodesDataByPage(NodeData parent, int fromOrderNum, int toOrderNum, List<NodeData> childs)
- throws RepositoryException
- {
- return storageDataManager.getChildNodesDataByPage(parent, fromOrderNum, toOrderNum, copyNodes(childs));
- }
-
- /**
- * {@inheritDoc}
- */
- public int getLastOrderNumber(final NodeData parent) throws RepositoryException
- {
- return storageDataManager.getLastOrderNumber(parent);
- }
-
- /**
- * {@inheritDoc}
- */
- public int getChildNodesCount(final NodeData parent) throws RepositoryException
- {
- return storageDataManager.getChildNodesCount(parent);
- }
-
- /**
- * {@inheritDoc}
- */
- public List<PropertyData> getChildPropertiesData(NodeData parent) throws RepositoryException
- {
- return copyProperties(storageDataManager.getChildPropertiesData(parent));
- }
-
- /**
- * {@inheritDoc}
- */
- public List<PropertyData> getChildPropertiesData(NodeData parent, List<QPathEntryFilter> itemDataFilters)
- throws RepositoryException
- {
- return copyProperties(storageDataManager.getChildPropertiesData(parent, itemDataFilters));
- }
-
- /**
- * {@inheritDoc}
- */
- public List<PropertyData> listChildPropertiesData(NodeData parent) throws RepositoryException
- {
- return copyPropertiesWithoutValues(storageDataManager.listChildPropertiesData(parent));
- }
-
- /**
- * {@inheritDoc}
- */
- public List<PropertyData> getReferencesData(String identifier, boolean skipVersionStorage)
- throws RepositoryException
- {
- return copyProperties(storageDataManager.getReferencesData(identifier, skipVersionStorage));
- }
-
- /**
- * {@inheritDoc}
- */
- public Calendar getCurrentTime()
- {
- return storageDataManager.getCurrentTime();
- }
-
- private TransientItemData copyItemData(final ItemData item) throws RepositoryException
- {
-
- if (item == null)
- {
- return null;
- }
-
- // make a copy
- if (item.isNode())
- {
-
- final NodeData node = (NodeData)item;
-
- // the node ACL can't be are null as ACL manager does care about this
- final AccessControlList acl = node.getACL();
- if (acl == null)
- {
- throw new RepositoryException("Node ACL is null. " + node.getQPath().getAsString() + " "
- + node.getIdentifier());
- }
-
- return new TransientNodeData(node.getQPath(), node.getIdentifier(), node.getPersistedVersion(), node
- .getPrimaryTypeName(), node.getMixinTypeNames(), node.getOrderNumber(), node.getParentIdentifier(), acl);
- }
-
- // else - property
- final PropertyData prop = (PropertyData)item;
-
- // make a copy, value may be null for deleting items
- List<ValueData> values = null;
- if (prop.getValues() != null)
- {
- values = new ArrayList<ValueData>();
- for (ValueData val : prop.getValues())
- {
- values.add(((AbstractPersistedValueData)val).createTransientCopy());
- }
- }
-
- TransientPropertyData newData =
- new TransientPropertyData(prop.getQPath(), prop.getIdentifier(), prop.getPersistedVersion(), prop.getType(),
- prop.getParentIdentifier(), prop.isMultiValued(), values);
-
- return newData;
- }
-
- private TransientItemData copyPropertyDataWithoutValue(PropertyData property) throws RepositoryException
- {
-
- if (property == null)
- {
- return null;
- }
-
- // make a copy
- TransientPropertyData newData =
- new TransientPropertyData(property.getQPath(), property.getIdentifier(), property.getPersistedVersion(),
- property.getType(), property.getParentIdentifier(), property.isMultiValued(), new ArrayList<ValueData>());
-
- return newData;
- }
-
- private List<NodeData> copyNodes(final List<NodeData> childNodes) throws RepositoryException
- {
- final List<NodeData> copyOfChildsNodes = new LinkedList<NodeData>();
- synchronized (childNodes)
- {
- for (NodeData nodeData : childNodes)
- {
- copyOfChildsNodes.add((NodeData)copyItemData(nodeData));
- }
- }
-
- return copyOfChildsNodes;
- }
-
- private List<PropertyData> copyProperties(final List<PropertyData> traverseProperties) throws RepositoryException
- {
- final List<PropertyData> copyOfChildsProperties = new LinkedList<PropertyData>();
- synchronized (traverseProperties)
- {
- for (PropertyData nodeProperty : traverseProperties)
- {
- copyOfChildsProperties.add((PropertyData)copyItemData(nodeProperty));
- }
- }
-
- return copyOfChildsProperties;
- }
-
- private List<PropertyData> copyPropertiesWithoutValues(final List<PropertyData> traverseProperties)
- throws RepositoryException
- {
- final List<PropertyData> copyOfChildsProperties = new LinkedList<PropertyData>();
- synchronized (traverseProperties)
- {
- for (PropertyData nodeProperty : traverseProperties)
- {
- copyOfChildsProperties.add((PropertyData)copyPropertyDataWithoutValue(nodeProperty));
- }
- }
-
- return copyOfChildsProperties;
- }
-}
12 years, 4 months
- 1
- 0
exo-jcr SVN: r5406 - in jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl: dataflow and 2 other directories.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-12-30 03:49:30 -0500 (Fri, 30 Dec 2011)
New Revision: 5406
Removed:
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/shared/
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/mock/
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/fs/
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/jdbc/
Log:
EXOJCR-1595: remove unused classes and packages
12 years, 4 months
- 1
- 0
exo-jcr SVN: r5405 - jcr/branches/1.15.x.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-12-30 03:32:10 -0500 (Fri, 30 Dec 2011)
New Revision: 5405
Modified:
jcr/branches/1.15.x/pom.xml
Log:
changed deps to branch
Modified: jcr/branches/1.15.x/pom.xml
===================================================================
--- jcr/branches/1.15.x/pom.xml 2011-12-30 07:35:16 UTC (rev 5404)
+++ jcr/branches/1.15.x/pom.xml 2011-12-30 08:32:10 UTC (rev 5405)
@@ -42,9 +42,9 @@
<properties>
<exo.product.name>exo-jcr</exo.product.name>
<exo.product.specification>1.14</exo.product.specification>
- <org.exoplatform.kernel.version>2.3.6-GA-SNAPSHOT</org.exoplatform.kernel.version>
- <org.exoplatform.core.version>2.4.6-GA-SNAPSHOT</org.exoplatform.core.version>
- <org.exoplatform.ws.version>2.2.6-GA-SNAPSHOT</org.exoplatform.ws.version>
+ <org.exoplatform.kernel.version>2.4.0-Beta01-SNAPSHOT</org.exoplatform.kernel.version>
+ <org.exoplatform.core.version>2.5.0-Beta01-SNAPSHOT</org.exoplatform.core.version>
+ <org.exoplatform.ws.version>2.3.0-Beta01-SNAPSHOT</org.exoplatform.ws.version>
<org.exoplatform.doc-style.version>2-SNAPSHOT</org.exoplatform.doc-style.version>
</properties>
12 years, 4 months
- 1
- 0
exo-jcr SVN: r5404 - in jcr/trunk: applications and 26 other directories.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-12-30 02:35:16 -0500 (Fri, 30 Dec 2011)
New Revision: 5404
Modified:
jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/pom.xml
jcr/trunk/applications/exo.jcr.applications.backupconsole/pom.xml
jcr/trunk/applications/exo.jcr.applications.browser/pom.xml
jcr/trunk/applications/exo.jcr.applications.config/pom.xml
jcr/trunk/applications/exo.jcr.applications.fckeditor/pom.xml
jcr/trunk/applications/exo.jcr.applications.jboss/pom.xml
jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml
jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml
jcr/trunk/applications/exo.jcr.applications.rest/pom.xml
jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml
jcr/trunk/applications/exo.jcr.cluster.testclient/pom.xml
jcr/trunk/applications/exo.jcr.ear/pom.xml
jcr/trunk/applications/pom.xml
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/pom.xml
jcr/trunk/exo.jcr.component.core/pom.xml
jcr/trunk/exo.jcr.component.ext/pom.xml
jcr/trunk/exo.jcr.component.ftp/pom.xml
jcr/trunk/exo.jcr.component.statistics/pom.xml
jcr/trunk/exo.jcr.component.webdav/pom.xml
jcr/trunk/exo.jcr.connectors.jca/pom.xml
jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml
jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/pom.xml
jcr/trunk/exo.jcr.docs/pom.xml
jcr/trunk/exo.jcr.framework.command/pom.xml
jcr/trunk/exo.jcr.framework.ftpclient/pom.xml
jcr/trunk/exo.jcr.framework.web/pom.xml
jcr/trunk/packaging/module/pom.xml
jcr/trunk/pom.xml
Log:
[maven-release-plugin] prepare release 1.15.x
Modified: jcr/trunk/applications/exo.jcr.applications.backupconsole/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.backupconsole/pom.xml 2011-12-30 07:34:47 UTC (rev 5403)
+++ jcr/trunk/applications/exo.jcr.applications.backupconsole/pom.xml 2011-12-30 07:35:16 UTC (rev 5404)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.15.0-Beta01-SNAPSHOT</version>
+ <version>1.14.6-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.backupconsole</artifactId>
<name>eXo JCR :: Applications :: Backup Console</name>
Modified: jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/pom.xml 2011-12-30 07:34:47 UTC (rev 5403)
+++ jcr/trunk/applications/exo.jcr.applications.backupconsole.dist/pom.xml 2011-12-30 07:35:16 UTC (rev 5404)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.15.0-Beta01-SNAPSHOT</version>
+ <version>1.14.6-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.backupconsole.dist</artifactId>
<name>eXo JCR :: Applications :: Backup Console Binary Distribution</name>
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.backupconsole</artifactId>
- <version>1.15.0-Beta01-SNAPSHOT</version>
+ <version>1.14.6-GA-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.jcr</groupId>
Modified: jcr/trunk/applications/exo.jcr.applications.browser/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.browser/pom.xml 2011-12-30 07:34:47 UTC (rev 5403)
+++ jcr/trunk/applications/exo.jcr.applications.browser/pom.xml 2011-12-30 07:35:16 UTC (rev 5404)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.15.0-Beta01-SNAPSHOT</version>
+ <version>1.14.6-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.browser</artifactId>
<packaging>war</packaging>
Modified: jcr/trunk/applications/exo.jcr.applications.config/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.config/pom.xml 2011-12-30 07:34:47 UTC (rev 5403)
+++ jcr/trunk/applications/exo.jcr.applications.config/pom.xml 2011-12-30 07:35:16 UTC (rev 5404)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.15.0-Beta01-SNAPSHOT</version>
+ <version>1.14.6-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.config</artifactId>
<packaging>pom</packaging>
Modified: jcr/trunk/applications/exo.jcr.applications.fckeditor/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.fckeditor/pom.xml 2011-12-30 07:34:47 UTC (rev 5403)
+++ jcr/trunk/applications/exo.jcr.applications.fckeditor/pom.xml 2011-12-30 07:35:16 UTC (rev 5404)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.15.0-Beta01-SNAPSHOT</version>
+ <version>1.14.6-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.fckeditor</artifactId>
<packaging>war</packaging>
Modified: jcr/trunk/applications/exo.jcr.applications.jboss/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.jboss/pom.xml 2011-12-30 07:34:47 UTC (rev 5403)
+++ jcr/trunk/applications/exo.jcr.applications.jboss/pom.xml 2011-12-30 07:35:16 UTC (rev 5404)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.15.0-Beta01-SNAPSHOT</version>
+ <version>1.14.6-GA-SNAPSHOT</version>
<relativePath>../exo.jcr.applications.config/pom.xml</relativePath>
</parent>
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.ear</artifactId>
- <version>1.15.0-Beta01-SNAPSHOT</version>
+ <version>1.14.6-GA-SNAPSHOT</version>
<type>ear</type>
<scope>runtime</scope>
</dependency>
Modified: jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml 2011-12-30 07:34:47 UTC (rev 5403)
+++ jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml 2011-12-30 07:35:16 UTC (rev 5404)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.15.0-Beta01-SNAPSHOT</version>
+ <version>1.14.6-GA-SNAPSHOT</version>
<relativePath>../exo.jcr.applications.config/pom.xml</relativePath>
</parent>
Modified: jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml 2011-12-30 07:34:47 UTC (rev 5403)
+++ jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml 2011-12-30 07:35:16 UTC (rev 5404)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.15.0-Beta01-SNAPSHOT</version>
+ <version>1.14.6-GA-SNAPSHOT</version>
<relativePath>../exo.jcr.applications.config/pom.xml</relativePath>
</parent>
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.connectors.jca</artifactId>
- <version>1.15.0-Beta01-SNAPSHOT</version>
+ <version>1.14.6-GA-SNAPSHOT</version>
<type>rar</type>
<scope>runtime</scope>
</dependency>
Modified: jcr/trunk/applications/exo.jcr.applications.rest/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.rest/pom.xml 2011-12-30 07:34:47 UTC (rev 5403)
+++ jcr/trunk/applications/exo.jcr.applications.rest/pom.xml 2011-12-30 07:35:16 UTC (rev 5404)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.15.0-Beta01-SNAPSHOT</version>
+ <version>1.14.6-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.rest</artifactId>
<packaging>war</packaging>
Modified: jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml 2011-12-30 07:34:47 UTC (rev 5403)
+++ jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml 2011-12-30 07:35:16 UTC (rev 5404)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.15.0-Beta01-SNAPSHOT</version>
+ <version>1.14.6-GA-SNAPSHOT</version>
<relativePath>../exo.jcr.applications.config/pom.xml</relativePath>
</parent>
Modified: jcr/trunk/applications/exo.jcr.cluster.testclient/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.cluster.testclient/pom.xml 2011-12-30 07:34:47 UTC (rev 5403)
+++ jcr/trunk/applications/exo.jcr.cluster.testclient/pom.xml 2011-12-30 07:35:16 UTC (rev 5404)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.15.0-Beta01-SNAPSHOT</version>
+ <version>1.14.6-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.cluster.testclient</artifactId>
<name>eXo JCR :: Cluster :: Test Client</name>
Modified: jcr/trunk/applications/exo.jcr.ear/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.ear/pom.xml 2011-12-30 07:34:47 UTC (rev 5403)
+++ jcr/trunk/applications/exo.jcr.ear/pom.xml 2011-12-30 07:35:16 UTC (rev 5404)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.15.0-Beta01-SNAPSHOT</version>
+ <version>1.14.6-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.ear</artifactId>
<packaging>ear</packaging>
Modified: jcr/trunk/applications/pom.xml
===================================================================
--- jcr/trunk/applications/pom.xml 2011-12-30 07:34:47 UTC (rev 5403)
+++ jcr/trunk/applications/pom.xml 2011-12-30 07:35:16 UTC (rev 5404)
@@ -22,12 +22,12 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.15.0-Beta01-SNAPSHOT</version>
+ <version>1.14.6-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.15.0-Beta01-SNAPSHOT</version>
+ <version>1.14.6-GA-SNAPSHOT</version>
<name>eXo JCR :: Applications :: Reactor</name>
<packaging>pom</packaging>
Modified: jcr/trunk/exo.jcr.component.core/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/pom.xml 2011-12-30 07:34:47 UTC (rev 5403)
+++ jcr/trunk/exo.jcr.component.core/pom.xml 2011-12-30 07:35:16 UTC (rev 5404)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.15.0-Beta01-SNAPSHOT</version>
+ <version>1.14.6-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.core</artifactId>
<name>eXo JCR :: Component :: Core Service</name>
Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/pom.xml 2011-12-30 07:34:47 UTC (rev 5403)
+++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/pom.xml 2011-12-30 07:35:16 UTC (rev 5404)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.15.0-Beta01-SNAPSHOT</version>
+ <version>1.14.6-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.core.impl.infinispan.v5</artifactId>
<name>eXo JCR :: Component :: Core Service based on ISPN 5</name>
Modified: jcr/trunk/exo.jcr.component.ext/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.ext/pom.xml 2011-12-30 07:34:47 UTC (rev 5403)
+++ jcr/trunk/exo.jcr.component.ext/pom.xml 2011-12-30 07:35:16 UTC (rev 5404)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.15.0-Beta01-SNAPSHOT</version>
+ <version>1.14.6-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.ext</artifactId>
<name>eXo JCR :: Component :: Extension Service</name>
Modified: jcr/trunk/exo.jcr.component.ftp/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.ftp/pom.xml 2011-12-30 07:34:47 UTC (rev 5403)
+++ jcr/trunk/exo.jcr.component.ftp/pom.xml 2011-12-30 07:35:16 UTC (rev 5404)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.15.0-Beta01-SNAPSHOT</version>
+ <version>1.14.6-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.ftp</artifactId>
<name>eXo JCR :: Component :: FTP Service</name>
Modified: jcr/trunk/exo.jcr.component.statistics/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.statistics/pom.xml 2011-12-30 07:34:47 UTC (rev 5403)
+++ jcr/trunk/exo.jcr.component.statistics/pom.xml 2011-12-30 07:35:16 UTC (rev 5404)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.15.0-Beta01-SNAPSHOT</version>
+ <version>1.14.6-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.statistics</artifactId>
<name>eXo JCR :: Component :: Statistics Provider</name>
Modified: jcr/trunk/exo.jcr.component.webdav/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/pom.xml 2011-12-30 07:34:47 UTC (rev 5403)
+++ jcr/trunk/exo.jcr.component.webdav/pom.xml 2011-12-30 07:35:16 UTC (rev 5404)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.15.0-Beta01-SNAPSHOT</version>
+ <version>1.14.6-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.webdav</artifactId>
<name>eXo JCR :: Component :: Webdav Service</name>
Modified: jcr/trunk/exo.jcr.connectors.jca/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.connectors.jca/pom.xml 2011-12-30 07:34:47 UTC (rev 5403)
+++ jcr/trunk/exo.jcr.connectors.jca/pom.xml 2011-12-30 07:35:16 UTC (rev 5404)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.15.0-Beta01-SNAPSHOT</version>
+ <version>1.14.6-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.connectors.jca</artifactId>
<packaging>rar</packaging>
Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml 2011-12-30 07:34:47 UTC (rev 5403)
+++ jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml 2011-12-30 07:35:16 UTC (rev 5404)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.docs.developer</artifactId>
- <version>1.15.0-Beta01-SNAPSHOT</version>
+ <version>1.14.6-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/pom.xml 2011-12-30 07:34:47 UTC (rev 5403)
+++ jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/pom.xml 2011-12-30 07:35:16 UTC (rev 5404)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.docs</artifactId>
- <version>1.15.0-Beta01-SNAPSHOT</version>
+ <version>1.14.6-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/trunk/exo.jcr.docs/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.docs/pom.xml 2011-12-30 07:34:47 UTC (rev 5403)
+++ jcr/trunk/exo.jcr.docs/pom.xml 2011-12-30 07:35:16 UTC (rev 5404)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.15.0-Beta01-SNAPSHOT</version>
+ <version>1.14.6-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/trunk/exo.jcr.framework.command/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.framework.command/pom.xml 2011-12-30 07:34:47 UTC (rev 5403)
+++ jcr/trunk/exo.jcr.framework.command/pom.xml 2011-12-30 07:35:16 UTC (rev 5404)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.15.0-Beta01-SNAPSHOT</version>
+ <version>1.14.6-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.framework.command</artifactId>
<name>eXo JCR :: Framework :: Command</name>
Modified: jcr/trunk/exo.jcr.framework.ftpclient/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.framework.ftpclient/pom.xml 2011-12-30 07:34:47 UTC (rev 5403)
+++ jcr/trunk/exo.jcr.framework.ftpclient/pom.xml 2011-12-30 07:35:16 UTC (rev 5404)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.15.0-Beta01-SNAPSHOT</version>
+ <version>1.14.6-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.framework.ftpclient</artifactId>
<name>eXo JCR :: Framework :: FTP Client</name>
Modified: jcr/trunk/exo.jcr.framework.web/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.framework.web/pom.xml 2011-12-30 07:34:47 UTC (rev 5403)
+++ jcr/trunk/exo.jcr.framework.web/pom.xml 2011-12-30 07:35:16 UTC (rev 5404)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.15.0-Beta01-SNAPSHOT</version>
+ <version>1.14.6-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.framework.web</artifactId>
<name>eXo JCR :: Framework :: Web</name>
Modified: jcr/trunk/packaging/module/pom.xml
===================================================================
--- jcr/trunk/packaging/module/pom.xml 2011-12-30 07:34:47 UTC (rev 5403)
+++ jcr/trunk/packaging/module/pom.xml 2011-12-30 07:35:16 UTC (rev 5404)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.15.0-Beta01-SNAPSHOT</version>
+ <version>1.14.6-GA-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>jcr.packaging.module</artifactId>
Modified: jcr/trunk/pom.xml
===================================================================
--- jcr/trunk/pom.xml 2011-12-30 07:34:47 UTC (rev 5403)
+++ jcr/trunk/pom.xml 2011-12-30 07:35:16 UTC (rev 5404)
@@ -29,14 +29,14 @@
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.15.0-Beta01-SNAPSHOT</version>
+ <version>1.14.6-GA-SNAPSHOT</version>
<packaging>pom</packaging>
<name>eXo JCR</name>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/jcr/branches/1.15.x</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/jcr/branches/1.15.x</developerConnection>
- <url>http://fisheye.jboss.org/browse/exo-jcr/jcr/branches/1.15.x</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/jcr/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/jcr/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/exo-jcr/jcr/trunk</url>
</scm>
<properties>
12 years, 4 months
- 1
- 0