exo-jcr SVN: r2207 - jcr/trunk/packaging/module/src/main/javascript.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2010-04-01 10:45:41 -0400 (Thu, 01 Apr 2010)
New Revision: 2207
Modified:
jcr/trunk/packaging/module/src/main/javascript/jcr.packaging.module.js
Log:
EXOJCR-632 : svn: File 'jcr.packaging.module/1.12.0-CP01/jcr.packaging.module-1.12.0-CP01.js' has inconsistent newlines
Modified: jcr/trunk/packaging/module/src/main/javascript/jcr.packaging.module.js
===================================================================
--- jcr/trunk/packaging/module/src/main/javascript/jcr.packaging.module.js 2010-04-01 14:42:37 UTC (rev 2206)
+++ jcr/trunk/packaging/module/src/main/javascript/jcr.packaging.module.js 2010-04-01 14:45:41 UTC (rev 2207)
@@ -7,7 +7,7 @@
var module = {} ;
- module.version = "${project.version}" ; //
+ module.version = "${project.version}" ; //
module.relativeMavenRepo = "org/exoplatform/jcr" ;
module.relativeSRCRepo = "jcr/trunk" ;
module.name = "jcr" ;
@@ -24,9 +24,9 @@
addDependency(new Project("jgroups", "jgroups", "jar", "2.6.13.GA")).
addDependency(new Project("stax", "stax-api", "jar", "1.0")).
// addDependency(new Project("stax", "stax", "jar", "1.2.0")).
- addDependency(new Project("org.jboss.cache","jbosscache-core","jar","3.2.3.CR1")).
- addDependency(new Project("jboss.jbossts","jbossjts","jar","4.6.1.GA")).
- addDependency(new Project("jboss.jbossts","jbossts-common","jar","4.6.1.GA")).
+ addDependency(new Project("org.jboss.cache","jbosscache-core","jar","3.2.3.CR1")).
+ addDependency(new Project("jboss.jbossts","jbossjts","jar","4.6.1.GA")).
+ addDependency(new Project("jboss.jbossts","jbossts-common","jar","4.6.1.GA")).
addDependency(new Project("org.apache.ws.commons","ws-commons-util","jar","1.0.1")).
addDependency(new Project("org.apache.lucene", "lucene-core", "jar", "2.4.1")).
addDependency(new Project("org.apache.lucene", "lucene-spellchecker", "jar", "2.4.1")).
14 years, 1 month
exo-jcr SVN: r2206 - jcr/tags/1.12.0-CP01/packaging/module/src/main/javascript.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2010-04-01 10:42:37 -0400 (Thu, 01 Apr 2010)
New Revision: 2206
Modified:
jcr/tags/1.12.0-CP01/packaging/module/src/main/javascript/jcr.packaging.module.js
Log:
EXOJCR-632 : svn: File 'jcr.packaging.module/1.12.0-CP01/jcr.packaging.module-1.12.0-CP01.js' has inconsistent newlines
Modified: jcr/tags/1.12.0-CP01/packaging/module/src/main/javascript/jcr.packaging.module.js
===================================================================
--- jcr/tags/1.12.0-CP01/packaging/module/src/main/javascript/jcr.packaging.module.js 2010-04-01 10:28:23 UTC (rev 2205)
+++ jcr/tags/1.12.0-CP01/packaging/module/src/main/javascript/jcr.packaging.module.js 2010-04-01 14:42:37 UTC (rev 2206)
@@ -7,7 +7,7 @@
var module = {} ;
- module.version = "${project.version}" ; //
+ module.version = "${project.version}" ; //
module.relativeMavenRepo = "org/exoplatform/jcr" ;
module.relativeSRCRepo = "jcr/trunk" ;
module.name = "jcr" ;
@@ -24,9 +24,9 @@
addDependency(new Project("jgroups", "jgroups", "jar", "2.6.13.GA")).
addDependency(new Project("stax", "stax-api", "jar", "1.0")).
// addDependency(new Project("stax", "stax", "jar", "1.2.0")).
- addDependency(new Project("org.jboss.cache","jbosscache-core","jar","3.2.0.GA")).
- addDependency(new Project("jboss.jbossts","jbossjts","jar","4.6.1.GA")).
- addDependency(new Project("jboss.jbossts","jbossts-common","jar","4.6.1.GA")).
+ addDependency(new Project("org.jboss.cache","jbosscache-core","jar","3.2.0.GA")).
+ addDependency(new Project("jboss.jbossts","jbossjts","jar","4.6.1.GA")).
+ addDependency(new Project("jboss.jbossts","jbossts-common","jar","4.6.1.GA")).
addDependency(new Project("org.apache.ws.commons","ws-commons-util","jar","1.0.1")).
addDependency(new Project("org.apache.lucene", "lucene-core", "jar", "2.4.1")).
addDependency(new Project("org.apache.lucene", "lucene-spellchecker", "jar", "2.4.1")).
14 years, 1 month
exo-jcr SVN: r2205 - in jcr/trunk/exo.jcr.component.core/src: main/java/org/exoplatform/services/jcr/impl/dataflow/persistent and 2 other directories.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2010-04-01 06:28:23 -0400 (Thu, 01 Apr 2010)
New Revision: 2205
Added:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/NullNodeData.java
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestCacheableWorkspaceDataManager.java
Log:
EXOJCR-609: The missing values were not properly managed for the method getItem by name and by id
Added: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/NullNodeData.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/NullNodeData.java (rev 0)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/NullNodeData.java 2010-04-01 10:28:23 UTC (rev 2205)
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2003-2010 eXo Platform SAS.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ */
+package org.exoplatform.services.jcr.datamodel;
+
+import org.exoplatform.services.jcr.access.AccessControlList;
+import org.exoplatform.services.jcr.dataflow.ItemDataVisitor;
+
+import javax.jcr.RepositoryException;
+
+/**
+ * This class is used to represent <code>null</code> value, it is designed to be used
+ * into the cache to represent missing value.
+ *
+ * Created by The eXo Platform SAS
+ * Author : Nicolas Filotto
+ * nicolas.filotto(a)exoplatform.com
+ * 31 mars 2010
+ */
+public class NullNodeData implements NodeData
+{
+ private final String id;
+ private final String parentId;
+ private final QPath path;
+
+ public NullNodeData(String id)
+ {
+ this.id = id;
+ this.path = new QPath(new QPathEntry[]{new QPathEntry(null, null, 0)});
+ this.parentId = null;
+ }
+
+ public NullNodeData(NodeData parentData, QPathEntry name)
+ {
+ this.parentId = parentData.getIdentifier();
+ this.path = QPath.makeChildPath(parentData.getQPath(), name);
+ this.id = parentId + "$" + name.asString();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void accept(ItemDataVisitor visitor) throws RepositoryException
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getIdentifier()
+ {
+ return id;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getParentIdentifier()
+ {
+ return parentId;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int getPersistedVersion()
+ {
+ return 0;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public QPath getQPath()
+ {
+ return path;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isNode()
+ {
+ return true;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public AccessControlList getACL()
+ {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public InternalQName[] getMixinTypeNames()
+ {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int getOrderNumber()
+ {
+ return 0;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public InternalQName getPrimaryTypeName()
+ {
+ return null;
+ }
+}
\ No newline at end of file
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java 2010-04-01 09:47:18 UTC (rev 2204)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java 2010-04-01 10:28:23 UTC (rev 2205)
@@ -18,15 +18,12 @@
*/
package org.exoplatform.services.jcr.impl.dataflow.persistent;
-import org.exoplatform.services.jcr.access.AccessControlList;
-import org.exoplatform.services.jcr.dataflow.ItemDataVisitor;
import org.exoplatform.services.jcr.dataflow.ItemStateChangesLog;
import org.exoplatform.services.jcr.dataflow.persistent.WorkspaceStorageCache;
-import org.exoplatform.services.jcr.datamodel.InternalQName;
import org.exoplatform.services.jcr.datamodel.ItemData;
import org.exoplatform.services.jcr.datamodel.NodeData;
+import org.exoplatform.services.jcr.datamodel.NullNodeData;
import org.exoplatform.services.jcr.datamodel.PropertyData;
-import org.exoplatform.services.jcr.datamodel.QPath;
import org.exoplatform.services.jcr.datamodel.QPathEntry;
import org.exoplatform.services.jcr.datamodel.ValueData;
import org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache;
@@ -54,71 +51,8 @@
*/
public class CacheableWorkspaceDataManager extends WorkspacePersistentDataManager
{
- /**
- * The identifier of the <code>null</code> value
- */
- protected static final String ITEM_DATA_NULL_VALUE_ID = "$";
/**
- * The <code>null</code> value for the itemData
- */
- protected static final ItemData ITEM_DATA_NULL_VALUE = new NodeData()
- {
-
- public void accept(ItemDataVisitor visitor) throws RepositoryException
- {
- }
-
- public String getIdentifier()
- {
- return ITEM_DATA_NULL_VALUE_ID;
- }
-
- public String getParentIdentifier()
- {
- return null;
- }
-
- public int getPersistedVersion()
- {
- return 0;
- }
-
- QPath path = new QPath(new QPathEntry[]{new QPathEntry(null, null, 0)});
-
- public QPath getQPath()
- {
- return path;
- }
-
- public boolean isNode()
- {
- return true;
- }
-
- public AccessControlList getACL()
- {
- return null;
- }
-
- public InternalQName[] getMixinTypeNames()
- {
- return null;
- }
-
- public int getOrderNumber()
- {
- return 0;
- }
-
- public InternalQName getPrimaryTypeName()
- {
- return null;
- }
-
- };
-
- /**
* Items cache.
*/
protected final WorkspaceStorageCache cache;
@@ -483,7 +417,7 @@
fixPropertyValues((PropertyData)data);
}
- return data == ITEM_DATA_NULL_VALUE ? null : data;
+ return data instanceof NullNodeData ? null : data;
}
/**
@@ -492,6 +426,10 @@
@Override
public ItemData getItemData(String identifier) throws RepositoryException
{
+ if (identifier == null)
+ {
+ return null;
+ }
// 2. Try from cache
ItemData data = getCachedItemData(identifier);
@@ -525,7 +463,7 @@
fixPropertyValues((PropertyData)data);
}
- return data == ITEM_DATA_NULL_VALUE ? null : data;
+ return data instanceof NullNodeData ? null : data;
}
/**
@@ -729,7 +667,7 @@
ItemData data = super.getItemData(parentData, name);
if (cache.isEnabled())
{
- cache.put(data == null ? ITEM_DATA_NULL_VALUE : data);
+ cache.put(data == null ? new NullNodeData(parentData, name) : data);
}
return data;
}
@@ -746,7 +684,7 @@
ItemData data = super.getItemData(identifier);
if (cache.isEnabled())
{
- cache.put(data == null ? ITEM_DATA_NULL_VALUE : data);
+ cache.put(data == null ? new NullNodeData(identifier) : data);
}
return data;
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java 2010-04-01 09:47:18 UTC (rev 2204)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java 2010-04-01 10:28:23 UTC (rev 2205)
@@ -26,6 +26,7 @@
import org.exoplatform.services.jcr.dataflow.persistent.WorkspaceStorageCache;
import org.exoplatform.services.jcr.datamodel.ItemData;
import org.exoplatform.services.jcr.datamodel.NodeData;
+import org.exoplatform.services.jcr.datamodel.NullNodeData;
import org.exoplatform.services.jcr.datamodel.PropertyData;
import org.exoplatform.services.jcr.datamodel.QPath;
import org.exoplatform.services.jcr.datamodel.QPathEntry;
@@ -904,9 +905,12 @@
protected void putItem(final ItemData data)
{
cache.put(new CacheId(data.getIdentifier()), new CacheValue(data, System.currentTimeMillis() + liveTime));
- cache.put(new CacheQPath(data.getParentIdentifier(), data.getQPath()), new CacheValue(data, System
- .currentTimeMillis()
- + liveTime));
+ if (data.getParentIdentifier() != null || !(data instanceof NullNodeData))
+ {
+ cache.put(new CacheQPath(data.getParentIdentifier(), data.getQPath()), new CacheValue(data, System
+ .currentTimeMillis()
+ + liveTime));
+ }
}
/**
@@ -929,6 +933,11 @@
// add child item data to list of childs of the parent
if (item.isNode())
{
+ if (item instanceof NullNodeData)
+ {
+ // Skip null values
+ return;
+ }
// add child node
List<NodeData> cachedParentChilds = nodesCache.get(item.getParentIdentifier());
if (cachedParentChilds != null)
@@ -1300,8 +1309,11 @@
{
cache.remove(k);
- // remove by parentId + path
- cache.remove(new CacheQPath(c.getParentIdentifier(), c.getQPath()));
+ if (c.getParentIdentifier() != null || !(c instanceof NullNodeData))
+ {
+ // remove by parentId + path
+ cache.remove(new CacheQPath(c.getParentIdentifier(), c.getQPath()));
+ }
// remove cached child lists
if (c.isNode())
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2010-04-01 09:47:18 UTC (rev 2204)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2010-04-01 10:28:23 UTC (rev 2205)
@@ -28,6 +28,7 @@
import org.exoplatform.services.jcr.datamodel.InternalQName;
import org.exoplatform.services.jcr.datamodel.ItemData;
import org.exoplatform.services.jcr.datamodel.NodeData;
+import org.exoplatform.services.jcr.datamodel.NullNodeData;
import org.exoplatform.services.jcr.datamodel.PropertyData;
import org.exoplatform.services.jcr.datamodel.QPath;
import org.exoplatform.services.jcr.datamodel.QPathEntry;
@@ -52,6 +53,7 @@
import java.util.Set;
import javax.jcr.RepositoryException;
+import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
/**
@@ -370,12 +372,53 @@
cache.setLocal(false);
if (!inTransaction)
{
- cache.commitTransaction();
+ dedicatedTxCommit();
}
}
}
/**
+ * Allows to commit the cache changes in a dedicated XA Tx in order to avoid potential
+ * deadlocks
+ */
+ private void dedicatedTxCommit()
+ {
+ // Ensure that the commit is done in a dedicated tx to avoid deadlock due
+ // to global XA Tx
+ TransactionManager tm = getTransactionManager();
+ Transaction tx = null;
+ try
+ {
+ if (tm != null)
+ {
+ try
+ {
+ tx = tm.suspend();
+ }
+ catch (Exception e)
+ {
+ LOG.warn("Cannot suspend the current transaction", e);
+ }
+ }
+ cache.commitTransaction();
+ }
+ finally
+ {
+ if (tx != null)
+ {
+ try
+ {
+ tm.resume(tx);
+ }
+ catch (Exception e)
+ {
+ LOG.warn("Cannot resume the current transaction", e);
+ }
+ }
+ }
+ }
+
+ /**
* {@inheritDoc}
*/
public void remove(ItemData item)
@@ -484,7 +527,7 @@
cache.setLocal(false);
if (!inTransaction)
{
- cache.commitTransaction();
+ dedicatedTxCommit();
}
}
}
@@ -525,7 +568,7 @@
cache.setLocal(false);
if (!inTransaction)
{
- cache.commitTransaction();
+ dedicatedTxCommit();
}
}
}
@@ -778,9 +821,9 @@
cache.put(makeChildFqn(childNodes, node.getParentIdentifier(), node.getQPath().getEntries()[node.getQPath()
.getEntries().length - 1]), ITEM_ID, node.getIdentifier());
// if MODIFY and List present OR FORCE_MODIFY, then write
- if ((modifyListsOfChild == ModifyChildOption.MODIFY && cache.getNode(makeChildListFqn(childNodesList, node
- .getParentIdentifier())) != null)
- || modifyListsOfChild == ModifyChildOption.FORCE_MODIFY)
+ if (!(node instanceof NullNodeData)
+ && ((modifyListsOfChild == ModifyChildOption.MODIFY && cache.getNode(makeChildListFqn(childNodesList, node
+ .getParentIdentifier())) != null) || modifyListsOfChild == ModifyChildOption.FORCE_MODIFY))
{
cache.addToList(makeChildListFqn(childNodesList, node.getParentIdentifier()), ITEM_LIST, node
.getIdentifier());
@@ -829,6 +872,14 @@
{
cache.addToList(makeChildListFqn(childPropsList, prop.getParentIdentifier()), ITEM_LIST, prop.getIdentifier());
}
+ ItemData result =
+ get(prop.getParentIdentifier(), prop.getQPath().getEntries()[prop.getQPath().getEntries().length - 1]);
+ if (result instanceof NullNodeData)
+ {
+ // Remove null value if exists
+ cache.removeNode(makeChildFqn(childNodes, result.getParentIdentifier(), prop.getQPath().getEntries()[prop.getQPath().getEntries().length - 1]));
+ cache.removeNode(makeItemFqn(result.getIdentifier()));
+ }
// add in ITEMS
return (PropertyData)cache.put(makeItemFqn(prop.getIdentifier()), ITEM_DATA, prop);
}
@@ -883,7 +934,12 @@
*/
protected void updateMixin(NodeData node)
{
- NodeData prevData = (NodeData)cache.put(makeItemFqn(node.getIdentifier()), ITEM_DATA, node);
+ Object oPrevValue = cache.put(makeItemFqn(node.getIdentifier()), ITEM_DATA, node);
+ if (oPrevValue instanceof NullNodeData)
+ {
+ oPrevValue = null;
+ }
+ NodeData prevData = (NodeData)oPrevValue;
if (prevData != null)
{
// do update ACL if needed
@@ -1022,6 +1078,10 @@
for (Iterator<NodeData> iter = new ChildNodesIterator<NodeData>(parentId); iter.hasNext();)
{
NodeData prevNode = iter.next();
+ if (prevNode instanceof NullNodeData)
+ {
+ continue;
+ }
// is ACL changes on this node (i.e. ACL inheritance brokes)
for (InternalQName mixin : prevNode.getMixinTypeNames())
{
Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestCacheableWorkspaceDataManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestCacheableWorkspaceDataManager.java 2010-04-01 09:47:18 UTC (rev 2204)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestCacheableWorkspaceDataManager.java 2010-04-01 10:28:23 UTC (rev 2205)
@@ -25,6 +25,7 @@
import org.exoplatform.services.jcr.datamodel.ItemData;
import org.exoplatform.services.jcr.datamodel.NodeData;
import org.exoplatform.services.jcr.datamodel.PropertyData;
+import org.exoplatform.services.jcr.datamodel.QPath;
import org.exoplatform.services.jcr.datamodel.QPathEntry;
import org.exoplatform.services.jcr.datamodel.ValueData;
import org.exoplatform.services.jcr.impl.storage.SystemDataContainerHolder;
@@ -163,7 +164,8 @@
public void testGetItemDataByNodeDataNQPathEntry() throws Exception
{
- final NodeData nodeData = new PersistedNodeData("getItemData", null, null, 0, 1, null, null, null);
+ final NodeData nodeData =
+ new PersistedNodeData("getItemData", new QPath(new QPathEntry[]{}), null, 0, 1, null, null, null);
assertEquals(0, con.getItemDataByNodeDataNQPathEntryCalls.get());
MyTask task = new MyTask()
{
14 years, 1 month
exo-jcr SVN: r2204 - jcr/branches/1.14.x.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-04-01 05:47:18 -0400 (Thu, 01 Apr 2010)
New Revision: 2204
Modified:
jcr/branches/1.14.x/pom.xml
Log:
EXOJCR-604 core version updated
Modified: jcr/branches/1.14.x/pom.xml
===================================================================
--- jcr/branches/1.14.x/pom.xml 2010-04-01 09:37:47 UTC (rev 2203)
+++ jcr/branches/1.14.x/pom.xml 2010-04-01 09:47:18 UTC (rev 2204)
@@ -40,7 +40,7 @@
<exo.product.name>exo-jcr</exo.product.name>
<exo.product.specification>1.12</exo.product.specification>
<org.exoplatform.kernel.version>2.2.1-GA-SNAPSHOT</org.exoplatform.kernel.version>
- <org.exoplatform.core.version>2.3.1-GA-SNAPSHOT</org.exoplatform.core.version>
+ <org.exoplatform.core.version>2.4.0-Beta01-SNAPSHOT</org.exoplatform.core.version>
<org.exoplatform.ws.version>2.1.1-GA-SNAPSHOT</org.exoplatform.ws.version>
<org.exoplatform.doc-style.version>2-SNAPSHOT</org.exoplatform.doc-style.version>
</properties>
14 years, 1 month
exo-jcr SVN: r2203 - in core/branches/2.4.x: exo.core.component.database and 10 other directories.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-04-01 05:37:47 -0400 (Thu, 01 Apr 2010)
New Revision: 2203
Modified:
core/branches/2.4.x/exo.core.component.database/pom.xml
core/branches/2.4.x/exo.core.component.document/pom.xml
core/branches/2.4.x/exo.core.component.ldap/pom.xml
core/branches/2.4.x/exo.core.component.organization.api/pom.xml
core/branches/2.4.x/exo.core.component.organization.jdbc/pom.xml
core/branches/2.4.x/exo.core.component.organization.ldap/pom.xml
core/branches/2.4.x/exo.core.component.script.groovy/pom.xml
core/branches/2.4.x/exo.core.component.security.core/pom.xml
core/branches/2.4.x/exo.core.component.web.css/pom.xml
core/branches/2.4.x/exo.core.component.xml-processing/pom.xml
core/branches/2.4.x/packaging/module/pom.xml
core/branches/2.4.x/pom.xml
Log:
EXOJCR-604 versions updates
Modified: core/branches/2.4.x/exo.core.component.database/pom.xml
===================================================================
--- core/branches/2.4.x/exo.core.component.database/pom.xml 2010-04-01 09:24:31 UTC (rev 2202)
+++ core/branches/2.4.x/exo.core.component.database/pom.xml 2010-04-01 09:37:47 UTC (rev 2203)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.3.1-GA-SNAPSHOT</version>
+ <version>2.4.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.database</artifactId>
Modified: core/branches/2.4.x/exo.core.component.document/pom.xml
===================================================================
--- core/branches/2.4.x/exo.core.component.document/pom.xml 2010-04-01 09:24:31 UTC (rev 2202)
+++ core/branches/2.4.x/exo.core.component.document/pom.xml 2010-04-01 09:37:47 UTC (rev 2203)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.3.1-GA-SNAPSHOT</version>
+ <version>2.4.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.document</artifactId>
<name>eXo Core :: Component :: Demo Service</name>
Modified: core/branches/2.4.x/exo.core.component.ldap/pom.xml
===================================================================
--- core/branches/2.4.x/exo.core.component.ldap/pom.xml 2010-04-01 09:24:31 UTC (rev 2202)
+++ core/branches/2.4.x/exo.core.component.ldap/pom.xml 2010-04-01 09:37:47 UTC (rev 2203)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.3.1-GA-SNAPSHOT</version>
+ <version>2.4.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.ldap</artifactId>
Modified: core/branches/2.4.x/exo.core.component.organization.api/pom.xml
===================================================================
--- core/branches/2.4.x/exo.core.component.organization.api/pom.xml 2010-04-01 09:24:31 UTC (rev 2202)
+++ core/branches/2.4.x/exo.core.component.organization.api/pom.xml 2010-04-01 09:37:47 UTC (rev 2203)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.3.1-GA-SNAPSHOT</version>
+ <version>2.4.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.organization.api</artifactId>
<name>eXo Core :: Component :: Organization Service API</name>
Modified: core/branches/2.4.x/exo.core.component.organization.jdbc/pom.xml
===================================================================
--- core/branches/2.4.x/exo.core.component.organization.jdbc/pom.xml 2010-04-01 09:24:31 UTC (rev 2202)
+++ core/branches/2.4.x/exo.core.component.organization.jdbc/pom.xml 2010-04-01 09:37:47 UTC (rev 2203)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.3.1-GA-SNAPSHOT</version>
+ <version>2.4.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.organization.jdbc</artifactId>
Modified: core/branches/2.4.x/exo.core.component.organization.ldap/pom.xml
===================================================================
--- core/branches/2.4.x/exo.core.component.organization.ldap/pom.xml 2010-04-01 09:24:31 UTC (rev 2202)
+++ core/branches/2.4.x/exo.core.component.organization.ldap/pom.xml 2010-04-01 09:37:47 UTC (rev 2203)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.3.1-GA-SNAPSHOT</version>
+ <version>2.4.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.organization.ldap</artifactId>
Modified: core/branches/2.4.x/exo.core.component.script.groovy/pom.xml
===================================================================
--- core/branches/2.4.x/exo.core.component.script.groovy/pom.xml 2010-04-01 09:24:31 UTC (rev 2202)
+++ core/branches/2.4.x/exo.core.component.script.groovy/pom.xml 2010-04-01 09:37:47 UTC (rev 2203)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.3.1-GA-SNAPSHOT</version>
+ <version>2.4.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.script.groovy</artifactId>
Modified: core/branches/2.4.x/exo.core.component.security.core/pom.xml
===================================================================
--- core/branches/2.4.x/exo.core.component.security.core/pom.xml 2010-04-01 09:24:31 UTC (rev 2202)
+++ core/branches/2.4.x/exo.core.component.security.core/pom.xml 2010-04-01 09:37:47 UTC (rev 2203)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.3.1-GA-SNAPSHOT</version>
+ <version>2.4.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.security.core</artifactId>
Modified: core/branches/2.4.x/exo.core.component.web.css/pom.xml
===================================================================
--- core/branches/2.4.x/exo.core.component.web.css/pom.xml 2010-04-01 09:24:31 UTC (rev 2202)
+++ core/branches/2.4.x/exo.core.component.web.css/pom.xml 2010-04-01 09:37:47 UTC (rev 2203)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.3.1-GA-SNAPSHOT</version>
+ <version>2.4.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.web.css</artifactId>
Modified: core/branches/2.4.x/exo.core.component.xml-processing/pom.xml
===================================================================
--- core/branches/2.4.x/exo.core.component.xml-processing/pom.xml 2010-04-01 09:24:31 UTC (rev 2202)
+++ core/branches/2.4.x/exo.core.component.xml-processing/pom.xml 2010-04-01 09:37:47 UTC (rev 2203)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.3.1-GA-SNAPSHOT</version>
+ <version>2.4.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.xml-processing</artifactId>
<name>eXo Core :: Component :: XML Processing Service</name>
Modified: core/branches/2.4.x/packaging/module/pom.xml
===================================================================
--- core/branches/2.4.x/packaging/module/pom.xml 2010-04-01 09:24:31 UTC (rev 2202)
+++ core/branches/2.4.x/packaging/module/pom.xml 2010-04-01 09:37:47 UTC (rev 2203)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.3.1-GA-SNAPSHOT</version>
+ <version>2.4.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -18,13 +18,13 @@
<!-- declare the same dependencies than in the module.js -->
<dependencies>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.database</artifactId><version>2.3.1-GA-SNAPSHOT</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.document</artifactId><version>2.3.1-GA-SNAPSHOT</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.api</artifactId><version>2.3.1-GA-SNAPSHOT</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.ldap</artifactId><version>2.3.1-GA-SNAPSHOT</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.security.core</artifactId><version>2.3.1-GA-SNAPSHOT</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.xml-processing</artifactId><version>2.3.1-GA-SNAPSHOT</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.script.groovy</artifactId><version>2.3.1-GA-SNAPSHOT</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.database</artifactId><version>2.4.0-Beta01-SNAPSHOT</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.document</artifactId><version>2.4.0-Beta01-SNAPSHOT</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.api</artifactId><version>2.4.0-Beta01-SNAPSHOT</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.ldap</artifactId><version>2.4.0-Beta01-SNAPSHOT</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.security.core</artifactId><version>2.4.0-Beta01-SNAPSHOT</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.xml-processing</artifactId><version>2.4.0-Beta01-SNAPSHOT</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.script.groovy</artifactId><version>2.4.0-Beta01-SNAPSHOT</version></dependency>
</dependencies>
<build>
Modified: core/branches/2.4.x/pom.xml
===================================================================
--- core/branches/2.4.x/pom.xml 2010-04-01 09:24:31 UTC (rev 2202)
+++ core/branches/2.4.x/pom.xml 2010-04-01 09:37:47 UTC (rev 2203)
@@ -29,23 +29,23 @@
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.3.1-GA-SNAPSHOT</version>
+ <version>2.4.0-Beta01-SNAPSHOT</version>
<packaging>pom</packaging>
<name>eXo Core</name>
<properties>
<exo.product.name>exo-core</exo.product.name>
- <exo.product.specification>2.3</exo.product.specification>
+ <exo.product.specification>2.4</exo.product.specification>
<org.exoplatform.framework.junit.version>1.2.2-GA-SNAPSHOT</org.exoplatform.framework.junit.version>
<org.exoplatform.kernel.version>2.2.1-GA-SNAPSHOT</org.exoplatform.kernel.version>
</properties>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/core/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/core/trunk</developerConnection>
- <url>http://fisheye.jboss.org/browse/exo-jcr/core/trunk</url>
+ <connection>scm:svn:https://anonsvn.jboss.org/repos/exo-jcr/core/branches/2.4.x/</connection>
+ <developerConnection>scm:svn:https://anonsvn.jboss.org/repos/exo-jcr/core/branches/2.4.x/</developerConnection>
+ <url>http://fisheye.jboss.org/browse/exo-jcr/core/branches/2.4.x</url>
</scm>
<modules>
14 years, 1 month
exo-jcr SVN: r2202 - in jcr/branches/1.14.x: applications and 23 other directories.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-04-01 05:24:31 -0400 (Thu, 01 Apr 2010)
New Revision: 2202
Modified:
jcr/branches/1.14.x/applications/exo.jcr.applications.backupconsole/bin/jcrbackup.cmd
jcr/branches/1.14.x/applications/exo.jcr.applications.backupconsole/bin/jcrbackup.sh
jcr/branches/1.14.x/applications/exo.jcr.applications.backupconsole/pom.xml
jcr/branches/1.14.x/applications/exo.jcr.applications.browser/pom.xml
jcr/branches/1.14.x/applications/exo.jcr.applications.config/pom.xml
jcr/branches/1.14.x/applications/exo.jcr.applications.fckeditor/pom.xml
jcr/branches/1.14.x/applications/exo.jcr.applications.rest/pom.xml
jcr/branches/1.14.x/applications/exo.jcr.cluster.testclient/pom.xml
jcr/branches/1.14.x/applications/exo.jcr.ear/pom.xml
jcr/branches/1.14.x/applications/pom.xml
jcr/branches/1.14.x/applications/product-exo-jcr-as-jboss-ear.xml
jcr/branches/1.14.x/applications/product-exo-jcr-as-jonas-ear.xml
jcr/branches/1.14.x/applications/product-exo-jcr-as-tomcat6.xml
jcr/branches/1.14.x/docs/pom.xml
jcr/branches/1.14.x/docs/reference/en/pom.xml
jcr/branches/1.14.x/docs/reference/pom.xml
jcr/branches/1.14.x/docs/userguide/en/pom.xml
jcr/branches/1.14.x/docs/userguide/pom.xml
jcr/branches/1.14.x/exo.jcr.component.core/pom.xml
jcr/branches/1.14.x/exo.jcr.component.ext/pom.xml
jcr/branches/1.14.x/exo.jcr.component.ftp/pom.xml
jcr/branches/1.14.x/exo.jcr.component.webdav/pom.xml
jcr/branches/1.14.x/exo.jcr.connectors.localadapter/pom.xml
jcr/branches/1.14.x/exo.jcr.connectors.localadapter/src/main/rar/META-INF/ra.xml
jcr/branches/1.14.x/exo.jcr.framework.command/pom.xml
jcr/branches/1.14.x/exo.jcr.framework.ftpclient/pom.xml
jcr/branches/1.14.x/exo.jcr.framework.web/pom.xml
jcr/branches/1.14.x/packaging/module/pom.xml
jcr/branches/1.14.x/pom.xml
Log:
EXOJCR-604 1.14.x branch added
Modified: jcr/branches/1.14.x/applications/exo.jcr.applications.backupconsole/bin/jcrbackup.cmd
===================================================================
--- jcr/branches/1.14.x/applications/exo.jcr.applications.backupconsole/bin/jcrbackup.cmd 2010-04-01 09:08:35 UTC (rev 2201)
+++ jcr/branches/1.14.x/applications/exo.jcr.applications.backupconsole/bin/jcrbackup.cmd 2010-04-01 09:24:31 UTC (rev 2202)
@@ -1 +1 @@
-java -jar exo.jcr.applications.backupconsole-1.12.1-GA-SNAPSHOT.jar %*
+java -jar exo.jcr.applications.backupconsole-1.14.0-Beta01-SNAPSHOT.jar %*
Modified: jcr/branches/1.14.x/applications/exo.jcr.applications.backupconsole/bin/jcrbackup.sh
===================================================================
--- jcr/branches/1.14.x/applications/exo.jcr.applications.backupconsole/bin/jcrbackup.sh 2010-04-01 09:08:35 UTC (rev 2201)
+++ jcr/branches/1.14.x/applications/exo.jcr.applications.backupconsole/bin/jcrbackup.sh 2010-04-01 09:24:31 UTC (rev 2202)
@@ -1,3 +1,3 @@
#!/bin/sh
-java -jar exo.jcr.applications.backupconsole-1.12.1-GA-SNAPSHOT.jar $*
+java -jar exo.jcr.applications.backupconsole-1.14.0-Beta01-SNAPSHOT.jar $*
Modified: jcr/branches/1.14.x/applications/exo.jcr.applications.backupconsole/pom.xml
===================================================================
--- jcr/branches/1.14.x/applications/exo.jcr.applications.backupconsole/pom.xml 2010-04-01 09:08:35 UTC (rev 2201)
+++ jcr/branches/1.14.x/applications/exo.jcr.applications.backupconsole/pom.xml 2010-04-01 09:24:31 UTC (rev 2202)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.1-GA-SNAPSHOT</version>
+ <version>1.14.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.backupconsole</artifactId>
<name>eXo JCR :: Applications :: Backup Console</name>
Modified: jcr/branches/1.14.x/applications/exo.jcr.applications.browser/pom.xml
===================================================================
--- jcr/branches/1.14.x/applications/exo.jcr.applications.browser/pom.xml 2010-04-01 09:08:35 UTC (rev 2201)
+++ jcr/branches/1.14.x/applications/exo.jcr.applications.browser/pom.xml 2010-04-01 09:24:31 UTC (rev 2202)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.1-GA-SNAPSHOT</version>
+ <version>1.14.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.browser</artifactId>
<packaging>war</packaging>
Modified: jcr/branches/1.14.x/applications/exo.jcr.applications.config/pom.xml
===================================================================
--- jcr/branches/1.14.x/applications/exo.jcr.applications.config/pom.xml 2010-04-01 09:08:35 UTC (rev 2201)
+++ jcr/branches/1.14.x/applications/exo.jcr.applications.config/pom.xml 2010-04-01 09:24:31 UTC (rev 2202)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.1-GA-SNAPSHOT</version>
+ <version>1.14.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.config</artifactId>
<packaging>pom</packaging>
Modified: jcr/branches/1.14.x/applications/exo.jcr.applications.fckeditor/pom.xml
===================================================================
--- jcr/branches/1.14.x/applications/exo.jcr.applications.fckeditor/pom.xml 2010-04-01 09:08:35 UTC (rev 2201)
+++ jcr/branches/1.14.x/applications/exo.jcr.applications.fckeditor/pom.xml 2010-04-01 09:24:31 UTC (rev 2202)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.1-GA-SNAPSHOT</version>
+ <version>1.14.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.fckeditor</artifactId>
<packaging>war</packaging>
Modified: jcr/branches/1.14.x/applications/exo.jcr.applications.rest/pom.xml
===================================================================
--- jcr/branches/1.14.x/applications/exo.jcr.applications.rest/pom.xml 2010-04-01 09:08:35 UTC (rev 2201)
+++ jcr/branches/1.14.x/applications/exo.jcr.applications.rest/pom.xml 2010-04-01 09:24:31 UTC (rev 2202)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.1-GA-SNAPSHOT</version>
+ <version>1.14.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.rest</artifactId>
<packaging>war</packaging>
Modified: jcr/branches/1.14.x/applications/exo.jcr.cluster.testclient/pom.xml
===================================================================
--- jcr/branches/1.14.x/applications/exo.jcr.cluster.testclient/pom.xml 2010-04-01 09:08:35 UTC (rev 2201)
+++ jcr/branches/1.14.x/applications/exo.jcr.cluster.testclient/pom.xml 2010-04-01 09:24:31 UTC (rev 2202)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.1-GA-SNAPSHOT</version>
+ <version>1.14.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.cluster.testclient</artifactId>
<name>eXo JCR :: Cluster :: Test Client</name>
Modified: jcr/branches/1.14.x/applications/exo.jcr.ear/pom.xml
===================================================================
--- jcr/branches/1.14.x/applications/exo.jcr.ear/pom.xml 2010-04-01 09:08:35 UTC (rev 2201)
+++ jcr/branches/1.14.x/applications/exo.jcr.ear/pom.xml 2010-04-01 09:24:31 UTC (rev 2202)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.1-GA-SNAPSHOT</version>
+ <version>1.14.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.ear</artifactId>
<packaging>ear</packaging>
Modified: jcr/branches/1.14.x/applications/pom.xml
===================================================================
--- jcr/branches/1.14.x/applications/pom.xml 2010-04-01 09:08:35 UTC (rev 2201)
+++ jcr/branches/1.14.x/applications/pom.xml 2010-04-01 09:24:31 UTC (rev 2202)
@@ -22,12 +22,12 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.1-GA-SNAPSHOT</version>
+ <version>1.14.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.1-GA-SNAPSHOT</version>
+ <version>1.14.0-Beta01-SNAPSHOT</version>
<name>eXo JCR :: Applications :: Reactor</name>
<packaging>pom</packaging>
Modified: jcr/branches/1.14.x/applications/product-exo-jcr-as-jboss-ear.xml
===================================================================
--- jcr/branches/1.14.x/applications/product-exo-jcr-as-jboss-ear.xml 2010-04-01 09:08:35 UTC (rev 2201)
+++ jcr/branches/1.14.x/applications/product-exo-jcr-as-jboss-ear.xml 2010-04-01 09:24:31 UTC (rev 2202)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.12.1-GA-SNAPSHOT</version>
+ <version>1.14.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -30,17 +30,17 @@
<packaging>jar</packaging>
<name>eXo JCR Product</name>
<url>http://www.exoplatform.org</url>
- <description>eXo JCR Product</description>
-
- <properties>
- <enforcer.skip>true</enforcer.skip>
+ <description>eXo JCR Product</description>
+
+ <properties>
+ <enforcer.skip>true</enforcer.skip>
</properties>
<dependencies>
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.ear</artifactId>
- <version>1.12.1-GA-SNAPSHOT</version>
+ <version>1.14.0-Beta01-SNAPSHOT</version>
<type>ear</type>
<scope>runtime</scope>
</dependency>
Modified: jcr/branches/1.14.x/applications/product-exo-jcr-as-jonas-ear.xml
===================================================================
--- jcr/branches/1.14.x/applications/product-exo-jcr-as-jonas-ear.xml 2010-04-01 09:08:35 UTC (rev 2201)
+++ jcr/branches/1.14.x/applications/product-exo-jcr-as-jonas-ear.xml 2010-04-01 09:24:31 UTC (rev 2202)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.12.1-GA-SNAPSHOT</version>
+ <version>1.14.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -30,17 +30,17 @@
<packaging>jar</packaging>
<name>eXo JCR Product</name>
<url>http://www.exoplatform.org</url>
- <description>eXo JCR Product</description>
-
- <properties>
- <enforcer.skip>true</enforcer.skip>
+ <description>eXo JCR Product</description>
+
+ <properties>
+ <enforcer.skip>true</enforcer.skip>
</properties>
<dependencies>
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.ear</artifactId>
- <version>1.12.1-GA-SNAPSHOT</version>
+ <version>1.14.0-Beta01-SNAPSHOT</version>
<type>ear</type>
<scope>runtime</scope>
</dependency>
Modified: jcr/branches/1.14.x/applications/product-exo-jcr-as-tomcat6.xml
===================================================================
--- jcr/branches/1.14.x/applications/product-exo-jcr-as-tomcat6.xml 2010-04-01 09:08:35 UTC (rev 2201)
+++ jcr/branches/1.14.x/applications/product-exo-jcr-as-tomcat6.xml 2010-04-01 09:24:31 UTC (rev 2202)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.12.1-GA-SNAPSHOT</version>
+ <version>1.14.0-Beta01-SNAPSHOT</version>
<relativePath>exo.jcr.applications.config</relativePath>
</parent>
@@ -32,7 +32,7 @@
<name>eXo JCR Product</name>
<url>http://www.exoplatform.org</url>
<description>eXo JCR Product</description>
-
+
<dependencies>
<dependency>
<groupId>hsqldb</groupId>
@@ -44,11 +44,11 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>runtime</scope>
</dependency>
- </dependencies>
-
- <properties>
- <enforcer.skip>true</enforcer.skip>
- </properties>
+ </dependencies>
+
+ <properties>
+ <enforcer.skip>true</enforcer.skip>
+ </properties>
<build>
<plugins>
Modified: jcr/branches/1.14.x/docs/pom.xml
===================================================================
--- jcr/branches/1.14.x/docs/pom.xml 2010-04-01 09:08:35 UTC (rev 2201)
+++ jcr/branches/1.14.x/docs/pom.xml 2010-04-01 09:24:31 UTC (rev 2202)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.1-GA-SNAPSHOT</version>
+ <version>1.14.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/branches/1.14.x/docs/reference/en/pom.xml
===================================================================
--- jcr/branches/1.14.x/docs/reference/en/pom.xml 2010-04-01 09:08:35 UTC (rev 2201)
+++ jcr/branches/1.14.x/docs/reference/en/pom.xml 2010-04-01 09:24:31 UTC (rev 2202)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>reference-docs</artifactId>
- <version>1.12.1-GA-SNAPSHOT</version>
+ <version>1.14.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/branches/1.14.x/docs/reference/pom.xml
===================================================================
--- jcr/branches/1.14.x/docs/reference/pom.xml 2010-04-01 09:08:35 UTC (rev 2201)
+++ jcr/branches/1.14.x/docs/reference/pom.xml 2010-04-01 09:24:31 UTC (rev 2202)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>docs</artifactId>
- <version>1.12.1-GA-SNAPSHOT</version>
+ <version>1.14.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/branches/1.14.x/docs/userguide/en/pom.xml
===================================================================
--- jcr/branches/1.14.x/docs/userguide/en/pom.xml 2010-04-01 09:08:35 UTC (rev 2201)
+++ jcr/branches/1.14.x/docs/userguide/en/pom.xml 2010-04-01 09:24:31 UTC (rev 2202)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>userguide-docs</artifactId>
- <version>1.12.1-GA-SNAPSHOT</version>
+ <version>1.14.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/branches/1.14.x/docs/userguide/pom.xml
===================================================================
--- jcr/branches/1.14.x/docs/userguide/pom.xml 2010-04-01 09:08:35 UTC (rev 2201)
+++ jcr/branches/1.14.x/docs/userguide/pom.xml 2010-04-01 09:24:31 UTC (rev 2202)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>docs</artifactId>
- <version>1.12.1-GA-SNAPSHOT</version>
+ <version>1.14.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/branches/1.14.x/exo.jcr.component.core/pom.xml
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.core/pom.xml 2010-04-01 09:08:35 UTC (rev 2201)
+++ jcr/branches/1.14.x/exo.jcr.component.core/pom.xml 2010-04-01 09:24:31 UTC (rev 2202)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.1-GA-SNAPSHOT</version>
+ <version>1.14.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.core</artifactId>
<name>eXo JCR :: Component :: Core Service</name>
Modified: jcr/branches/1.14.x/exo.jcr.component.ext/pom.xml
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.ext/pom.xml 2010-04-01 09:08:35 UTC (rev 2201)
+++ jcr/branches/1.14.x/exo.jcr.component.ext/pom.xml 2010-04-01 09:24:31 UTC (rev 2202)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.1-GA-SNAPSHOT</version>
+ <version>1.14.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.ext</artifactId>
<name>eXo JCR :: Component :: Extension Service</name>
Modified: jcr/branches/1.14.x/exo.jcr.component.ftp/pom.xml
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.ftp/pom.xml 2010-04-01 09:08:35 UTC (rev 2201)
+++ jcr/branches/1.14.x/exo.jcr.component.ftp/pom.xml 2010-04-01 09:24:31 UTC (rev 2202)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.1-GA-SNAPSHOT</version>
+ <version>1.14.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.ftp</artifactId>
<name>eXo JCR :: Component :: FTP Service</name>
Modified: jcr/branches/1.14.x/exo.jcr.component.webdav/pom.xml
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.webdav/pom.xml 2010-04-01 09:08:35 UTC (rev 2201)
+++ jcr/branches/1.14.x/exo.jcr.component.webdav/pom.xml 2010-04-01 09:24:31 UTC (rev 2202)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.1-GA-SNAPSHOT</version>
+ <version>1.14.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.webdav</artifactId>
<name>eXo JCR :: Component :: Webdav Service</name>
Modified: jcr/branches/1.14.x/exo.jcr.connectors.localadapter/pom.xml
===================================================================
--- jcr/branches/1.14.x/exo.jcr.connectors.localadapter/pom.xml 2010-04-01 09:08:35 UTC (rev 2201)
+++ jcr/branches/1.14.x/exo.jcr.connectors.localadapter/pom.xml 2010-04-01 09:24:31 UTC (rev 2202)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.1-GA-SNAPSHOT</version>
+ <version>1.14.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.connectors.localadapter</artifactId>
<packaging>rar</packaging>
Modified: jcr/branches/1.14.x/exo.jcr.connectors.localadapter/src/main/rar/META-INF/ra.xml
===================================================================
--- jcr/branches/1.14.x/exo.jcr.connectors.localadapter/src/main/rar/META-INF/ra.xml 2010-04-01 09:08:35 UTC (rev 2201)
+++ jcr/branches/1.14.x/exo.jcr.connectors.localadapter/src/main/rar/META-INF/ra.xml 2010-04-01 09:24:31 UTC (rev 2202)
@@ -25,7 +25,7 @@
<display-name>JCR repository</display-name>
<vendor-name>exoplatform</vendor-name>
<eis-type />
- <resourceadapter-version>1.12.1-GA-SNAPSHOT</resourceadapter-version>
+ <resourceadapter-version>1.14.0-Beta01-SNAPSHOT</resourceadapter-version>
<license>
<license-required>false</license-required>
</license>
Modified: jcr/branches/1.14.x/exo.jcr.framework.command/pom.xml
===================================================================
--- jcr/branches/1.14.x/exo.jcr.framework.command/pom.xml 2010-04-01 09:08:35 UTC (rev 2201)
+++ jcr/branches/1.14.x/exo.jcr.framework.command/pom.xml 2010-04-01 09:24:31 UTC (rev 2202)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.1-GA-SNAPSHOT</version>
+ <version>1.14.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.framework.command</artifactId>
<name>eXo JCR :: Framework :: Command</name>
Modified: jcr/branches/1.14.x/exo.jcr.framework.ftpclient/pom.xml
===================================================================
--- jcr/branches/1.14.x/exo.jcr.framework.ftpclient/pom.xml 2010-04-01 09:08:35 UTC (rev 2201)
+++ jcr/branches/1.14.x/exo.jcr.framework.ftpclient/pom.xml 2010-04-01 09:24:31 UTC (rev 2202)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.1-GA-SNAPSHOT</version>
+ <version>1.14.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.framework.ftpclient</artifactId>
<name>eXo JCR :: Framework :: FTP Client</name>
Modified: jcr/branches/1.14.x/exo.jcr.framework.web/pom.xml
===================================================================
--- jcr/branches/1.14.x/exo.jcr.framework.web/pom.xml 2010-04-01 09:08:35 UTC (rev 2201)
+++ jcr/branches/1.14.x/exo.jcr.framework.web/pom.xml 2010-04-01 09:24:31 UTC (rev 2202)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.1-GA-SNAPSHOT</version>
+ <version>1.14.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.framework.web</artifactId>
<name>eXo JCR :: Framework :: Web</name>
Modified: jcr/branches/1.14.x/packaging/module/pom.xml
===================================================================
--- jcr/branches/1.14.x/packaging/module/pom.xml 2010-04-01 09:08:35 UTC (rev 2201)
+++ jcr/branches/1.14.x/packaging/module/pom.xml 2010-04-01 09:24:31 UTC (rev 2202)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.1-GA-SNAPSHOT</version>
+ <version>1.14.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>jcr.packaging.module</artifactId>
<packaging>pom</packaging>
Modified: jcr/branches/1.14.x/pom.xml
===================================================================
--- jcr/branches/1.14.x/pom.xml 2010-04-01 09:08:35 UTC (rev 2201)
+++ jcr/branches/1.14.x/pom.xml 2010-04-01 09:24:31 UTC (rev 2202)
@@ -28,21 +28,21 @@
</parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.1-GA-SNAPSHOT</version>
+ <version>1.14.0-Beta01-SNAPSHOT</version>
<packaging>pom</packaging>
<name>eXo JCR</name>
<scm>
- <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>
+ <connection>scm:svn:https://anonsvn.jboss.org/repos/exo-jcr/jcr/branches/1.14.x/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/jcr/branches/1.14.x</developerConnection>
+ <url>http://fisheye.jboss.org/browse/exo-jcr/jcr/branches/1.14.x</url>
</scm>
<properties>
<exo.product.name>exo-jcr</exo.product.name>
<exo.product.specification>1.12</exo.product.specification>
<org.exoplatform.kernel.version>2.2.1-GA-SNAPSHOT</org.exoplatform.kernel.version>
<org.exoplatform.core.version>2.3.1-GA-SNAPSHOT</org.exoplatform.core.version>
- <org.exoplatform.ws.version>2.1.1-GA-SNAPSHOT</org.exoplatform.ws.version>
- <org.exoplatform.doc-style.version>2-SNAPSHOT</org.exoplatform.doc-style.version>
+ <org.exoplatform.ws.version>2.1.1-GA-SNAPSHOT</org.exoplatform.ws.version>
+ <org.exoplatform.doc-style.version>2-SNAPSHOT</org.exoplatform.doc-style.version>
</properties>
<dependencyManagement>
<dependencies>
14 years, 1 month
exo-jcr SVN: r2201 - in core: branches and 1 other directory.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-04-01 05:08:35 -0400 (Thu, 01 Apr 2010)
New Revision: 2201
Added:
core/branches/
core/branches/2.4.x/
Log:
EXOJCR-604 2.4.x branch added
Copied: core/branches/2.4.x (from rev 2200, core/trunk)
14 years, 1 month
exo-jcr SVN: r2200 - jcr/branches.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-04-01 04:58:24 -0400 (Thu, 01 Apr 2010)
New Revision: 2200
Added:
jcr/branches/1.14.x/
Log:
EXOJCR-604 1.14.x branch added
Copied: jcr/branches/1.14.x (from rev 2199, jcr/trunk)
14 years, 1 month