[exo-jcr-commits] exo-jcr SVN: r4313 - in core/trunk: exo.core.component.database/src/main/java/org/exoplatform/services/database/impl and 7 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Wed Apr 27 09:22:04 EDT 2011
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 at 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 at exoplatform.com">Julien Viet</a>
* @version $Revision$
More information about the exo-jcr-commits
mailing list