exo-jcr SVN: r4320 - ws/trunk/exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet.
by do-not-reply＠jboss.org
Author: nzamosenchuk
Date: 2011-04-28 04:47:14 -0400 (Thu, 28 Apr 2011)
New Revision: 4320
Modified:
ws/trunk/exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet/StandaloneContainerInitializedListener.java
Log:
EXOJCR-1323 : applying the patch
Modified: ws/trunk/exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet/StandaloneContainerInitializedListener.java
===================================================================
--- ws/trunk/exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet/StandaloneContainerInitializedListener.java 2011-04-28 08:31:16 UTC (rev 4319)
+++ ws/trunk/exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet/StandaloneContainerInitializedListener.java 2011-04-28 08:47:14 UTC (rev 4320)
@@ -80,13 +80,25 @@
LOG.error("Error of configurationURL read", e);
}
+ // If no configuration in web.xml check system property.
+ if (configurationURL == null)
+ configurationURL = System.getProperty(CONF_URL_PARAMETER);
+
try
{
StandaloneContainer.addConfigurationURL(configurationURL);
}
catch (MalformedURLException e)
{
- LOG.error("Error of addConfigurationURL", e);
+ // Try to use path, we do not need have full path (file:/path/conf) to configuration. Any relative path is OK.
+ try
+ {
+ StandaloneContainer.addConfigurationPath(configurationURL);
+ }
+ catch (MalformedURLException e2)
+ {
+ LOG.error("Error of addConfiguration", e2);
+ }
}
try
14 years, 12 months
exo-jcr SVN: r4319 - in jcr/trunk/exo.jcr.component.core/src: test/java/org/exoplatform/services/jcr/api/lock and 1 other directory.
by do-not-reply＠jboss.org
Author: nzamosenchuk
Date: 2011-04-28 04:31:16 -0400 (Thu, 28 Apr 2011)
New Revision: 4319
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/lock/TestLock.java
Log:
EXOJCR-1319 : Check if node locked in CheckOut() also
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java 2011-04-27 14:26:02 UTC (rev 4318)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java 2011-04-28 08:31:16 UTC (rev 4319)
@@ -482,7 +482,7 @@
if (!checkLocking())
{
- throw new LockException("Node " + parent().getPath() + " is locked ");
+ throw new LockException("Node " + getPath() + " is locked ");
}
// the new version identifier
@@ -531,6 +531,11 @@
"Node.checkout() is not supported for not mix:versionable node ");
}
+ if (!checkLocking())
+ {
+ throw new LockException("Node " + getPath() + " is locked ");
+ }
+
if (checkedOut())
{
return;
Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/lock/TestLock.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/lock/TestLock.java 2011-04-27 14:26:02 UTC (rev 4318)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/lock/TestLock.java 2011-04-28 08:31:16 UTC (rev 4319)
@@ -543,4 +543,37 @@
session1.logout();
}
+
+ public void testCheckOutWhenParentLocked() throws RepositoryException
+ {
+ // creating node that is going to be locked, adding a child also.
+
+ Session session1 = repository.login(new CredentialsImpl("root", "exo".toCharArray()), "ws");
+ Node lockedNodeSession1 = session1.getRootNode().addNode("testCheckOutWhenParentLocked");
+ lockedNodeSession1.addMixin("mix:lockable");
+ lockedNodeSession1.addMixin("mix:versionable");
+ session1.save();
+ lockedNodeSession1.checkin();
+ // locking it
+ lockedNodeSession1.lock(false, false);
+ session1.save();
+ assertTrue(lockedNodeSession1.isLocked());
+
+ Node lockedNode = session.getRootNode().getNode("testCheckOutWhenParentLocked");
+
+ try
+ {
+ lockedNode.checkout();
+ fail("Lock exeption should be thrown");
+ }
+ catch (LockException e)
+ {
+ // it's okey
+ }
+
+ lockedNodeSession1.checkout();
+ session1.save();
+
+ session1.logout();
+ }
}
14 years, 12 months
exo-jcr SVN: r4318 - in core/branches/2.3.x/patch/2.3.9: COR-236 and 1 other directory.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-04-27 10:26:02 -0400 (Wed, 27 Apr 2011)
New Revision: 4318
Added:
core/branches/2.3.x/patch/2.3.9/COR-236/
core/branches/2.3.x/patch/2.3.9/COR-236/COR-236.patch
Log:
COR-236: patch proposed
Added: core/branches/2.3.x/patch/2.3.9/COR-236/COR-236.patch
===================================================================
--- core/branches/2.3.x/patch/2.3.9/COR-236/COR-236.patch (rev 0)
+++ core/branches/2.3.x/patch/2.3.9/COR-236/COR-236.patch 2011-04-27 14:26:02 UTC (rev 4318)
@@ -0,0 +1,34 @@
+Index: exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/LDAPAttributeMapping.java
+===================================================================
+--- exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/LDAPAttributeMapping.java (revision 4240)
++++ exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/LDAPAttributeMapping.java (working copy)
+@@ -67,14 +67,12 @@
+
+ // TODO remove initialization in major release. It may be not initialized from
+ // for AD.
+- String userDNKey = "CN";
++ String userDNKey = "cn";
+
+ //TODO remove initialization in major release. Should be initialized from
+ // configuration.
+- String groupDNKey = "OU";
++ String groupDNKey = "ou";
+
+- //
+-
+ String userUsernameAttr;
+
+ String userPassword;
+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 4240)
++++ exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ADUserDAOImpl.java (working copy)
+@@ -75,7 +75,7 @@
+ @Override
+ public void createUser(User user, boolean broadcast) throws Exception
+ {
+- String userDN = "CN=" + user.getUserName() + "," + ldapAttrMapping.userURL;
++ String userDN = ldapAttrMapping.userDNKey + "=" + user.getUserName() + "," + ldapAttrMapping.userURL;
+ Attributes attrs = ldapAttrMapping.userToAttributes(user);
+ attrs.put("userAccountControl", Integer.toString(UF_NORMAL_ACCOUNT + UF_PASSWD_NOTREQD + UF_PASSWORD_EXPIRED
+ + UF_ACCOUNTDISABLE));
14 years, 12 months
exo-jcr SVN: r4317 - core/branches/2.3.x/patch/2.3.9/COR-235.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-04-27 09:56:01 -0400 (Wed, 27 Apr 2011)
New Revision: 4317
Modified:
core/branches/2.3.x/patch/2.3.9/COR-235/COR-235.patch
Log:
COR-235: patch proposed
Modified: core/branches/2.3.x/patch/2.3.9/COR-235/COR-235.patch
===================================================================
--- core/branches/2.3.x/patch/2.3.9/COR-235/COR-235.patch 2011-04-27 13:53:43 UTC (rev 4316)
+++ core/branches/2.3.x/patch/2.3.9/COR-235/COR-235.patch 2011-04-27 13:56:01 UTC (rev 4317)
@@ -33,3 +33,16 @@
protected int getSize(LdapContext ctx) throws Exception
{
if (size < 0)
+@@ -109,8 +118,12 @@
+
+ try
+ {
++ String[] returnedAtts = {ldapAttrMapping.userUsernameAttr};
++
+ SearchControls constraints = new SearchControls();
++ constraints.setReturningAttributes(returnedAtts);
+ constraints.setSearchScope(SearchControls.SUBTREE_SCOPE);
++
+ results = ctx.search(searchBase, filter, constraints);
+ size = 0;
+ while (results.hasMoreElements())
14 years, 12 months
exo-jcr SVN: r4316 - core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-04-27 09:53:43 -0400 (Wed, 27 Apr 2011)
New Revision: 4316
Modified:
core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/SimpleLdapUserListAccess.java
Log:
EXOJCR-1318: return only exptected attributes
Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/SimpleLdapUserListAccess.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/SimpleLdapUserListAccess.java 2011-04-27 13:51:52 UTC (rev 4315)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/SimpleLdapUserListAccess.java 2011-04-27 13:53:43 UTC (rev 4316)
@@ -118,8 +118,12 @@
try
{
+ String[] returnedAtts = {ldapAttrMapping.userUsernameAttr};
+
SearchControls constraints = new SearchControls();
+ constraints.setReturningAttributes(returnedAtts);
constraints.setSearchScope(SearchControls.SUBTREE_SCOPE);
+
results = ctx.search(searchBase, filter, constraints);
size = 0;
while (results.hasMoreElements())
14 years, 12 months
exo-jcr SVN: r4315 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation.
by do-not-reply＠jboss.org
Author: nzamosenchuk
Date: 2011-04-27 09:51:52 -0400 (Wed, 27 Apr 2011)
New Revision: 4315
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCStorageConnection.java
Log:
EXOJCR-1111 : Property type was first updated in DB, and then retrieved from DB thinking that it hasn't beed updated yet. Fixing.
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCStorageConnection.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCStorageConnection.java 2011-04-27 13:51:32 UTC (rev 4314)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCStorageConnection.java 2011-04-27 13:51:52 UTC (rev 4315)
@@ -116,7 +116,7 @@
* UPDATE_VALUE.
*/
protected String UPDATE_VALUE;
-
+
protected PreparedStatement findNodesByParentIdCQ;
protected PreparedStatement findPropertiesByParentIdCQ;
@@ -126,9 +126,9 @@
protected PreparedStatement findItemQPathByIdentifierCQ;
protected PreparedStatement findPropertyById;
-
+
protected PreparedStatement deleteValueDataByOrderNum;
-
+
protected PreparedStatement updateValue;
/**
@@ -222,7 +222,6 @@
}
}
}
-
/**
* {@inheritDoc}
@@ -236,12 +235,8 @@
try
{
String cid = getInternalId(data.getIdentifier());
- // update type
- if (updatePropertyByIdentifier(data.getPersistedVersion(), data.getType(), cid) <= 0)
- throw new JCRInvalidItemStateException("(update) Property not found " + data.getQPath().getAsString() + " "
- + data.getIdentifier() + ". Probably was deleted by another session ", data.getIdentifier(),
- ItemState.UPDATED);
+ // get existing definition first
rs = findPropertyById(cid);
Set<String> storageDescs = new HashSet<String>();
int totalOldValues = 0;
@@ -259,6 +254,15 @@
storageDescs.add(storageId);
}
}
+
+ // then update type
+ if (updatePropertyByIdentifier(data.getPersistedVersion(), data.getType(), cid) <= 0)
+ {
+ throw new JCRInvalidItemStateException("(update) Property not found " + data.getQPath().getAsString() + " "
+ + data.getIdentifier() + ". Probably was deleted by another session ", data.getIdentifier(),
+ ItemState.UPDATED);
+ }
+
// update reference
try
{
@@ -284,13 +288,17 @@
catch (IOException e)
{
if (LOG.isDebugEnabled())
+ {
LOG.error("Property update. IO error: " + e, e);
+ }
throw new RepositoryException("Error of Property Value update " + e, e);
}
catch (SQLException e)
{
if (LOG.isDebugEnabled())
+ {
LOG.error("Property update. Database error: " + e, e);
+ }
exceptionHandler.handleUpdateException(e, data);
}
finally
@@ -388,7 +396,8 @@
}
}
- private void deleteValues(String cid, PropertyData pdata, Set<String> storageDescs, int totalOldValues) throws ValueStorageNotFoundException, IOException, SQLException
+ private void deleteValues(String cid, PropertyData pdata, Set<String> storageDescs, int totalOldValues)
+ throws ValueStorageNotFoundException, IOException, SQLException
{
for (String storageId : storageDescs)
{
@@ -401,7 +410,7 @@
finally
{
channel.close();
- }
+ }
}
if (pdata.getValues().size() < totalOldValues)
{
@@ -409,7 +418,7 @@
deleteValueDataByOrderNum(cid, pdata.getValues().size());
}
}
-
+
/**
* {@inheritDoc}
*/
@@ -539,7 +548,9 @@
return naPermissions;
}
else
+ {
throw new IllegalACLException("Property exo:permissions is not found for node with id: " + getIdentifier(cid));
+ }
}
/**
@@ -556,9 +567,13 @@
{
SortedSet<TempPropertyData> ownerValues = properties.get(Constants.EXO_OWNER.getAsString());
if (ownerValues != null)
+ {
return new String(ownerValues.first().data);
+ }
else
+ {
throw new IllegalACLException("Property exo:owner is not found for node with id: " + getIdentifier(cid));
+ }
}
/**
@@ -682,9 +697,13 @@
mNames.add(mxn);
if (!privilegeable && Constants.EXO_PRIVILEGEABLE.equals(mxn))
+ {
privilegeable = true;
+ }
else if (!owneable && Constants.EXO_OWNEABLE.equals(mxn))
+ {
owneable = true;
+ }
}
mts = new InternalQName[mNames.size()];
mNames.toArray(mts);
@@ -743,14 +762,18 @@
else
{
if (parentACL != null)
+ {
// construct ACL from existed parent ACL
acl =
new AccessControlList(parentACL.getOwner(), parentACL.hasPermissions() ? parentACL
.getPermissionEntries() : null);
+ }
else
+ {
// have to search nearest ancestor owner and permissions in ACL manager
// acl = traverseACL(cpid);
acl = null;
+ }
}
return new PersistedNodeData(getIdentifier(cid), qpath, getIdentifier(parentCid), cversion, cnordernumb,
@@ -791,7 +814,9 @@
{
result = findItemQPathByIdentifierCQ(caid);
if (!result.next())
+ {
throw new InvalidItemStateException("Parent not found, uuid: " + getIdentifier(caid));
+ }
QPathEntry qpe1 =
new QPathEntry(InternalQName.parse(result.getString(COLUMN_NAME)), result.getInt(COLUMN_INDEX));
@@ -885,7 +910,7 @@
{
findItemQPathByIdentifierCQ.close();
}
-
+
if (findPropertyById != null)
{
findPropertyById.close();
@@ -914,9 +939,9 @@
protected abstract ResultSet findChildPropertiesByParentIdentifierCQ(String parentIdentifier) throws SQLException;
protected abstract ResultSet findNodeMainPropertiesByParentIdentifierCQ(String parentIdentifier) throws SQLException;
-
+
protected abstract ResultSet findPropertyById(String id) throws SQLException;
-
+
protected abstract int deleteValueDataByOrderNum(String id, int orderNum) throws SQLException;
protected abstract int updateValueData(String cid, int i, InputStream stream, int streamLength, String storageId)
14 years, 12 months
exo-jcr SVN: r4314 - core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-04-27 09:51:32 -0400 (Wed, 27 Apr 2011)
New Revision: 4314
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/LDAPAttributeMapping.java
Log:
EXOJCR-1320: Case sensitivityProblem with Oracle Virtual Directory and SQL Server
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-04-27 13:22:03 UTC (rev 4313)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ADUserDAOImpl.java 2011-04-27 13:51:32 UTC (rev 4314)
@@ -75,7 +75,7 @@
@Override
public void createUser(User user, boolean broadcast) throws Exception
{
- String userDN = "CN=" + user.getUserName() + "," + ldapAttrMapping.userURL;
+ String userDN = ldapAttrMapping.userDNKey + "=" + user.getUserName() + "," + ldapAttrMapping.userURL;
Attributes attrs = ldapAttrMapping.userToAttributes(user);
attrs.put("userAccountControl", Integer.toString(UF_NORMAL_ACCOUNT + UF_PASSWD_NOTREQD + UF_PASSWORD_EXPIRED
+ UF_ACCOUNTDISABLE));
Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/LDAPAttributeMapping.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/LDAPAttributeMapping.java 2011-04-27 13:22:03 UTC (rev 4313)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/LDAPAttributeMapping.java 2011-04-27 13:51:32 UTC (rev 4314)
@@ -67,14 +67,12 @@
// TODO remove initialization in major release. It may be not initialized from
// for AD.
- String userDNKey = "CN";
+ String userDNKey = "cn";
//TODO remove initialization in major release. Should be initialized from
// configuration.
- String groupDNKey = "OU";
+ String groupDNKey = "ou";
- //
-
String userUsernameAttr;
String userPassword;
14 years, 12 months
exo-jcr SVN: r4313 - in core/trunk: exo.core.component.database/src/main/java/org/exoplatform/services/database/impl and 7 other directories.
by do-not-reply＠jboss.org
Author: areshetnyak
Date: 2011-04-27 09:22:03 -0400 (Wed, 27 Apr 2011)
New Revision: 4313
Modified:
core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/DAO.java
core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/ExoDatasource.java
core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/ObjectQuery.java
core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/StandardSQLTableManager.java
core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/impl/ExoCacheProvider.java
core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/impl/HibernateServiceImpl.java
core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/jdbc/CreateDBSchemaPlugin.java
core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/jdbc/DBSchemaCreator.java
core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/DCMetaData.java
core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/TextPlainDocumentReader.java
core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/auth/OrganizationAuthenticatorImpl.java
core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/BaseDAO.java
core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/GroupDAOImpl.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/MembershipTypeDAOImpl.java
core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserProfileDAOImpl.java
core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/AbstractLoginModule.java
core/trunk/exo.core.component.web.css/src/main/java/org/exoplatform/services/web/css/model/ModelBuilder.java
Log:
EXOJCR-1221 : The same violations was fixed in CORE.
Modified: core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/DAO.java
===================================================================
--- core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/DAO.java 2011-04-27 12:53:16 UTC (rev 4312)
+++ core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/DAO.java 2011-04-27 13:22:03 UTC (rev 4313)
@@ -19,6 +19,8 @@
package org.exoplatform.services.database;
import org.exoplatform.commons.utils.PageList;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
import java.sql.Connection;
import java.sql.PreparedStatement;
@@ -33,6 +35,11 @@
public abstract class DAO<T extends DBObject>
{
+ /**
+ * Logger.
+ */
+ private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.database.DAO");
+
protected ExoDatasource eXoDS_;
protected DBObjectMapper<T> mapper_;
@@ -250,7 +257,7 @@
{
String query = builder.mapDataToSql(template, mapper_.toParameters(bean));
statement.addBatch(query);
- System.out.println(" addBatch " + query);
+ LOG.info(" addBatch " + query);
}
statement.executeBatch();
statement.close();
Modified: core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/ExoDatasource.java
===================================================================
--- core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/ExoDatasource.java 2011-04-27 12:53:16 UTC (rev 4312)
+++ core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/ExoDatasource.java 2011-04-27 13:22:03 UTC (rev 4313)
@@ -20,6 +20,8 @@
import org.exoplatform.commons.utils.SecurityHelper;
import org.exoplatform.services.database.table.IDGenerator;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
import java.security.PrivilegedExceptionAction;
import java.sql.Connection;
@@ -38,6 +40,11 @@
public class ExoDatasource
{
+ /**
+ * Logger.
+ */
+ private static final Log LOG = ExoLogger.getLogger("exo.core.component.organization.database.ExoDatasource");
+
final public static int STANDARD_DB_TYPE = 0;
final public static int HSQL_DB_TYPE = 1;
@@ -103,7 +110,7 @@
databaseVersion_ = metaData.getDatabaseProductVersion();
String dbname = databaseName_.toLowerCase();
- System.out.println("\n\n\n\n------->DB Name: " + dbname + "\n\n\n\n");
+ LOG.info("\n\n\n\n------->DB Name: " + dbname + "\n\n\n\n");
if (dbname.indexOf("oracle") >= 0)
{
dbType_ = ORACLE_DB_TYPE;
Modified: core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/ObjectQuery.java
===================================================================
--- core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/ObjectQuery.java 2011-04-27 12:53:16 UTC (rev 4312)
+++ core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/ObjectQuery.java 2011-04-27 13:22:03 UTC (rev 4313)
@@ -269,7 +269,7 @@
else if (p.op_.equals("countselect"))
{
b.append("COUNT");
- if (p.field_ != "" || p.field_.length() > 0)
+ if (!(p.field_.equals("")) || p.field_.length() > 0)
{
b.append("(").append(p.field_).append(" o)");
}
Modified: core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/StandardSQLTableManager.java
===================================================================
--- core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/StandardSQLTableManager.java 2011-04-27 12:53:16 UTC (rev 4312)
+++ core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/StandardSQLTableManager.java 2011-04-27 13:22:03 UTC (rev 4313)
@@ -20,6 +20,8 @@
import org.exoplatform.services.database.annotation.Table;
import org.exoplatform.services.database.annotation.TableField;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
import java.sql.Connection;
import java.sql.SQLException;
@@ -31,6 +33,11 @@
*/
public class StandardSQLTableManager extends DBTableManager
{
+
+ /**
+ * Logger.
+ */
+ private static final Log LOG = ExoLogger.getLogger("exo.core.component.organization.database.StandardSQLTableManager");
private ExoDatasource exoDatasource;
@@ -95,7 +102,7 @@
Connection conn = exoDatasource.getConnection();
conn.setAutoCommit(false);
Statement statement = conn.createStatement();
- System.out.println("QUERY: \n " + builder + "\n");
+ LOG.info("QUERY: \n " + builder + "\n");
if (dropIfExist && hasTable(type))
statement.execute("DROP TABLE IF EXISTS " + table.name());
statement.execute(builder.toString());
Modified: core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/impl/ExoCacheProvider.java
===================================================================
--- core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/impl/ExoCacheProvider.java 2011-04-27 12:53:16 UTC (rev 4312)
+++ core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/impl/ExoCacheProvider.java 2011-04-27 13:22:03 UTC (rev 4313)
@@ -20,6 +20,8 @@
import org.exoplatform.services.cache.CacheService;
import org.exoplatform.services.cache.ExoCache;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
import org.hibernate.cache.Cache;
import org.hibernate.cache.CacheException;
import org.hibernate.cache.CacheProvider;
@@ -39,6 +41,8 @@
public class ExoCacheProvider implements CacheProvider
{
+ private static Log LOG = ExoLogger.getLogger("exo.core.component.database.HibernateServiceImpl");
+
private CacheService cacheService;
public ExoCacheProvider(CacheService cacheService)
@@ -58,7 +62,7 @@
}
catch (Exception ex)
{
- ex.printStackTrace();
+ LOG.error(ex.getLocalizedMessage(), ex);
throw new CacheException("Cannot instanstiate cache provider");
}
}
Modified: core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/impl/HibernateServiceImpl.java
===================================================================
--- core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/impl/HibernateServiceImpl.java 2011-04-27 12:53:16 UTC (rev 4312)
+++ core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/impl/HibernateServiceImpl.java 2011-04-27 13:22:03 UTC (rev 4313)
@@ -263,7 +263,7 @@
}
catch (Exception ex)
{
- ex.printStackTrace();
+ log_.error(ex.getLocalizedMessage(), ex);
}
}
}
Modified: core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/jdbc/CreateDBSchemaPlugin.java
===================================================================
--- core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/jdbc/CreateDBSchemaPlugin.java 2011-04-27 12:53:16 UTC (rev 4312)
+++ core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/jdbc/CreateDBSchemaPlugin.java 2011-04-27 13:22:03 UTC (rev 4313)
@@ -112,7 +112,7 @@
}
catch (IOException e)
{
- e.printStackTrace();
+ log.error(e.getLocalizedMessage(), e);
}
finally
{
Modified: core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/jdbc/DBSchemaCreator.java
===================================================================
--- core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/jdbc/DBSchemaCreator.java 2011-04-27 12:53:16 UTC (rev 4312)
+++ core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/jdbc/DBSchemaCreator.java 2011-04-27 13:22:03 UTC (rev 4313)
@@ -146,8 +146,7 @@
}
Throwable cause = e.getCause();
log.error("Could not create db schema of DataSource: '" + dsName + "'. Reason: " + e.getMessage() + "; "
- + errorTrace + (cause != null ? " (Cause: " + cause.getMessage() + ")" : "") + ". Last command: " + sql);
- e.printStackTrace();
+ + errorTrace + (cause != null ? " (Cause: " + cause.getMessage() + ")" : "") + ". Last command: " + sql, e);
}
finally
{
@@ -168,11 +167,11 @@
}
catch (NamingException e)
{
- e.printStackTrace();
+ log.error(e.getLocalizedMessage(), e);
}
catch (SQLException e)
{
- e.printStackTrace();
+ log.error(e.getLocalizedMessage(), e);
}
}
}
Modified: core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/DCMetaData.java
===================================================================
--- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/DCMetaData.java 2011-04-27 12:53:16 UTC (rev 4312)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/DCMetaData.java 2011-04-27 13:22:03 UTC (rev 4313)
@@ -162,7 +162,8 @@
* URI: http://purl.org/dc/elements/1.1/relation
* Label: Relation
* Definition: A related resource.
- * Comment: Recommended best practice is to identify the related resource by means of a string conforming to a formal identification system.
+ * Comment: Recommended best practice is to identify the related resource
+ * by means of a string conforming to a formal identification system.
*/
public final QName RELATION = new QName(DC_NAMESPACE, "relation");
Modified: core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/TextPlainDocumentReader.java
===================================================================
--- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/TextPlainDocumentReader.java 2011-04-27 12:53:16 UTC (rev 4312)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/TextPlainDocumentReader.java 2011-04-27 13:22:03 UTC (rev 4313)
@@ -61,15 +61,18 @@
}
/**
- * Get the "text/plain","script/groovy","application/x-groovy","application/x-javascript","application/javascript","text/javascript" mime types.
+ * Get the "text/plain","script/groovy","application/x-groovy","application/x-javascript",
+ * "application/javascript","text/javascript" mime types.
*
- * @return The "text/plain","script/groovy","application/x-groovy","application/x-javascript","application/javascript","text/javascript" mime type.
+ * @return The "text/plain","script/groovy","application/x-groovy","application/x-javascript",
+ * "application/javascript","text/javascript" mime type.
*/
public String[] getMimeTypes()
{
return new String[]{"text/plain", "script/groovy", "application/x-groovy", "application/x-javascript",
"application/javascript", "text/javascript", "application/x-jaxrs+groovy"};
- // "text/rtf", "application/rtf" excluded since there must be RTF parser - because plain text contains a lot formatting tags.
+ // "text/rtf", "application/rtf" excluded since there
+ // must be RTF parser - because plain text contains a lot formatting tags.
}
Modified: core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/auth/OrganizationAuthenticatorImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/auth/OrganizationAuthenticatorImpl.java 2011-04-27 12:53:16 UTC (rev 4312)
+++ core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/auth/OrganizationAuthenticatorImpl.java 2011-04-27 13:22:03 UTC (rev 4313)
@@ -161,7 +161,7 @@
{
if (orgService instanceof ComponentRequestLifecycle)
{
- RequestLifeCycle.begin((ComponentRequestLifecycle)orgService);
+ RequestLifeCycle.begin((ComponentRequestLifecycle)orgService);
}
}
@@ -169,7 +169,7 @@
{
if (orgService instanceof ComponentRequestLifecycle)
{
- RequestLifeCycle.end();
+ RequestLifeCycle.end();
}
}
Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/BaseDAO.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/BaseDAO.java 2011-04-27 12:53:16 UTC (rev 4312)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/BaseDAO.java 2011-04-27 13:22:03 UTC (rev 4313)
@@ -162,7 +162,7 @@
catch (NamingException e)
{
if (LOG.isDebugEnabled())
- e.printStackTrace();
+ LOG.debug(e.getLocalizedMessage(), e);
}
return results;
}
@@ -294,7 +294,7 @@
catch (NameNotFoundException e)
{
if (LOG.isDebugEnabled())
- e.printStackTrace();
+ LOG.debug(e.getLocalizedMessage(), e);
// Object with specified Distinguished Name not found. Null will be
// returned. This result we regard as successful, just nothing found.
return null;
Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/GroupDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/GroupDAOImpl.java 2011-04-27 12:53:16 UTC (rev 4312)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/GroupDAOImpl.java 2011-04-27 13:22:03 UTC (rev 4313)
@@ -423,7 +423,7 @@
catch (NameNotFoundException e)
{
if (LOG.isDebugEnabled())
- e.printStackTrace();
+ LOG.debug(e.getLocalizedMessage(), e);
}
return null;
}
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-04-27 12:53:16 UTC (rev 4312)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java 2011-04-27 13:22:03 UTC (rev 4313)
@@ -121,7 +121,7 @@
catch (NameNotFoundException e)
{
if (LOG.isDebugEnabled())
- e.printStackTrace();
+ LOG.debug(e.getLocalizedMessage(), e);
}
// if not found
if (attrs == null)
@@ -268,7 +268,7 @@
catch (NameNotFoundException e2)
{
if (LOG.isDebugEnabled())
- e2.printStackTrace();
+ LOG.debug(e2.getLocalizedMessage(), e2);
return null;
}
finally
@@ -324,7 +324,7 @@
}
catch (Exception e1)
{
- e1.printStackTrace();
+ LOG.error(e1.getLocalizedMessage(), e1);
}
}
return memberships;
Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipTypeDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipTypeDAOImpl.java 2011-04-27 12:53:16 UTC (rev 4312)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipTypeDAOImpl.java 2011-04-27 13:22:03 UTC (rev 4313)
@@ -195,7 +195,7 @@
catch (NameNotFoundException e)
{
if (LOG.isDebugEnabled())
- e.printStackTrace();
+ LOG.debug(e.getLocalizedMessage(), e);
return null;
}
finally
@@ -233,7 +233,7 @@
catch (NameNotFoundException e)
{
if (LOG.isDebugEnabled())
- e.printStackTrace();
+ LOG.debug(e.getLocalizedMessage(), e);
return null;
}
finally
Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserProfileDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserProfileDAOImpl.java 2011-04-27 12:53:16 UTC (rev 4312)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserProfileDAOImpl.java 2011-04-27 13:22:03 UTC (rev 4313)
@@ -42,6 +42,7 @@
import javax.naming.directory.ModificationItem;
import javax.naming.ldap.LdapContext;
+
/**
* Created by The eXo Platform SAS Author : Tuan Nguyen
* tuan08(a)users.sourceforge.net Oct 14, 2005. @version andrew00x $
@@ -162,7 +163,7 @@
}
catch (InvalidAttributeValueException invalid)
{
- invalid.printStackTrace();
+ LOG.error(invalid.getLocalizedMessage(), invalid);
}
finally
{
@@ -201,7 +202,7 @@
catch (NameNotFoundException e)
{
if (LOG.isDebugEnabled())
- e.printStackTrace();
+ LOG.debug(e.getLocalizedMessage(), e);
return null;
}
finally
@@ -239,7 +240,7 @@
catch (NameNotFoundException e)
{
if (LOG.isDebugEnabled())
- e.printStackTrace();
+ LOG.debug(e.getLocalizedMessage(), e);
return null;
}
finally
Modified: core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/AbstractLoginModule.java
===================================================================
--- core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/AbstractLoginModule.java 2011-04-27 12:53:16 UTC (rev 4312)
+++ core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/AbstractLoginModule.java 2011-04-27 13:22:03 UTC (rev 4313)
@@ -115,7 +115,8 @@
container = RootContainer.getInstance().getPortalContainer(portalContainerName);
if (container == null)
{
- throw new Exception("The eXo container is null, because the current container is a RootContainer and there is no PortalContainer with the name '" + portalContainerName + "'.");
+ throw new Exception("The eXo container is null, because the current container is a RootContainer "
+ + "and there is no PortalContainer with the name '" + portalContainerName + "'.");
}
}
else if (container == null)
Modified: core/trunk/exo.core.component.web.css/src/main/java/org/exoplatform/services/web/css/model/ModelBuilder.java
===================================================================
--- core/trunk/exo.core.component.web.css/src/main/java/org/exoplatform/services/web/css/model/ModelBuilder.java 2011-04-27 12:53:16 UTC (rev 4312)
+++ core/trunk/exo.core.component.web.css/src/main/java/org/exoplatform/services/web/css/model/ModelBuilder.java 2011-04-27 13:22:03 UTC (rev 4313)
@@ -27,7 +27,8 @@
import org.w3c.css.sac.SelectorList;
/**
- * A document handler implementation that creates an instance of a {@link org.exoplatform.services.web.css.model.StylesheetObject } object.
+ * A document handler implementation that creates
+ * an instance of a {@link org.exoplatform.services.web.css.model.StylesheetObject } object.
*
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
15 years
exo-jcr SVN: r4312 - in core/branches/2.3.x/patch: 2.3.9 and 1 other directories.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-04-27 08:53:16 -0400 (Wed, 27 Apr 2011)
New Revision: 4312
Added:
core/branches/2.3.x/patch/2.3.9/
core/branches/2.3.x/patch/2.3.9/COR-235/
core/branches/2.3.x/patch/2.3.9/COR-235/COR-235.patch
Log:
COR-235: patch proposed
Added: core/branches/2.3.x/patch/2.3.9/COR-235/COR-235.patch
===================================================================
--- core/branches/2.3.x/patch/2.3.9/COR-235/COR-235.patch (rev 0)
+++ core/branches/2.3.x/patch/2.3.9/COR-235/COR-235.patch 2011-04-27 12:53:16 UTC (rev 4312)
@@ -0,0 +1,35 @@
+Index: exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/SimpleLdapUserListAccess.java
+===================================================================
+--- exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/SimpleLdapUserListAccess.java (revision 4240)
++++ exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/SimpleLdapUserListAccess.java (working copy)
+@@ -59,6 +59,7 @@
+ /**
+ * {@inheritDoc}
+ */
++ @Override
+ protected User[] load(LdapContext ctx, int index, int length) throws Exception
+ {
+ User[] users = new User[length];
+@@ -69,7 +70,14 @@
+ SortControl sctl = new SortControl(new String[]{ldapAttrMapping.userUsernameAttr}, Control.NONCRITICAL);
+ ctx.setRequestControls(new Control[]{sctl});
+
++ // returns only needed attributes for creation UserImpl in
++ // LDAPAttributeMapping.attributesToUser() method
++ String[] returnedAtts =
++ {ldapAttrMapping.userUsernameAttr, ldapAttrMapping.userFirstNameAttr, ldapAttrMapping.userLastNameAttr,
++ ldapAttrMapping.userDisplayNameAttr, ldapAttrMapping.userMailAttr, ldapAttrMapping.userPassword};
++
+ SearchControls constraints = new SearchControls();
++ constraints.setReturningAttributes(returnedAtts);
+ constraints.setSearchScope(SearchControls.SUBTREE_SCOPE);
+
+ results = ctx.search(searchBase, filter, constraints);
+@@ -101,6 +109,7 @@
+ /**
+ * {@inheritDoc}
+ */
++ @Override
+ protected int getSize(LdapContext ctx) throws Exception
+ {
+ if (size < 0)
15 years
exo-jcr SVN: r4311 - core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-04-27 08:38:57 -0400 (Wed, 27 Apr 2011)
New Revision: 4311
Modified:
core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/SimpleLdapUserListAccess.java
Log:
EXOJCR-1318: return only exptected attributes
Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/SimpleLdapUserListAccess.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/SimpleLdapUserListAccess.java 2011-04-27 12:12:21 UTC (rev 4310)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/SimpleLdapUserListAccess.java 2011-04-27 12:38:57 UTC (rev 4311)
@@ -59,6 +59,7 @@
/**
* {@inheritDoc}
*/
+ @Override
protected User[] load(LdapContext ctx, int index, int length) throws Exception
{
User[] users = new User[length];
@@ -69,7 +70,14 @@
SortControl sctl = new SortControl(new String[]{ldapAttrMapping.userUsernameAttr}, Control.NONCRITICAL);
ctx.setRequestControls(new Control[]{sctl});
+ // returns only needed attributes for creation UserImpl in
+ // LDAPAttributeMapping.attributesToUser() method
+ String[] returnedAtts =
+ {ldapAttrMapping.userUsernameAttr, ldapAttrMapping.userFirstNameAttr, ldapAttrMapping.userLastNameAttr,
+ ldapAttrMapping.userDisplayNameAttr, ldapAttrMapping.userMailAttr, ldapAttrMapping.userPassword};
+
SearchControls constraints = new SearchControls();
+ constraints.setReturningAttributes(returnedAtts);
constraints.setSearchScope(SearchControls.SUBTREE_SCOPE);
results = ctx.search(searchBase, filter, constraints);
@@ -101,6 +109,7 @@
/**
* {@inheritDoc}
*/
+ @Override
protected int getSize(LdapContext ctx) throws Exception
{
if (size < 0)
15 years