exo-jcr SVN: r4900 - in jcr/branches/1.12.x/patch/1.12.11-GA: JCR-1661 and 1 other directory.
by do-not-reply@jboss.org
Author: dkuleshov
Date: 2011-09-13 07:36:00 -0400 (Tue, 13 Sep 2011)
New Revision: 4900
Added:
jcr/branches/1.12.x/patch/1.12.11-GA/JCR-1661/
jcr/branches/1.12.x/patch/1.12.11-GA/JCR-1661/JCR-1661.patch
Log:
JCR-1661: patch added
Added: jcr/branches/1.12.x/patch/1.12.11-GA/JCR-1661/JCR-1661.patch
===================================================================
--- jcr/branches/1.12.x/patch/1.12.11-GA/JCR-1661/JCR-1661.patch (rev 0)
+++ jcr/branches/1.12.x/patch/1.12.11-GA/JCR-1661/JCR-1661.patch 2011-09-13 11:36:00 UTC (rev 4900)
@@ -0,0 +1,425 @@
+Index: exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestMultipleListenersNotifying.java
+===================================================================
+--- exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestMultipleListenersNotifying.java (revision 4874)
++++ exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestMultipleListenersNotifying.java (working copy)
+@@ -20,8 +20,14 @@
+
+ import org.exoplatform.services.jcr.dataflow.ItemStateChangesLog;
+ import org.exoplatform.services.jcr.dataflow.persistent.ItemsPersistenceListener;
++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.QPathEntry;
+ import org.exoplatform.services.jcr.impl.storage.SystemDataContainerHolder;
+
++import javax.jcr.RepositoryException;
++
+ /**
+ * Created by The eXo Platform SAS.
+ *
+@@ -39,6 +45,12 @@
+ {
+ super(null, new SystemDataContainerHolder(null));
+ }
++
++ public ItemData getItemData(NodeData parent, QPathEntry name, ItemType itemType, boolean createNullItemData)
++ throws RepositoryException
++ {
++ return null;
++ }
+ }
+
+ class Counter
+Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/ItemDataConsumer.java
+===================================================================
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/ItemDataConsumer.java (revision 4874)
++++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/ItemDataConsumer.java (working copy)
+@@ -70,6 +70,24 @@
+ ItemData getItemData(NodeData parent, QPathEntry name, ItemType itemType) throws RepositoryException;
+
+ /**
++ * Find Item by parent (id) and name (with path index) of defined type and create
++ * or not (defined by createNullItemData) null item data.
++ *
++ * @param parent
++ * NodeData
++ * @param name
++ * item name
++ * @param itemType
++ * itemType
++ * @param createNullItemData
++ * defines if NullItemData should be created
++ * @return ItemData, data by parent and name
++ * @throws RepositoryException
++ */
++ ItemData getItemData(NodeData parent, QPathEntry name, ItemType itemType, boolean createNullItemData)
++ throws RepositoryException;
++
++ /**
+ * Find Item by identifier.
+ *
+ * @param String identifier
+Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java
+===================================================================
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java (revision 4874)
++++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java (working copy)
+@@ -576,7 +576,7 @@
+
+ PropertyData prop =
+ (PropertyData)dataManager.getItemData(((NodeData)getData()), new QPathEntry(Constants.JCR_MIXINTYPES, 0),
+- ItemType.PROPERTY);
++ ItemType.PROPERTY, false);
+ ItemState state;
+
+ if (prop != null)
+@@ -1775,7 +1775,7 @@
+
+ for (PropertyDefinitionData pd : ntmanager.getAllPropertyDefinitions(removedName))
+ {
+- ItemData p = dataManager.getItemData(nodeData(), new QPathEntry(pd.getName(), 1), ItemType.PROPERTY);
++ ItemData p = dataManager.getItemData(nodeData(), new QPathEntry(pd.getName(), 1), ItemType.PROPERTY, false);
+ if (p != null && !p.isNode())
+ // remove it
+ dataManager.delete(p, ancestorToSave);
+@@ -2853,13 +2853,15 @@
+
+ int ind = 1;
+
+- NodeData sibling = (NodeData)dataManager.getItemData(parentNode, new QPathEntry(nameToAdd, ind), ItemType.NODE);
++ NodeData sibling =
++ (NodeData)dataManager.getItemData(parentNode, new QPathEntry(nameToAdd, ind), ItemType.NODE, false);
+ while (sibling != null)
+ {
+ if (allowSns)
+ {
+ ind++;
+- sibling = (NodeData)dataManager.getItemData(parentNode, new QPathEntry(nameToAdd, ind), ItemType.NODE);
++ sibling =
++ (NodeData)dataManager.getItemData(parentNode, new QPathEntry(nameToAdd, ind), ItemType.NODE, false);
+ }
+ else
+ {
+Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java
+===================================================================
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java (revision 4874)
++++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java (working copy)
+@@ -224,6 +224,12 @@
+ */
+ public ItemData getItemData(NodeData parent, QPathEntry name, ItemType itemType) throws RepositoryException
+ {
++ return getItemData(parent, name, itemType, true);
++ }
++
++ public ItemData getItemData(NodeData parent, QPathEntry name, ItemType itemType, boolean createNullItemData)
++ throws RepositoryException
++ {
+ if (name.getName().equals(JCRPath.PARENT_RELPATH) && name.getNamespace().equals(Constants.NS_DEFAULT_URI))
+ {
+ if (parent.getIdentifier().equals(Constants.ROOT_UUID))
+@@ -249,7 +255,7 @@
+ return null;
+ }
+ // 2. Try from txdatamanager
+- data = transactionableManager.getItemData(parent, name, itemType);
++ data = transactionableManager.getItemData(parent, name, itemType, createNullItemData);
+ }
+ else if (!state.isDeleted())
+ {
+@@ -328,6 +334,31 @@
+ public ItemImpl getItem(NodeData parent, QPathEntry name, boolean pool, ItemType itemType, boolean apiRead)
+ throws RepositoryException
+ {
++ return getItem(parent, name, pool, itemType, apiRead, true);
++ }
++
++ /**
++ * For internal use. Return Item by parent NodeDada and the name of searched item.
++ *
++ * @param parent
++ * - parent of the searched item
++ * @param name
++ * - item name
++ * @param itemType
++ * - item type
++ * @param pool
++ * - indicates does the item fall in pool
++ * @param apiRead
++ * - if true will call postRead Action and check permissions
++ * @param createNullItemData
++ * - defines if there is a need to create NullItemData
++ *
++ * @return existed item or null if not found
++ * @throws RepositoryException
++ */
++ public ItemImpl getItem(NodeData parent, QPathEntry name, boolean pool, ItemType itemType, boolean apiRead,
++ boolean createNullItemData) throws RepositoryException
++ {
+ long start = System.currentTimeMillis();
+ if (log.isDebugEnabled())
+ {
+@@ -337,7 +368,7 @@
+ ItemImpl item = null;
+ try
+ {
+- return item = readItem(getItemData(parent, name, itemType), parent, pool, apiRead);
++ return item = readItem(getItemData(parent, name, itemType, createNullItemData), parent, pool, apiRead);
+ }
+ finally
+ {
+Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/ItemAutocreator.java
+===================================================================
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/ItemAutocreator.java (revision 4874)
++++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/ItemAutocreator.java (working copy)
+@@ -118,7 +118,7 @@
+ {
+ final ItemData pdata =
+ avoidCheckExistedChildItems ? null : targetDataManager.getItemData(parent, new QPathEntry(
+- ndef.getName(), 0), ItemType.NODE);
++ ndef.getName(), 0), ItemType.NODE, false);
+ if (pdata == null && !addedNodes.contains(ndef.getName()) || pdata != null && !pdata.isNode())
+ {
+
+@@ -163,7 +163,7 @@
+
+ final ItemData pdata =
+ avoidCheckExistedChildItems ? null : targetDataManager.getItemData(parent, new QPathEntry(
+- pdef.getName(), 0), ItemType.PROPERTY);
++ pdef.getName(), 0), ItemType.PROPERTY, false);
+ if (pdata == null && !addedProperties.contains(pdef.getName()) || pdata != null && pdata.isNode())
+ {
+
+Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ItemImpl.java
+===================================================================
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ItemImpl.java (revision 4874)
++++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ItemImpl.java (working copy)
+@@ -419,7 +419,8 @@
+ PropertyImpl prevProp;
+ PropertyDefinitionDatas defs;
+ ItemImpl prevItem =
+- dataManager.getItem(parentNode.nodeData(), new QPathEntry(propertyName, 0), true, ItemType.PROPERTY);
++ dataManager.getItem(parentNode.nodeData(), new QPathEntry(propertyName, 0), true, ItemType.PROPERTY, true,
++ false);
+
+ NodeTypeDataManager ntm = session.getWorkspace().getNodeTypesHolder();
+ NodeData parentData = (NodeData)parentNode.getData();
+Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java
+===================================================================
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java (revision 4874)
++++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java (working copy)
+@@ -229,7 +229,7 @@
+ ItemData sameNameNode = null;
+ try
+ {
+- sameNameNode = dataConsumer.getItemData(parentData, new QPathEntry(name, 0), ItemType.NODE);
++ sameNameNode = dataConsumer.getItemData(parentData, new QPathEntry(name, 0), ItemType.NODE, false);
+ }
+ catch (PathNotFoundException e)
+ {
+Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/LocalWorkspaceStorageDataManagerProxy.java
+===================================================================
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/LocalWorkspaceStorageDataManagerProxy.java (revision 4874)
++++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/LocalWorkspaceStorageDataManagerProxy.java (working copy)
+@@ -119,6 +119,15 @@
+ /**
+ * {@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));
+Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/TransactionableDataManager.java
+===================================================================
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/TransactionableDataManager.java (revision 4874)
++++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/TransactionableDataManager.java (working copy)
+@@ -254,6 +254,15 @@
+ */
+ public ItemData getItemData(NodeData parentData, QPathEntry name, ItemType itemType) throws RepositoryException
+ {
++ return getItemData(parentData, name, itemType, true);
++ }
++
++ /**
++ * {@inheritDoc}
++ */
++ public ItemData getItemData(NodeData parentData, QPathEntry name, ItemType itemType, boolean createNullItemData)
++ throws RepositoryException
++ {
+ ItemData data = null;
+ if (txStarted())
+ {
+@@ -269,7 +278,7 @@
+ }
+ else
+ {
+- return storageDataManager.getItemData(parentData, name, itemType);
++ return storageDataManager.getItemData(parentData, name, itemType, createNullItemData);
+ }
+ }
+
+Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java
+===================================================================
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java (revision 4874)
++++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java (working copy)
+@@ -139,15 +139,24 @@
+ @Override
+ public ItemData getItemData(NodeData parentData, QPathEntry name, ItemType itemType) throws RepositoryException
+ {
++ return getItemData(parentData, name, itemType, true);
++ }
++
++ /**
++ * {@inheritDoc}
++ */
++ public ItemData getItemData(NodeData parentData, QPathEntry name, ItemType itemType, boolean createNullItemData)
++ throws RepositoryException
++ {
+ if (parentData != null)
+ {
+ final QPath ipath = QPath.makeChildPath(parentData.getQPath(), name);
+ if (isSystemDescendant(ipath) && !this.equals(versionDataManager))
+ {
+- return versionDataManager.getItemData(parentData, name, itemType);
++ return versionDataManager.getItemData(parentData, name, itemType, createNullItemData);
+ }
+ }
+- return super.getItemData(parentData, name, itemType);
++ return super.getItemData(parentData, name, itemType, createNullItemData);
+ }
+
+ /**
+Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/ACLInheritanceSupportedWorkspaceDataManager.java
+===================================================================
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/ACLInheritanceSupportedWorkspaceDataManager.java (revision 4874)
++++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/ACLInheritanceSupportedWorkspaceDataManager.java (working copy)
+@@ -182,9 +182,19 @@
+ /**
+ * {@inheritDoc}
+ */
+- public ItemData getItemData(NodeData parent, QPathEntry name, ItemType itemType) throws RepositoryException
++ public ItemData getItemData(NodeData parent, QPathEntry name, ItemType itemType)
++ throws RepositoryException
+ {
+- final ItemData item = persistentManager.getItemData(parent, name, itemType);
++ return getItemData(parent, name, itemType, true);
++ }
++
++ /**
++ * {@inheritDoc}
++ */
++ public ItemData getItemData(NodeData parent, QPathEntry name, ItemType itemType, boolean createNullItemData)
++ throws RepositoryException
++ {
++ final ItemData item = persistentManager.getItemData(parent, name, itemType, createNullItemData);
+ return item != null && item.isNode() ? initACL(parent, (NodeData)item) : item;
+ }
+
+Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/BufferedJBossCache.java
+===================================================================
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/BufferedJBossCache.java (revision 4874)
++++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/BufferedJBossCache.java (working copy)
+@@ -994,7 +994,8 @@
+ LOG.error("Unexpected object found by FQN:" + getFqn() + " and key:" + key + ". Expected Set, but found:"
+ + existingObject.getClass().getName());
+ }
+- else if (!localMode && cache.getConfiguration().getCacheMode() != CacheMode.LOCAL)
++ else if (!localMode && cache.getConfiguration().getCacheMode() != CacheMode.LOCAL
++ && cache.getMembers().size() > 1)
+ {
+ // to prevent consistency issue since we don't have the list in the local cache, we are in cluster env
+ // and we are in a non local mode, we clear the list in order to enforce other cluster nodes to reload it from the db
+@@ -1029,7 +1030,7 @@
+ @Override
+ public void apply()
+ {
+- if (!localMode && cache.getConfiguration().getCacheMode() != CacheMode.LOCAL)
++ if (!localMode && cache.getConfiguration().getCacheMode() != CacheMode.LOCAL && cache.getMembers().size() > 1)
+ {
+ // to prevent consistency issue since we don't have the list in the local cache, we are in cluster env
+ // and we are in a non local mode, we remove all the patterns in order to enforce other cluster nodes to reload them from the db
+Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java
+===================================================================
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java (revision 4874)
++++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java (working copy)
+@@ -402,7 +402,16 @@
+ @Override
+ public ItemData getItemData(NodeData parentData, QPathEntry name, ItemType itemType) throws RepositoryException
+ {
++ return getItemData(parentData, name, itemType, true);
++ }
+
++ /**
++ * {@inheritDoc}
++ */
++ public ItemData getItemData(NodeData parentData, QPathEntry name, ItemType itemType, boolean createNullItemData)
++ throws RepositoryException
++ {
++
+ // 1. Try from cache
+ ItemData data = getCachedItemData(parentData, name, itemType);
+
+@@ -419,7 +428,7 @@
+ data = getCachedItemData(parentData, name, itemType);
+ if (data == null)
+ {
+- data = getPersistedItemData(parentData, name, itemType);
++ data = getPersistedItemData(parentData, name, itemType, createNullItemData);
+ }
+ }
+ finally
+@@ -755,11 +764,36 @@
+ protected ItemData getPersistedItemData(NodeData parentData, QPathEntry name, ItemType itemType)
+ throws RepositoryException
+ {
++ return getPersistedItemData(parentData, name, itemType, true);
++ }
++
++ /**
++ * Get persisted ItemData.
++ *
++ * @param parentData
++ * parent
++ * @param name
++ * Item name
++ * @param itemType
++ * item type
++ * @param createNullItemData
++ * indicates if we need to create NullItemData
++ * @return ItemData
++ * @throws RepositoryException
++ * error
++ */
++ protected ItemData getPersistedItemData(NodeData parentData, QPathEntry name, ItemType itemType,
++ boolean createNullItemData) throws RepositoryException
++ {
+ ItemData data = super.getItemData(parentData, name, itemType);
+ if (cache.isEnabled())
+ {
+- if (data == null)
++ if (data != null)
+ {
++ cache.put(data);
++ }
++ else if (createNullItemData)
++ {
+ if (itemType == ItemType.NODE || itemType == ItemType.UNKNOWN)
+ {
+ cache.put(new NullNodeData(parentData, name));
+@@ -769,10 +803,6 @@
+ cache.put(new NullPropertyData(parentData, name));
+ }
+ }
+- else
+- {
+- cache.put(data);
+- }
+ }
+ return data;
+ }
14 years, 7 months
exo-jcr SVN: r4899 - in core/trunk: exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap and 1 other directory.
by do-not-reply@jboss.org
Author: tolusha
Date: 2011-09-13 03:04:41 -0400 (Tue, 13 Sep 2011)
New Revision: 4899
Modified:
core/trunk/exo.core.component.ldap/src/main/java/org/exoplatform/services/ldap/impl/LDAPServiceImpl.java
core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ADUserDAOImpl.java
core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java
core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/OrganizationLdapInitializer.java
Log:
EXOJCR-1530: Connections leaks in LDAP OrganizationService
Modified: core/trunk/exo.core.component.ldap/src/main/java/org/exoplatform/services/ldap/impl/LDAPServiceImpl.java
===================================================================
--- core/trunk/exo.core.component.ldap/src/main/java/org/exoplatform/services/ldap/impl/LDAPServiceImpl.java 2011-09-13 06:47:47 UTC (rev 4898)
+++ core/trunk/exo.core.component.ldap/src/main/java/org/exoplatform/services/ldap/impl/LDAPServiceImpl.java 2011-09-13 07:04:41 UTC (rev 4899)
@@ -84,9 +84,9 @@
env.put(Context.SECURITY_AUTHENTICATION, config.getAuthenticationType());
env.put(Context.SECURITY_PRINCIPAL, config.getRootDN());
env.put(Context.SECURITY_CREDENTIALS, config.getPassword());
- // TODO move it in configuration ?
- env.put("com.sun.jndi.ldap.connect.timeout", "60000");
+ PrivilegedSystemHelper.setProperty("com.sun.jndi.ldap.connect.timeout", "60000");
+
if (config.getMinConnection() > 0)
{
PrivilegedSystemHelper.setProperty("com.sun.jndi.ldap.connect.pool.initsize",
@@ -252,13 +252,19 @@
SearchControls constraints = new SearchControls();
constraints.setSearchScope(SearchControls.ONELEVEL_SCOPE);
NamingEnumeration<SearchResult> results = ctx.search(name, "(objectclass=*)", constraints);
- while (results.hasMore())
+ try
{
- SearchResult sr = results.next();
- unbind(ctx, sr.getNameInNamespace());
+ while (results.hasMore())
+ {
+ SearchResult sr = results.next();
+ unbind(ctx, sr.getNameInNamespace());
+ }
+ // close search results enumeration
}
- // close search results enumeration
- results.close();
+ finally
+ {
+ results.close();
+ }
ctx.unbind(name);
}
Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ADUserDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ADUserDAOImpl.java 2011-09-13 06:47:47 UTC (rev 4898)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ADUserDAOImpl.java 2011-09-13 07:04:41 UTC (rev 4899)
@@ -123,24 +123,24 @@
@Override
protected void saveUserPassword(User user, String userDN) throws Exception
{
- Object v = ldapService.getLdapContext().getEnvironment().get(Context.SECURITY_PROTOCOL);
- if (v == null)
- return;
- String security = String.valueOf(v);
- if (!security.equalsIgnoreCase("ssl"))
- return;
- String newQuotedPassword = "\"" + user.getPassword() + "\"";
- byte[] newUnicodePassword = newQuotedPassword.getBytes("UTF-16LE");
- ModificationItem[] mods = new ModificationItem[2];
- mods[0] =
- new ModificationItem(DirContext.REPLACE_ATTRIBUTE, new BasicAttribute(ldapAttrMapping.userPassword,
- newUnicodePassword));
- mods[1] =
- new ModificationItem(DirContext.REPLACE_ATTRIBUTE, new BasicAttribute("userAccountControl", Integer
- .toString(UF_NORMAL_ACCOUNT + UF_PASSWORD_EXPIRED)));
LdapContext ctx = ldapService.getLdapContext();
try
{
+ Object v = ctx.getEnvironment().get(Context.SECURITY_PROTOCOL);
+ if (v == null)
+ return;
+ String security = String.valueOf(v);
+ if (!security.equalsIgnoreCase("ssl"))
+ return;
+ String newQuotedPassword = "\"" + user.getPassword() + "\"";
+ byte[] newUnicodePassword = newQuotedPassword.getBytes("UTF-16LE");
+ ModificationItem[] mods = new ModificationItem[2];
+ mods[0] =
+ new ModificationItem(DirContext.REPLACE_ATTRIBUTE, new BasicAttribute(ldapAttrMapping.userPassword,
+ newUnicodePassword));
+ mods[1] =
+ new ModificationItem(DirContext.REPLACE_ATTRIBUTE, new BasicAttribute("userAccountControl",
+ Integer.toString(UF_NORMAL_ACCOUNT + UF_PASSWORD_EXPIRED)));
for (int err = 0;; err++)
{
try
Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java 2011-09-13 06:47:47 UTC (rev 4898)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java 2011-09-13 07:04:41 UTC (rev 4899)
@@ -432,15 +432,23 @@
+ ldapAttrMapping.membershipTypeMemberValue + "=" + userDN + "))";
NamingEnumeration<SearchResult> results = findMembershipsInGroup(ctx, groupId, filter);
- if (results.hasMoreElements())
+ try
{
- // SearchResult sr = results.next();
- // if (haveUser(sr.getAttributes(), userDN)) {
- // membership = createMembershipObject(userName, groupId, type);
- // }
- membership = createMembershipObject(userName, groupId, type);
+ if (results.hasMoreElements())
+ {
+ // SearchResult sr = results.next();
+ // if (haveUser(sr.getAttributes(), userDN)) {
+ // membership = createMembershipObject(userName, groupId, type);
+ // }
+ membership = createMembershipObject(userName, groupId, type);
+ }
}
+ finally
+ {
+ results.close();
+ }
+
if (membership != null)
{
cacheHandler.put(cacheHandler.getMembershipKey(membership), membership, CacheType.MEMBERSHIP);
Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/OrganizationLdapInitializer.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/OrganizationLdapInitializer.java 2011-09-13 06:47:47 UTC (rev 4898)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/OrganizationLdapInitializer.java 2011-09-13 07:04:41 UTC (rev 4899)
@@ -27,7 +27,10 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import javax.naming.NamingEnumeration;
import javax.naming.directory.BasicAttributes;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
import javax.naming.ldap.LdapContext;
/**
@@ -67,36 +70,57 @@
Matcher matcher = pattern.matcher(dn);
dn = matcher.replaceAll("=");
LdapContext context = baseHandler.ldapService.getLdapContext();
- String[] explodeDN = baseHandler.explodeDN(dn, false);
- if (explodeDN.length < 1)
- return;
- dn = explodeDN[explodeDN.length - 1];
- int i = explodeDN.length - 2;
- for (; i > -1; i--)
+ try
{
- if (!explodeDN[i].toLowerCase().startsWith("dc="))
- break;
- dn = explodeDN[i] + "," + dn;
+ String[] explodeDN = baseHandler.explodeDN(dn, false);
+ if (explodeDN.length < 1)
+ return;
+ dn = explodeDN[explodeDN.length - 1];
+ int i = explodeDN.length - 2;
+ for (; i > -1; i--)
+ {
+ if (!explodeDN[i].toLowerCase().startsWith("dc="))
+ break;
+ dn = explodeDN[i] + "," + dn;
+ }
+ createDN(dn, context);
+ for (; i > -1; i--)
+ {
+ dn = explodeDN[i] + "," + dn;
+ createDN(dn, context);
+ }
}
- createDN(dn, context);
- for (; i > -1; i--)
+ finally
{
- dn = explodeDN[i] + "," + dn;
- createDN(dn, context);
+ baseHandler.ldapService.release(context);
}
}
private void createDN(String dn, LdapContext context) throws Exception
{
+ NamingEnumeration<SearchResult> results = null;
try
{
- Object obj = context.lookupLink(dn);
- if (obj != null)
+ SearchControls control = new SearchControls();
+ control.setSearchScope(SearchControls.OBJECT_SCOPE);
+ results = context.search(dn, "(objectClass=*)", control);
+
+ if (results.hasMoreElements())
+ {
return;
+ }
}
catch (Exception exp)
{
}
+ finally
+ {
+ if (results != null)
+ {
+ results.close();
+ }
+ }
+
String nameValue = dn.substring(dn.indexOf("=") + 1, dn.indexOf(","));
BasicAttributes attrs = new BasicAttributes();
if (dn.toLowerCase().startsWith("ou="))
@@ -139,33 +163,40 @@
LdapContext context = baseHandler.ldapService.getLdapContext();
- String[] edn = baseHandler.explodeDN(dn, false);
- String[] ebasedn = baseHandler.explodeDN(basedn, false);
+ try
+ {
+ String[] edn = baseHandler.explodeDN(dn, false);
+ String[] ebasedn = baseHandler.explodeDN(basedn, false);
- if (edn.length < 1)
- throw new IllegalArgumentException("Zerro DN length, [" + dn + "]");
- if (ebasedn.length < 1)
- throw new IllegalArgumentException("Zerro Base DN length, [" + basedn + "]");
- if (edn.length < ebasedn.length)
- throw new IllegalArgumentException("DN length smaller Base DN [" + dn + " >= " + basedn + "]");
+ if (edn.length < 1)
+ throw new IllegalArgumentException("Zerro DN length, [" + dn + "]");
+ if (ebasedn.length < 1)
+ throw new IllegalArgumentException("Zerro Base DN length, [" + basedn + "]");
+ if (edn.length < ebasedn.length)
+ throw new IllegalArgumentException("DN length smaller Base DN [" + dn + " >= " + basedn + "]");
- String rdn = basedn;
- for (int i = 1; i <= edn.length; i++)
- {
- // for (int i=edn.length - 1; i>=0; i--) {
- String n = edn[edn.length - i];
- if (i <= ebasedn.length)
+ String rdn = basedn;
+ for (int i = 1; i <= edn.length; i++)
{
- String bn = ebasedn[ebasedn.length - i];
- if (!n.equals(bn))
- throw new IllegalArgumentException("DN does not starts with Base DN [" + dn + " != " + basedn + "]");
+ // for (int i=edn.length - 1; i>=0; i--) {
+ String n = edn[edn.length - i];
+ if (i <= ebasedn.length)
+ {
+ String bn = ebasedn[ebasedn.length - i];
+ if (!n.equals(bn))
+ throw new IllegalArgumentException("DN does not starts with Base DN [" + dn + " != " + basedn + "]");
+ }
+ else
+ {
+ // create RDN elem
+ rdn = n + "," + rdn;
+ createDN(rdn, context);
+ }
}
- else
- {
- // create RDN elem
- rdn = n + "," + rdn;
- createDN(rdn, context);
- }
}
+ finally
+ {
+ baseHandler.ldapService.release(context);
+ }
}
}
14 years, 7 months
exo-jcr SVN: r4898 - core/branches/2.3.x/patch/2.3.10/COR-237.
by do-not-reply@jboss.org
Author: tolusha
Date: 2011-09-13 02:47:47 -0400 (Tue, 13 Sep 2011)
New Revision: 4898
Modified:
core/branches/2.3.x/patch/2.3.10/COR-237/COR-237.patch
Log:
COR-237: patch updated
Modified: core/branches/2.3.x/patch/2.3.10/COR-237/COR-237.patch
===================================================================
--- core/branches/2.3.x/patch/2.3.10/COR-237/COR-237.patch 2011-09-12 15:58:06 UTC (rev 4897)
+++ core/branches/2.3.x/patch/2.3.10/COR-237/COR-237.patch 2011-09-13 06:47:47 UTC (rev 4898)
@@ -1,11 +1,16 @@
Index: exo.core.component.ldap/src/main/java/org/exoplatform/services/ldap/impl/LDAPServiceImpl.java
===================================================================
---- exo.core.component.ldap/src/main/java/org/exoplatform/services/ldap/impl/LDAPServiceImpl.java (revision 4816)
+--- exo.core.component.ldap/src/main/java/org/exoplatform/services/ldap/impl/LDAPServiceImpl.java (revision 4888)
+++ exo.core.component.ldap/src/main/java/org/exoplatform/services/ldap/impl/LDAPServiceImpl.java (working copy)
-@@ -86,6 +86,17 @@
- // TODO move it in configuration ?
- env.put("com.sun.jndi.ldap.connect.timeout", "60000");
+@@ -83,9 +83,20 @@
+ env.put(Context.SECURITY_AUTHENTICATION, config.getAuthenticationType());
+ env.put(Context.SECURITY_PRINCIPAL, config.getRootDN());
+ env.put(Context.SECURITY_CREDENTIALS, config.getPassword());
+- // TODO move it in configuration ?
+- env.put("com.sun.jndi.ldap.connect.timeout", "60000");
++ System.setProperty("com.sun.jndi.ldap.connect.timeout", "60000");
++
+ if (config.getMinConnection() > 0)
+ {
+ System.setProperty("com.sun.jndi.ldap.connect.pool.initsize", Integer.toString(config.getMinConnection()));
@@ -20,3 +25,258 @@
env.put("com.sun.jndi.ldap.connect.pool", "true");
env.put("java.naming.ldap.version", config.getVerion());
env.put("java.naming.ldap.attributes.binary", "tokenGroups");
+@@ -239,13 +250,19 @@
+ SearchControls constraints = new SearchControls();
+ constraints.setSearchScope(SearchControls.ONELEVEL_SCOPE);
+ NamingEnumeration<SearchResult> results = ctx.search(name, "(objectclass=*)", constraints);
+- while (results.hasMore())
++ try
+ {
+- SearchResult sr = results.next();
+- unbind(ctx, sr.getNameInNamespace());
++ while (results.hasMore())
++ {
++ SearchResult sr = results.next();
++ unbind(ctx, sr.getNameInNamespace());
++ }
++ // close search results enumeration
+ }
+- // close search results enumeration
+- results.close();
++ finally
++ {
++ results.close();
++ }
+ ctx.unbind(name);
+ }
+
+Index: exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java
+===================================================================
+--- exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java (revision 4888)
++++ exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java (working copy)
+@@ -401,15 +401,23 @@
+ + ldapAttrMapping.membershipTypeMemberValue + "=" + userDN + "))";
+
+ NamingEnumeration<SearchResult> results = findMembershipsInGroup(ctx, groupId, filter);
+- if (results.hasMoreElements())
++ try
+ {
+- // SearchResult sr = results.next();
+- // if (haveUser(sr.getAttributes(), userDN)) {
+- // membership = createMembershipObject(userName, groupId, type);
+- // }
+- membership = createMembershipObject(userName, groupId, type);
++ if (results.hasMoreElements())
++ {
++ // SearchResult sr = results.next();
++ // if (haveUser(sr.getAttributes(), userDN)) {
++ // membership = createMembershipObject(userName, groupId, type);
++ // }
++ membership = createMembershipObject(userName, groupId, type);
++ }
+ }
++ finally
++ {
++ results.close();
++ }
+
++
+ if (membership != null)
+ {
+ cacheHandler.put(cacheHandler.getMembershipKey(membership), membership, CacheType.MEMBERSHIP);
+Index: exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/OrganizationLdapInitializer.java
+===================================================================
+--- exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/OrganizationLdapInitializer.java (revision 4888)
++++ exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/OrganizationLdapInitializer.java (working copy)
+@@ -27,7 +27,10 @@
+ import java.util.regex.Matcher;
+ import java.util.regex.Pattern;
+
++import javax.naming.NamingEnumeration;
+ import javax.naming.directory.BasicAttributes;
++import javax.naming.directory.SearchControls;
++import javax.naming.directory.SearchResult;
+ import javax.naming.ldap.LdapContext;
+
+ /**
+@@ -67,36 +70,57 @@
+ Matcher matcher = pattern.matcher(dn);
+ dn = matcher.replaceAll("=");
+ LdapContext context = baseHandler.ldapService.getLdapContext();
+- String[] explodeDN = baseHandler.explodeDN(dn, false);
+- if (explodeDN.length < 1)
+- return;
+- dn = explodeDN[explodeDN.length - 1];
+- int i = explodeDN.length - 2;
+- for (; i > -1; i--)
++ try
+ {
+- if (!explodeDN[i].toLowerCase().startsWith("dc="))
+- break;
+- dn = explodeDN[i] + "," + dn;
++ String[] explodeDN = baseHandler.explodeDN(dn, false);
++ if (explodeDN.length < 1)
++ return;
++ dn = explodeDN[explodeDN.length - 1];
++ int i = explodeDN.length - 2;
++ for (; i > -1; i--)
++ {
++ if (!explodeDN[i].toLowerCase().startsWith("dc="))
++ break;
++ dn = explodeDN[i] + "," + dn;
++ }
++ createDN(dn, context);
++ for (; i > -1; i--)
++ {
++ dn = explodeDN[i] + "," + dn;
++ createDN(dn, context);
++ }
+ }
+- createDN(dn, context);
+- for (; i > -1; i--)
++ finally
+ {
+- dn = explodeDN[i] + "," + dn;
+- createDN(dn, context);
++ baseHandler.ldapService.release(context);
+ }
+ }
+
+ private void createDN(String dn, LdapContext context) throws Exception
+ {
++ NamingEnumeration<SearchResult> results = null;
+ try
+ {
+- Object obj = context.lookupLink(dn);
+- if (obj != null)
++ SearchControls control = new SearchControls();
++ control.setSearchScope(SearchControls.OBJECT_SCOPE);
++ results = context.search(dn, "(objectClass=*)", control);
++
++ if (results.hasMoreElements())
++ {
+ return;
++ }
+ }
+ catch (Exception exp)
+ {
+ }
++ finally
++ {
++ if (results != null)
++ {
++ results.close();
++ }
++ }
++
+ String nameValue = dn.substring(dn.indexOf("=") + 1, dn.indexOf(","));
+ BasicAttributes attrs = new BasicAttributes();
+ if (dn.toLowerCase().startsWith("ou="))
+@@ -139,33 +163,40 @@
+
+ LdapContext context = baseHandler.ldapService.getLdapContext();
+
+- String[] edn = baseHandler.explodeDN(dn, false);
+- String[] ebasedn = baseHandler.explodeDN(basedn, false);
++ try
++ {
++ String[] edn = baseHandler.explodeDN(dn, false);
++ String[] ebasedn = baseHandler.explodeDN(basedn, false);
+
+- if (edn.length < 1)
+- throw new IllegalArgumentException("Zerro DN length, [" + dn + "]");
+- if (ebasedn.length < 1)
+- throw new IllegalArgumentException("Zerro Base DN length, [" + basedn + "]");
+- if (edn.length < ebasedn.length)
+- throw new IllegalArgumentException("DN length smaller Base DN [" + dn + " >= " + basedn + "]");
++ if (edn.length < 1)
++ throw new IllegalArgumentException("Zerro DN length, [" + dn + "]");
++ if (ebasedn.length < 1)
++ throw new IllegalArgumentException("Zerro Base DN length, [" + basedn + "]");
++ if (edn.length < ebasedn.length)
++ throw new IllegalArgumentException("DN length smaller Base DN [" + dn + " >= " + basedn + "]");
+
+- String rdn = basedn;
+- for (int i = 1; i <= edn.length; i++)
+- {
+- // for (int i=edn.length - 1; i>=0; i--) {
+- String n = edn[edn.length - i];
+- if (i <= ebasedn.length)
++ String rdn = basedn;
++ for (int i = 1; i <= edn.length; i++)
+ {
+- String bn = ebasedn[ebasedn.length - i];
+- if (!n.equals(bn))
+- throw new IllegalArgumentException("DN does not starts with Base DN [" + dn + " != " + basedn + "]");
++ // for (int i=edn.length - 1; i>=0; i--) {
++ String n = edn[edn.length - i];
++ if (i <= ebasedn.length)
++ {
++ String bn = ebasedn[ebasedn.length - i];
++ if (!n.equals(bn))
++ throw new IllegalArgumentException("DN does not starts with Base DN [" + dn + " != " + basedn + "]");
++ }
++ else
++ {
++ // create RDN elem
++ rdn = n + "," + rdn;
++ createDN(rdn, context);
++ }
+ }
+- else
+- {
+- // create RDN elem
+- rdn = n + "," + rdn;
+- createDN(rdn, context);
+- }
+ }
++ finally
++ {
++ baseHandler.ldapService.release(context);
++ }
+ }
+ }
+Index: exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ADUserDAOImpl.java
+===================================================================
+--- exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ADUserDAOImpl.java (revision 4888)
++++ exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ADUserDAOImpl.java (working copy)
+@@ -123,24 +123,24 @@
+ @Override
+ protected void saveUserPassword(User user, String userDN) throws Exception
+ {
+- Object v = ldapService.getLdapContext().getEnvironment().get(Context.SECURITY_PROTOCOL);
+- if (v == null)
+- return;
+- String security = String.valueOf(v);
+- if (!security.equalsIgnoreCase("ssl"))
+- return;
+- String newQuotedPassword = "\"" + user.getPassword() + "\"";
+- byte[] newUnicodePassword = newQuotedPassword.getBytes("UTF-16LE");
+- ModificationItem[] mods = new ModificationItem[2];
+- mods[0] =
+- new ModificationItem(DirContext.REPLACE_ATTRIBUTE, new BasicAttribute(ldapAttrMapping.userPassword,
+- newUnicodePassword));
+- mods[1] =
+- new ModificationItem(DirContext.REPLACE_ATTRIBUTE, new BasicAttribute("userAccountControl", Integer
+- .toString(UF_NORMAL_ACCOUNT + UF_PASSWORD_EXPIRED)));
+ LdapContext ctx = ldapService.getLdapContext();
+ try
+ {
++ Object v = ctx.getEnvironment().get(Context.SECURITY_PROTOCOL);
++ if (v == null)
++ return;
++ String security = String.valueOf(v);
++ if (!security.equalsIgnoreCase("ssl"))
++ return;
++ String newQuotedPassword = "\"" + user.getPassword() + "\"";
++ byte[] newUnicodePassword = newQuotedPassword.getBytes("UTF-16LE");
++ ModificationItem[] mods = new ModificationItem[2];
++ mods[0] =
++ new ModificationItem(DirContext.REPLACE_ATTRIBUTE, new BasicAttribute(ldapAttrMapping.userPassword,
++ newUnicodePassword));
++ mods[1] =
++ new ModificationItem(DirContext.REPLACE_ATTRIBUTE, new BasicAttribute("userAccountControl",
++ Integer.toString(UF_NORMAL_ACCOUNT + UF_PASSWORD_EXPIRED)));
+ for (int err = 0;; err++)
+ {
+ try
14 years, 7 months
exo-jcr SVN: r4897 - in core/branches/2.4.0-GA-CP02-SNAPSHOT: exo.core.component.database and 10 other directories.
by do-not-reply@jboss.org
Author: tolusha
Date: 2011-09-12 11:58:06 -0400 (Mon, 12 Sep 2011)
New Revision: 4897
Modified:
core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.database/pom.xml
core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.document/pom.xml
core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.ldap/pom.xml
core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.api/pom.xml
core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.jdbc/pom.xml
core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.ldap/pom.xml
core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.script.groovy/pom.xml
core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.security.core/pom.xml
core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.web.css/pom.xml
core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.xml-processing/pom.xml
core/branches/2.4.0-GA-CP02-SNAPSHOT/packaging/module/pom.xml
core/branches/2.4.0-GA-CP02-SNAPSHOT/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.database/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.database/pom.xml 2011-09-12 15:57:39 UTC (rev 4896)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.database/pom.xml 2011-09-12 15:58:06 UTC (rev 4897)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA-CP02</version>
+ <version>2.4.1-GA-CP02-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.database</artifactId>
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.document/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.document/pom.xml 2011-09-12 15:57:39 UTC (rev 4896)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.document/pom.xml 2011-09-12 15:58:06 UTC (rev 4897)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA-CP02</version>
+ <version>2.4.1-GA-CP02-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.document</artifactId>
<name>eXo Core :: Component :: Demo Service</name>
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.ldap/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.ldap/pom.xml 2011-09-12 15:57:39 UTC (rev 4896)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.ldap/pom.xml 2011-09-12 15:58:06 UTC (rev 4897)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA-CP02</version>
+ <version>2.4.1-GA-CP02-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.ldap</artifactId>
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.api/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.api/pom.xml 2011-09-12 15:57:39 UTC (rev 4896)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.api/pom.xml 2011-09-12 15:58:06 UTC (rev 4897)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA-CP02</version>
+ <version>2.4.1-GA-CP02-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.organization.api</artifactId>
<name>eXo Core :: Component :: Organization Service API</name>
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.jdbc/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.jdbc/pom.xml 2011-09-12 15:57:39 UTC (rev 4896)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.jdbc/pom.xml 2011-09-12 15:58:06 UTC (rev 4897)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA-CP02</version>
+ <version>2.4.1-GA-CP02-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.organization.jdbc</artifactId>
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.ldap/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.ldap/pom.xml 2011-09-12 15:57:39 UTC (rev 4896)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.ldap/pom.xml 2011-09-12 15:58:06 UTC (rev 4897)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA-CP02</version>
+ <version>2.4.1-GA-CP02-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.organization.ldap</artifactId>
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.script.groovy/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.script.groovy/pom.xml 2011-09-12 15:57:39 UTC (rev 4896)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.script.groovy/pom.xml 2011-09-12 15:58:06 UTC (rev 4897)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA-CP02</version>
+ <version>2.4.1-GA-CP02-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.script.groovy</artifactId>
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.security.core/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.security.core/pom.xml 2011-09-12 15:57:39 UTC (rev 4896)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.security.core/pom.xml 2011-09-12 15:58:06 UTC (rev 4897)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA-CP02</version>
+ <version>2.4.1-GA-CP02-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.security.core</artifactId>
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.web.css/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.web.css/pom.xml 2011-09-12 15:57:39 UTC (rev 4896)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.web.css/pom.xml 2011-09-12 15:58:06 UTC (rev 4897)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA-CP02</version>
+ <version>2.4.1-GA-CP02-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.web.css</artifactId>
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.xml-processing/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.xml-processing/pom.xml 2011-09-12 15:57:39 UTC (rev 4896)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.xml-processing/pom.xml 2011-09-12 15:58:06 UTC (rev 4897)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA-CP02</version>
+ <version>2.4.1-GA-CP02-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.xml-processing</artifactId>
<name>eXo Core :: Component :: XML Processing Service</name>
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/packaging/module/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/packaging/module/pom.xml 2011-09-12 15:57:39 UTC (rev 4896)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/packaging/module/pom.xml 2011-09-12 15:58:06 UTC (rev 4897)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA-CP02</version>
+ <version>2.4.1-GA-CP02-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.4.0-GA-CP02</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.document</artifactId><version>2.4.0-GA-CP02</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.api</artifactId><version>2.4.0-GA-CP02</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.ldap</artifactId><version>2.4.0-GA-CP02</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.security.core</artifactId><version>2.4.0-GA-CP02</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.xml-processing</artifactId><version>2.4.0-GA-CP02</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.script.groovy</artifactId><version>2.4.0-GA-CP02</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.database</artifactId><version>2.4.1-GA-CP02-SNAPSHOT</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.document</artifactId><version>2.4.1-GA-CP02-SNAPSHOT</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.api</artifactId><version>2.4.1-GA-CP02-SNAPSHOT</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.ldap</artifactId><version>2.4.1-GA-CP02-SNAPSHOT</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.security.core</artifactId><version>2.4.1-GA-CP02-SNAPSHOT</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.xml-processing</artifactId><version>2.4.1-GA-CP02-SNAPSHOT</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.script.groovy</artifactId><version>2.4.1-GA-CP02-SNAPSHOT</version></dependency>
</dependencies>
<build>
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/pom.xml 2011-09-12 15:57:39 UTC (rev 4896)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/pom.xml 2011-09-12 15:58:06 UTC (rev 4897)
@@ -29,7 +29,7 @@
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA-CP02</version>
+ <version>2.4.1-GA-CP02-SNAPSHOT</version>
<packaging>pom</packaging>
<name>eXo Core</name>
@@ -43,9 +43,9 @@
</properties>
<scm>
- <connection>scm:svn:https://anonsvn.jboss.org/repos/exo-jcr/core/tags/2.4.0-GA-CP02</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/core/tags/2.4.0-GA-CP02</developerConnection>
- <url>http://fisheye.jboss.org/browse/exo-jcr/core/tags/2.4.0-GA-CP02</url>
+ <connection>scm:svn:https://anonsvn.jboss.org/repos/exo-jcr/core/branches/2.4.0-GA-CP...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/core/branches/2.4.0-GA-CP02-S...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/exo-jcr/core/branches/2.4.0-GA-CP02-SNAPSHOT</url>
</scm>
<modules>
14 years, 7 months
exo-jcr SVN: r4896 - core/tags.
by do-not-reply@jboss.org
Author: tolusha
Date: 2011-09-12 11:57:39 -0400 (Mon, 12 Sep 2011)
New Revision: 4896
Added:
core/tags/2.4.0-GA-CP02/
Log:
[maven-scm] copy for tag 2.4.0-GA-CP02
14 years, 7 months
exo-jcr SVN: r4895 - in core/branches/2.4.0-GA-CP02-SNAPSHOT: exo.core.component.database and 10 other directories.
by do-not-reply@jboss.org
Author: tolusha
Date: 2011-09-12 11:56:48 -0400 (Mon, 12 Sep 2011)
New Revision: 4895
Modified:
core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.database/pom.xml
core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.document/pom.xml
core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.ldap/pom.xml
core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.api/pom.xml
core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.jdbc/pom.xml
core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.ldap/pom.xml
core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.script.groovy/pom.xml
core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.security.core/pom.xml
core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.web.css/pom.xml
core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.xml-processing/pom.xml
core/branches/2.4.0-GA-CP02-SNAPSHOT/packaging/module/pom.xml
core/branches/2.4.0-GA-CP02-SNAPSHOT/pom.xml
Log:
[maven-release-plugin] prepare release 2.4.0-GA-CP02
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.database/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.database/pom.xml 2011-09-12 15:53:12 UTC (rev 4894)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.database/pom.xml 2011-09-12 15:56:48 UTC (rev 4895)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA-CP02-SNAPSHOT</version>
+ <version>2.4.0-GA-CP02</version>
</parent>
<artifactId>exo.core.component.database</artifactId>
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.document/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.document/pom.xml 2011-09-12 15:53:12 UTC (rev 4894)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.document/pom.xml 2011-09-12 15:56:48 UTC (rev 4895)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA-CP02-SNAPSHOT</version>
+ <version>2.4.0-GA-CP02</version>
</parent>
<artifactId>exo.core.component.document</artifactId>
<name>eXo Core :: Component :: Demo Service</name>
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.ldap/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.ldap/pom.xml 2011-09-12 15:53:12 UTC (rev 4894)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.ldap/pom.xml 2011-09-12 15:56:48 UTC (rev 4895)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA-CP02-SNAPSHOT</version>
+ <version>2.4.0-GA-CP02</version>
</parent>
<artifactId>exo.core.component.ldap</artifactId>
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.api/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.api/pom.xml 2011-09-12 15:53:12 UTC (rev 4894)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.api/pom.xml 2011-09-12 15:56:48 UTC (rev 4895)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA-CP02-SNAPSHOT</version>
+ <version>2.4.0-GA-CP02</version>
</parent>
<artifactId>exo.core.component.organization.api</artifactId>
<name>eXo Core :: Component :: Organization Service API</name>
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.jdbc/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.jdbc/pom.xml 2011-09-12 15:53:12 UTC (rev 4894)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.jdbc/pom.xml 2011-09-12 15:56:48 UTC (rev 4895)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA-CP02-SNAPSHOT</version>
+ <version>2.4.0-GA-CP02</version>
</parent>
<artifactId>exo.core.component.organization.jdbc</artifactId>
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.ldap/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.ldap/pom.xml 2011-09-12 15:53:12 UTC (rev 4894)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.ldap/pom.xml 2011-09-12 15:56:48 UTC (rev 4895)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA-CP02-SNAPSHOT</version>
+ <version>2.4.0-GA-CP02</version>
</parent>
<artifactId>exo.core.component.organization.ldap</artifactId>
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.script.groovy/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.script.groovy/pom.xml 2011-09-12 15:53:12 UTC (rev 4894)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.script.groovy/pom.xml 2011-09-12 15:56:48 UTC (rev 4895)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA-CP02-SNAPSHOT</version>
+ <version>2.4.0-GA-CP02</version>
</parent>
<artifactId>exo.core.component.script.groovy</artifactId>
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.security.core/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.security.core/pom.xml 2011-09-12 15:53:12 UTC (rev 4894)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.security.core/pom.xml 2011-09-12 15:56:48 UTC (rev 4895)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA-CP02-SNAPSHOT</version>
+ <version>2.4.0-GA-CP02</version>
</parent>
<artifactId>exo.core.component.security.core</artifactId>
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.web.css/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.web.css/pom.xml 2011-09-12 15:53:12 UTC (rev 4894)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.web.css/pom.xml 2011-09-12 15:56:48 UTC (rev 4895)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA-CP02-SNAPSHOT</version>
+ <version>2.4.0-GA-CP02</version>
</parent>
<artifactId>exo.core.component.web.css</artifactId>
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.xml-processing/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.xml-processing/pom.xml 2011-09-12 15:53:12 UTC (rev 4894)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.xml-processing/pom.xml 2011-09-12 15:56:48 UTC (rev 4895)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA-CP02-SNAPSHOT</version>
+ <version>2.4.0-GA-CP02</version>
</parent>
<artifactId>exo.core.component.xml-processing</artifactId>
<name>eXo Core :: Component :: XML Processing Service</name>
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/packaging/module/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/packaging/module/pom.xml 2011-09-12 15:53:12 UTC (rev 4894)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/packaging/module/pom.xml 2011-09-12 15:56:48 UTC (rev 4895)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA-CP02-SNAPSHOT</version>
+ <version>2.4.0-GA-CP02</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.4.0-GA-CP02-SNAPSHOT</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.document</artifactId><version>2.4.0-GA-CP02-SNAPSHOT</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.api</artifactId><version>2.4.0-GA-CP02-SNAPSHOT</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.ldap</artifactId><version>2.4.0-GA-CP02-SNAPSHOT</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.security.core</artifactId><version>2.4.0-GA-CP02-SNAPSHOT</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.xml-processing</artifactId><version>2.4.0-GA-CP02-SNAPSHOT</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.script.groovy</artifactId><version>2.4.0-GA-CP02-SNAPSHOT</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.database</artifactId><version>2.4.0-GA-CP02</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.document</artifactId><version>2.4.0-GA-CP02</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.api</artifactId><version>2.4.0-GA-CP02</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.ldap</artifactId><version>2.4.0-GA-CP02</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.security.core</artifactId><version>2.4.0-GA-CP02</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.xml-processing</artifactId><version>2.4.0-GA-CP02</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.script.groovy</artifactId><version>2.4.0-GA-CP02</version></dependency>
</dependencies>
<build>
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/pom.xml 2011-09-12 15:53:12 UTC (rev 4894)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/pom.xml 2011-09-12 15:56:48 UTC (rev 4895)
@@ -29,7 +29,7 @@
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA-CP02-SNAPSHOT</version>
+ <version>2.4.0-GA-CP02</version>
<packaging>pom</packaging>
<name>eXo Core</name>
@@ -43,9 +43,9 @@
</properties>
<scm>
- <connection>scm:svn:https://anonsvn.jboss.org/repos/exo-jcr/core/branches/2.4.0-GA-CP...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/core/branches/2.4.0-GA-CP02-S...</developerConnection>
- <url>http://fisheye.jboss.org/browse/exo-jcr/core/branches/2.4.0-GA-CP02-SNAPSHOT</url>
+ <connection>scm:svn:https://anonsvn.jboss.org/repos/exo-jcr/core/tags/2.4.0-GA-CP02</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/core/tags/2.4.0-GA-CP02</developerConnection>
+ <url>http://fisheye.jboss.org/browse/exo-jcr/core/tags/2.4.0-GA-CP02</url>
</scm>
<modules>
14 years, 7 months
exo-jcr SVN: r4894 - in core/branches/2.4.0-GA-CP02-SNAPSHOT: exo.core.component.database and 10 other directories.
by do-not-reply@jboss.org
Author: tolusha
Date: 2011-09-12 11:53:12 -0400 (Mon, 12 Sep 2011)
New Revision: 4894
Modified:
core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.database/pom.xml
core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.document/pom.xml
core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.ldap/pom.xml
core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.api/pom.xml
core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.jdbc/pom.xml
core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.ldap/pom.xml
core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.script.groovy/pom.xml
core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.security.core/pom.xml
core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.web.css/pom.xml
core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.xml-processing/pom.xml
core/branches/2.4.0-GA-CP02-SNAPSHOT/packaging/module/pom.xml
core/branches/2.4.0-GA-CP02-SNAPSHOT/pom.xml
Log:
EXOJCR-1528: set new version
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.database/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.database/pom.xml 2011-09-12 15:44:33 UTC (rev 4893)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.database/pom.xml 2011-09-12 15:53:12 UTC (rev 4894)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA</version>
+ <version>2.4.0-GA-CP02-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.database</artifactId>
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.document/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.document/pom.xml 2011-09-12 15:44:33 UTC (rev 4893)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.document/pom.xml 2011-09-12 15:53:12 UTC (rev 4894)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA</version>
+ <version>2.4.0-GA-CP02-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.document</artifactId>
<name>eXo Core :: Component :: Demo Service</name>
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.ldap/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.ldap/pom.xml 2011-09-12 15:44:33 UTC (rev 4893)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.ldap/pom.xml 2011-09-12 15:53:12 UTC (rev 4894)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA</version>
+ <version>2.4.0-GA-CP02-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.ldap</artifactId>
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.api/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.api/pom.xml 2011-09-12 15:44:33 UTC (rev 4893)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.api/pom.xml 2011-09-12 15:53:12 UTC (rev 4894)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA</version>
+ <version>2.4.0-GA-CP02-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.organization.api</artifactId>
<name>eXo Core :: Component :: Organization Service API</name>
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.jdbc/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.jdbc/pom.xml 2011-09-12 15:44:33 UTC (rev 4893)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.jdbc/pom.xml 2011-09-12 15:53:12 UTC (rev 4894)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA</version>
+ <version>2.4.0-GA-CP02-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.organization.jdbc</artifactId>
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.ldap/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.ldap/pom.xml 2011-09-12 15:44:33 UTC (rev 4893)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.organization.ldap/pom.xml 2011-09-12 15:53:12 UTC (rev 4894)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA</version>
+ <version>2.4.0-GA-CP02-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.organization.ldap</artifactId>
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.script.groovy/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.script.groovy/pom.xml 2011-09-12 15:44:33 UTC (rev 4893)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.script.groovy/pom.xml 2011-09-12 15:53:12 UTC (rev 4894)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA</version>
+ <version>2.4.0-GA-CP02-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.script.groovy</artifactId>
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.security.core/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.security.core/pom.xml 2011-09-12 15:44:33 UTC (rev 4893)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.security.core/pom.xml 2011-09-12 15:53:12 UTC (rev 4894)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA</version>
+ <version>2.4.0-GA-CP02-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.security.core</artifactId>
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.web.css/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.web.css/pom.xml 2011-09-12 15:44:33 UTC (rev 4893)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.web.css/pom.xml 2011-09-12 15:53:12 UTC (rev 4894)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA</version>
+ <version>2.4.0-GA-CP02-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.web.css</artifactId>
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.xml-processing/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.xml-processing/pom.xml 2011-09-12 15:44:33 UTC (rev 4893)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/exo.core.component.xml-processing/pom.xml 2011-09-12 15:53:12 UTC (rev 4894)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA</version>
+ <version>2.4.0-GA-CP02-SNAPSHOT</version>
</parent>
<artifactId>exo.core.component.xml-processing</artifactId>
<name>eXo Core :: Component :: XML Processing Service</name>
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/packaging/module/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/packaging/module/pom.xml 2011-09-12 15:44:33 UTC (rev 4893)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/packaging/module/pom.xml 2011-09-12 15:53:12 UTC (rev 4894)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA</version>
+ <version>2.4.0-GA-CP02-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.4.0-GA</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.document</artifactId><version>2.4.0-GA</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.api</artifactId><version>2.4.0-GA</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.ldap</artifactId><version>2.4.0-GA</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.security.core</artifactId><version>2.4.0-GA</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.xml-processing</artifactId><version>2.4.0-GA</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.script.groovy</artifactId><version>2.4.0-GA</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.database</artifactId><version>2.4.0-GA-CP02-SNAPSHOT</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.document</artifactId><version>2.4.0-GA-CP02-SNAPSHOT</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.api</artifactId><version>2.4.0-GA-CP02-SNAPSHOT</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.ldap</artifactId><version>2.4.0-GA-CP02-SNAPSHOT</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.security.core</artifactId><version>2.4.0-GA-CP02-SNAPSHOT</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.xml-processing</artifactId><version>2.4.0-GA-CP02-SNAPSHOT</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.script.groovy</artifactId><version>2.4.0-GA-CP02-SNAPSHOT</version></dependency>
</dependencies>
<build>
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/pom.xml
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/pom.xml 2011-09-12 15:44:33 UTC (rev 4893)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/pom.xml 2011-09-12 15:53:12 UTC (rev 4894)
@@ -29,7 +29,7 @@
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.0-GA</version>
+ <version>2.4.0-GA-CP02-SNAPSHOT</version>
<packaging>pom</packaging>
<name>eXo Core</name>
14 years, 7 months
exo-jcr SVN: r4893 - core/branches/2.4.0-GA-CP02-SNAPSHOT/packaging/module/src/main/javascript.
by do-not-reply@jboss.org
Author: tolusha
Date: 2011-09-12 11:44:33 -0400 (Mon, 12 Sep 2011)
New Revision: 4893
Modified:
core/branches/2.4.0-GA-CP02-SNAPSHOT/packaging/module/src/main/javascript/core.packaging.module.js
Log:
EXOJCR-1528: fix deps
Modified: core/branches/2.4.0-GA-CP02-SNAPSHOT/packaging/module/src/main/javascript/core.packaging.module.js
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/packaging/module/src/main/javascript/core.packaging.module.js 2011-09-12 15:40:08 UTC (rev 4892)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/packaging/module/src/main/javascript/core.packaging.module.js 2011-09-12 15:44:33 UTC (rev 4893)
@@ -32,8 +32,8 @@
addDependency(new Project("org.apache.pdfbox", "pdfbox", "jar", "1.4.0")).
addDependency(new Project("org.apache.pdfbox", "fontbox", "jar", "1.4.0")).
addDependency(new Project("org.apache.pdfbox", "jempbox", "jar", "1.4.0")).
- addDependency(new Project("bouncycastle", "bcmail-jdk15", "jar", "1.45")).
- addDependency(new Project("bouncycastle", "bcprov-jdk15", "jar", "1.45")).
+ addDependency(new Project("org.bouncycastle", "bcmail-jdk15", "jar", "1.45")).
+ addDependency(new Project("org.bouncycastle", "bcprov-jdk15", "jar", "1.45")).
addDependency(new Project("org.apache.commons", "commons-compress", "jar", "1.0")).
addDependency(new Project("org.apache.geronimo.specs", "geronimo-stax-api_1.0_spec", "jar", "1.0.1")).
addDependency(new Project("org.ccil.cowan.tagsoup", "tagsoup", "jar", "1.2")).
14 years, 7 months
exo-jcr SVN: r4891 - in core/branches: 2.4.0-GA-CP02-SNAPSHOT and 1 other directory.
by do-not-reply@jboss.org
Author: tolusha
Date: 2011-09-12 11:39:58 -0400 (Mon, 12 Sep 2011)
New Revision: 4891
Added:
core/branches/2.4.0-GA-CP02-SNAPSHOT/
core/branches/2.4.0-GA-CP02-SNAPSHOT/pom.xml
Removed:
core/branches/2.4.0-GA-CP02-SNAPSHOT/pom.xml
Log:
[maven-release-plugin] copy for branch 2.4.0-GA-CP02-SNAPSHOT
Deleted: core/branches/2.4.0-GA-CP02-SNAPSHOT/pom.xml
===================================================================
--- core/tags/2.4.0-GA/pom.xml 2011-09-12 14:49:41 UTC (rev 4888)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/pom.xml 2011-09-12 15:39:58 UTC (rev 4891)
@@ -1,406 +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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.exoplatform</groupId>
- <artifactId>foundation-parent</artifactId>
- <version>9</version>
- </parent>
-
- <groupId>org.exoplatform.core</groupId>
- <artifactId>core-parent</artifactId>
- <version>2.4.0-GA</version>
- <packaging>pom</packaging>
-
- <name>eXo Core</name>
-
- <properties>
- <exo.product.name>exo-core</exo.product.name>
- <exo.product.specification>2.4</exo.product.specification>
-
- <org.exoplatform.framework.junit.version>1.2.1-GA</org.exoplatform.framework.junit.version>
- <org.exoplatform.kernel.version>2.3.0-GA</org.exoplatform.kernel.version>
- </properties>
-
- <scm>
- <connection>scm:svn:https://anonsvn.jboss.org/repos/exo-jcr/core/tags/2.4.0-GA</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/core/tags/2.4.0-GA</developerConnection>
- <url>http://fisheye.jboss.org/browse/exo-jcr/core/tags/2.4.0-GA</url>
- </scm>
-
- <modules>
- <module>exo.core.component.security.core</module>
- <module>exo.core.component.database</module>
- <module>exo.core.component.document</module>
- <module>exo.core.component.ldap</module>
- <module>exo.core.component.organization.api</module>
- <module>exo.core.component.organization.jdbc</module>
- <module>exo.core.component.organization.ldap</module>
- <module>exo.core.component.xml-processing</module>
- <module>exo.core.component.script.groovy</module>
- <module>exo.core.component.web.css</module>
- <module>packaging/module</module>
- </modules>
-
- <dependencyManagement>
- <dependencies>
-
- <dependency>
- <groupId>org.exoplatform.tool</groupId>
- <artifactId>exo.tool.framework.junit</artifactId>
- <version>${org.exoplatform.framework.junit.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.exoplatform.kernel</groupId>
- <artifactId>exo.kernel.commons</artifactId>
- <version>${org.exoplatform.kernel.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.exoplatform.kernel</groupId>
- <artifactId>exo.kernel.commons.test</artifactId>
- <version>${org.exoplatform.kernel.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.exoplatform.kernel</groupId>
- <artifactId>exo.kernel.component.common</artifactId>
- <version>${org.exoplatform.kernel.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.exoplatform.kernel</groupId>
- <artifactId>exo.kernel.container</artifactId>
- <version>${org.exoplatform.kernel.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.exoplatform.kernel</groupId>
- <artifactId>exo.kernel.component.cache</artifactId>
- <version>${org.exoplatform.kernel.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.exoplatform.core</groupId>
- <artifactId>exo.core.component.database</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.exoplatform.core</groupId>
- <artifactId>exo.core.component.ldap</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.exoplatform.core</groupId>
- <artifactId>exo.core.component.organization.api</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.exoplatform.core</groupId>
- <artifactId>exo.core.component.organization.jdbc</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.exoplatform.core</groupId>
- <artifactId>exo.core.component.security.core</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.security</groupId>
- <artifactId>jbosssx</artifactId>
- <scope>provided</scope>
- <version>2.0.4</version>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-plus</artifactId>
- <version>7.1.5.v20100705</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.resource</groupId>
- <artifactId>connector-api</artifactId>
- <version>1.5</version>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- </dependency>
-
- <dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <version>1.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.5.8</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.5.8</version>
- <scope>test</scope>
- </dependency>
-
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
-
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>2.0.0</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>com.experlog</groupId>
- <artifactId>xapool</artifactId>
- <version>1.5.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>3.3.2.GA</version>
- </dependency>
-
- <dependency>
- <groupId>xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.0.2</version>
- </dependency>
-
- <dependency>
- <groupId>picocontainer</groupId>
- <artifactId>picocontainer</artifactId>
- <version>1.1</version>
- </dependency>
-
- <dependency>
- <groupId>xdoclet</groupId>
- <artifactId>xdoclet-hibernate-module</artifactId>
- <version>1.2.3</version>
- </dependency>
-
- <dependency>
- <groupId>xdoclet</groupId>
- <artifactId>xdoclet-xdoclet-module</artifactId>
- <version>1.2.3</version>
- </dependency>
-
- <dependency>
- <groupId>xdoclet</groupId>
- <artifactId>xjavadoc</artifactId>
- <version>1.2.3</version>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>1.7.6</version>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <version>3.4.0.GA</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.pdfbox</groupId>
- <artifactId>pdfbox</artifactId>
- <version>1.4.0</version>
- </dependency>
- <dependency>
- <groupId>org.htmlparser</groupId>
- <artifactId>htmlparser</artifactId>
- <version>1.6</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- <version>3.6</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-scratchpad</artifactId>
- <version>3.6</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml</artifactId>
- <version>3.6</version>
- </dependency>
-
- <dependency>
- <groupId>com.novell.ldap</groupId>
- <artifactId>jldap</artifactId>
- <version>4.3</version>
- </dependency>
-
- <dependency>
- <groupId>net.sf.jtidy</groupId>
- <artifactId>jtidy</artifactId>
- <version>r938</version>
- </dependency>
-
- <dependency>
- <groupId>org.w3c</groupId>
- <artifactId>sac</artifactId>
- <version>1.3</version>
- </dependency>
-
- <dependency>
- <groupId>batik</groupId>
- <artifactId>batik-util</artifactId>
- <version>1.7</version>
- </dependency>
-
- <dependency>
- <groupId>batik</groupId>
- <artifactId>batik-css</artifactId>
- <version>1.7</version>
- </dependency>
-
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.2.2</version>
- <exclusions>
- <exclusion>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>1.5.5</version>
- </dependency>
-
- <dependency>
- <groupId>org.javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.14.0-GA</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-core</artifactId>
- <version>0.7</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-parsers</artifactId>
- <version>0.7</version>
- </dependency>
-
-
-
-
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <id>release</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.apache.resources</groupId>
- <artifactId>apache-source-release-assembly-descriptor</artifactId>
- <version>1.0.2</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>source-release-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
- <descriptorRefs>
- <descriptorRef>source-release</descriptorRef>
- </descriptorRefs>
- <tarLongFileFormat>gnu</tarLongFileFormat>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
Copied: core/branches/2.4.0-GA-CP02-SNAPSHOT/pom.xml (from rev 4890, core/tags/2.4.0-GA/pom.xml)
===================================================================
--- core/branches/2.4.0-GA-CP02-SNAPSHOT/pom.xml (rev 0)
+++ core/branches/2.4.0-GA-CP02-SNAPSHOT/pom.xml 2011-09-12 15:39:58 UTC (rev 4891)
@@ -0,0 +1,406 @@
+<!--
+
+ 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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.exoplatform</groupId>
+ <artifactId>foundation-parent</artifactId>
+ <version>9</version>
+ </parent>
+
+ <groupId>org.exoplatform.core</groupId>
+ <artifactId>core-parent</artifactId>
+ <version>2.4.0-GA</version>
+ <packaging>pom</packaging>
+
+ <name>eXo Core</name>
+
+ <properties>
+ <exo.product.name>exo-core</exo.product.name>
+ <exo.product.specification>2.4</exo.product.specification>
+
+ <org.exoplatform.framework.junit.version>1.2.1-GA</org.exoplatform.framework.junit.version>
+ <org.exoplatform.kernel.version>2.3.0-GA</org.exoplatform.kernel.version>
+ </properties>
+
+ <scm>
+ <connection>scm:svn:https://anonsvn.jboss.org/repos/exo-jcr/core/branches/2.4.0-GA-CP...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/core/branches/2.4.0-GA-CP02-S...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/exo-jcr/core/branches/2.4.0-GA-CP02-SNAPSHOT</url>
+ </scm>
+
+ <modules>
+ <module>exo.core.component.security.core</module>
+ <module>exo.core.component.database</module>
+ <module>exo.core.component.document</module>
+ <module>exo.core.component.ldap</module>
+ <module>exo.core.component.organization.api</module>
+ <module>exo.core.component.organization.jdbc</module>
+ <module>exo.core.component.organization.ldap</module>
+ <module>exo.core.component.xml-processing</module>
+ <module>exo.core.component.script.groovy</module>
+ <module>exo.core.component.web.css</module>
+ <module>packaging/module</module>
+ </modules>
+
+ <dependencyManagement>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.exoplatform.tool</groupId>
+ <artifactId>exo.tool.framework.junit</artifactId>
+ <version>${org.exoplatform.framework.junit.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.commons</artifactId>
+ <version>${org.exoplatform.kernel.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.commons.test</artifactId>
+ <version>${org.exoplatform.kernel.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.component.common</artifactId>
+ <version>${org.exoplatform.kernel.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.container</artifactId>
+ <version>${org.exoplatform.kernel.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.component.cache</artifactId>
+ <version>${org.exoplatform.kernel.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.exoplatform.core</groupId>
+ <artifactId>exo.core.component.database</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.exoplatform.core</groupId>
+ <artifactId>exo.core.component.ldap</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.exoplatform.core</groupId>
+ <artifactId>exo.core.component.organization.api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.exoplatform.core</groupId>
+ <artifactId>exo.core.component.organization.jdbc</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.exoplatform.core</groupId>
+ <artifactId>exo.core.component.security.core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx</artifactId>
+ <scope>provided</scope>
+ <version>2.0.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jetty.aggregate</groupId>
+ <artifactId>jetty-plus</artifactId>
+ <version>7.1.5.v20100705</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.resource</groupId>
+ <artifactId>connector-api</artifactId>
+ <version>1.5</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <version>1.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.8</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.8</version>
+ <scope>test</scope>
+ </dependency>
+
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>2.0.0</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.experlog</groupId>
+ <artifactId>xapool</artifactId>
+ <version>1.5.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>3.3.2.GA</version>
+ </dependency>
+
+ <dependency>
+ <groupId>xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>picocontainer</groupId>
+ <artifactId>picocontainer</artifactId>
+ <version>1.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>xdoclet</groupId>
+ <artifactId>xdoclet-hibernate-module</artifactId>
+ <version>1.2.3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>xdoclet</groupId>
+ <artifactId>xdoclet-xdoclet-module</artifactId>
+ <version>1.2.3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>xdoclet</groupId>
+ <artifactId>xjavadoc</artifactId>
+ <version>1.2.3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>1.7.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <version>3.4.0.GA</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.pdfbox</groupId>
+ <artifactId>pdfbox</artifactId>
+ <version>1.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.htmlparser</groupId>
+ <artifactId>htmlparser</artifactId>
+ <version>1.6</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>3.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-scratchpad</artifactId>
+ <version>3.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml</artifactId>
+ <version>3.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.novell.ldap</groupId>
+ <artifactId>jldap</artifactId>
+ <version>4.3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.jtidy</groupId>
+ <artifactId>jtidy</artifactId>
+ <version>r938</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.w3c</groupId>
+ <artifactId>sac</artifactId>
+ <version>1.3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-util</artifactId>
+ <version>1.7</version>
+ </dependency>
+
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-css</artifactId>
+ <version>1.7</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.2.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.5.5</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.14.0-GA</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-core</artifactId>
+ <version>0.7</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers</artifactId>
+ <version>0.7</version>
+ </dependency>
+
+
+
+
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.apache.resources</groupId>
+ <artifactId>apache-source-release-assembly-descriptor</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>source-release-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+ <descriptorRefs>
+ <descriptorRef>source-release</descriptorRef>
+ </descriptorRefs>
+ <tarLongFileFormat>gnu</tarLongFileFormat>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
14 years, 7 months