December 2011 - exo-jcr-commits - Jboss List Archives

exo-jcr SVN: r5383 - in jcr/trunk: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/access and 25 other directories.

by do-not-reply＠jboss.org

Author: andrew.plotnikov Date: 2011-12-29 05:29:54 -0500 (Thu, 29 Dec 2011) New Revision: 5383 Modified: jcr/trunk/applications/exo.jcr.cluster.testclient/src/main/java/org/exoplatform/services/jcr/cluster/JCRWebdavConnection.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/access/AccessControlList.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PlainChangesLogImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/TransactionChangesLog.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/QPath.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DBRestore.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/PropertyImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/NodeTypeDataValidator.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/PropertyDefinitionComparator.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MoreLikeThis.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/ext/action/SessionEventMatcher.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryContainerImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryStorageConnection.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/OracleConnectionFactory.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/OraclePoolConnectionFactory.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OracleConnectionFactory.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OraclePoolConnectionFactory.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/BaseXmlExporter.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/DocumentViewContentExporter.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/DocumentViewStreamExporter.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/FileNameProducer.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/ReplicationService.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/recovery/FileNameFactory.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/test/bandwidth/BandwidthAllocationTestCase.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/script/groovy/JcrGroovyResourceLoader.java jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/FtpTextUtils.java jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientCommandThread.java jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientSessionImpl.java jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdPasv.java jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdPort.java jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdPwd.java jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/LockCommand.java jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/lnkproducer/LinkGenerator.java jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/GetPropertiesCommand.java jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdNlst.java jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/FtpCommandImpl.java Log: EXOJCR-1687: Fixed new sonar violations in project Modified: jcr/trunk/applications/exo.jcr.cluster.testclient/src/main/java/org/exoplatform/services/jcr/cluster/JCRWebdavConnection.java =================================================================== --- jcr/trunk/applications/exo.jcr.cluster.testclient/src/main/java/org/exoplatform/services/jcr/cluster/JCRWebdavConnection.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/applications/exo.jcr.cluster.testclient/src/main/java/org/exoplatform/services/jcr/cluster/JCRWebdavConnection.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -88,13 +88,13 @@ public HTTPResponse addNode(String name, String[] mixinTypes, byte[] data) throws IOException, ModuleException { // construct string containing mixins in comma separated format - String mixins = mixinTypes.length > 0 ? mixinTypes[0] : ""; + StringBuilder mixins = new StringBuilder(mixinTypes.length > 0 ? mixinTypes[0] : ""); for (int i = 1; i < mixinTypes.length; i++) { - mixins = mixins + ", " + mixinTypes[i]; + mixins.append(", ").append(mixinTypes[i]); } NVPair[] headers = new NVPair[2]; - headers[0] = new NVPair(ExtHttpHeaders.CONTENT_MIXINTYPES, mixins); + headers[0] = new NVPair(ExtHttpHeaders.CONTENT_MIXINTYPES, mixins.toString()); headers[1] = new NVPair(HttpHeaders.CONTENT_TYPE, "text/plain"); HTTPResponse response = Put(workspacePath + name, data, headers); response.getStatusCode(); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/access/AccessControlList.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/access/AccessControlList.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/access/AccessControlList.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -223,19 +223,19 @@ public String dump() { - String res = "OWNER: " + (owner != null ? owner : "null") + "\n"; + StringBuilder res = new StringBuilder("OWNER: ").append(owner != null ? owner : "null").append("\n"); if (accessList != null) { for (AccessControlEntry a : accessList) { - res += a.getAsString() + "\n"; + res.append(a.getAsString()).append("\n"); } } else { - res += "null"; + res.append("null"); } - return res; + return res.toString(); } public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PlainChangesLogImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PlainChangesLogImpl.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PlainChangesLogImpl.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -213,17 +213,18 @@ public String dump() { - String str = "ChangesLog: \n"; + StringBuilder str = new StringBuilder("ChangesLog: \n"); for (int i = 0; i < items.size(); i++) { - str += - " " + ItemState.nameFromValue(items.get(i).getState()) + "\t" + items.get(i).getData().getIdentifier() - + "\t" + "isPersisted=" + items.get(i).isPersisted() + "\t" + "isEventFire=" - + items.get(i).isEventFire() + "\t" + "isInternallyCreated=" + items.get(i).isInternallyCreated() + "\t" - + items.get(i).getData().getQPath().getAsString() + "\n"; + str.append(" ").append(ItemState.nameFromValue(items.get(i).getState())).append("\t") + .append(items.get(i).getData().getIdentifier()); + str.append("\t").append("isPersisted=").append(items.get(i).isPersisted()).append("\t").append("isEventFire="); + str.append(items.get(i).isEventFire()).append("\t").append("isInternallyCreated=") + .append(items.get(i).isInternallyCreated()).append("\t"); + str.append(items.get(i).getData().getQPath().getAsString()).append("\n"); } - return str; + return str.toString(); } /** Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/TransactionChangesLog.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/TransactionChangesLog.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/TransactionChangesLog.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -173,12 +173,12 @@ public String dump() { - String str = "ChangesLog: size" + changesLogs.size() + "\n "; + StringBuilder str = new StringBuilder("ChangesLog: size").append(changesLogs.size()).append("\n "); for (PlainChangesLog cLog : changesLogs) { - str += cLog.dump() + "\n"; + str.append(cLog.dump()).append("\n"); } - return str; + return str.toString(); } // Need for Externalizable Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/QPath.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/QPath.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/QPath.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -270,12 +270,12 @@ if (stringName == null) { - String str = ""; + StringBuilder str = new StringBuilder(); for (int i = 0; i < getLength(); i++) { - str += names[i].getAsString(true); + str.append(names[i].getAsString(true)); } - stringName = str; + stringName = str.toString(); } return stringName; Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DBRestore.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DBRestore.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DBRestore.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -334,16 +334,16 @@ } // construct statement - String names = ""; - String parameters = ""; + StringBuilder names = new StringBuilder(); + StringBuilder parameters = new StringBuilder(); for (int i = 0; i < targetColumnCount; i++) { if (restoreRule.getSkipColumnIndex() != null && restoreRule.getSkipColumnIndex() == i) { continue; } - names += columnName.get(i) + (i == targetColumnCount - 1 ? "" : ","); - parameters += "?" + (i == targetColumnCount - 1 ? "" : ","); + names.append(columnName.get(i)).append(i == targetColumnCount - 1 ? "" : ","); + parameters.append("?").append(i == targetColumnCount - 1 ? "" : ","); } int batchSize = 0; Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/PropertyImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/PropertyImpl.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/PropertyImpl.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -576,20 +576,20 @@ */ public String dump() { - String vals = "Property "; + StringBuilder vals = new StringBuilder("Property "); try { - vals = getPath() + " values: "; + vals = new StringBuilder(getPath()).append(" values: "); for (int i = 0; i < getValueArray().length; i++) { - vals += new String(((BaseValue)getValueArray()[i]).getInternalData().getAsByteArray()) + ";"; + vals.append(new String(((BaseValue)getValueArray()[i]).getInternalData().getAsByteArray())).append(";"); } } catch (Exception e) { LOG.error(e.getLocalizedMessage(), e); } - return vals; + return vals.toString(); } // ----------------------- Object ----------------------- Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -862,14 +862,12 @@ final Set<InternalQName> descendantNt = this.nodeTypeRepository.getSubtypes(nodeTypeName); if (descendantNt.size() > 0) { - String message = - "Can not remove " + nodeTypeName.getAsString() - + "nodetype, because the following node types depend on it: "; + StringBuilder message = new StringBuilder("Can not remove ").append(nodeTypeName.getAsString()).append("nodetype, because the following node types depend on it: "); for (final InternalQName internalQName : descendantNt) { - message += internalQName.getAsString() + " "; + message.append(internalQName.getAsString()).append(" "); } - throw new RepositoryException(message); + throw new RepositoryException(message.toString()); } final Set<String> nodes = this.indexSearcherHolder.getNodesByNodeType(nodeTypeName); if (nodes.size() > 0) Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/NodeTypeDataValidator.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/NodeTypeDataValidator.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/NodeTypeDataValidator.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -166,19 +166,19 @@ } if (unresolvedDependecies.size() > 0) { - String msg = "Fail. Unresolved cyclic dependecy for :"; + StringBuilder msg = new StringBuilder("Fail. Unresolved cyclic dependecy for :"); for (InternalQName internalQName : resolvedDependecies) { - msg += " " + internalQName.getAsString(); + msg.append(" ").append(internalQName.getAsString()); } - msg += " Unresolved "; + msg.append(" Unresolved "); for (InternalQName internalQName : unresolvedDependecies) { - msg += " " + internalQName.getAsString(); + msg.append(" ").append(internalQName.getAsString()); } - throw new RepositoryException(msg); + throw new RepositoryException(msg.toString()); } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/PropertyDefinitionComparator.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/PropertyDefinitionComparator.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/PropertyDefinitionComparator.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -189,16 +189,17 @@ getNodes(nodesData, new InternalQName[]{}, new InternalQName[]{recipientDefinitionData.getName()}); if (mandatoryNodes.size() > 0) { - String message = - "Can not change " + recipientDefinitionData.getName().getAsString() - + " property definition from mandatory=false to mandatory = true , because " + " the following nodes "; + StringBuilder message = + new StringBuilder("Can not change ").append(recipientDefinitionData.getName().getAsString()).append( + " property definition from mandatory=false to mandatory = true , because ").append(" the following nodes "); + for (NodeData nodeData : mandatoryNodes) { - message += nodeData.getQPath().getAsString() + " "; + message.append(nodeData.getQPath().getAsString()).append(" "); } - message += " doesn't have these properties "; + message.append(" doesn't have these properties "); - throw new ConstraintViolationException(message); + throw new ConstraintViolationException(message.toString()); } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MoreLikeThis.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MoreLikeThis.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MoreLikeThis.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -613,9 +613,10 @@ // go through all the fields and find the largest document frequency String topField = fieldNames[0]; int docFreq = 0; - for (int i = 0; i < fieldNames.length; i++) { + for (int i = 0; i < fieldNames.length; i++) + { int freq = ir.docFreq(new Term(fieldNames[i], word)); - topField = (freq > docFreq) ? fieldNames[i] : topField; + topField = (freq > docFreq) ? fieldNames[i] : topField; //NOSONAR docFreq = (freq > docFreq) ? freq : docFreq; } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/ext/action/SessionEventMatcher.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/ext/action/SessionEventMatcher.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/ext/action/SessionEventMatcher.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -87,27 +87,28 @@ public String dump() { - String str = "SessionEventMatcher: " + eventTypes + "\n"; + StringBuilder str = new StringBuilder("SessionEventMatcher: ").append(eventTypes).append("\n"); if (paths != null) { - str += "Paths (isDeep=" + isDeep + "):\n"; + str.append("Paths (isDeep=").append(isDeep).append("):\n"); + for (QPath p : paths) { - str += p.getAsString() + "\n"; + str.append(p.getAsString()).append("\n"); } } if (nodeTypeNames != null) { - str += "Node Types:\n"; + str.append("Node Types:\n"); for (InternalQName n : nodeTypeNames) { - str += n.getAsString() + "\n"; + str.append(n.getAsString()).append("\n"); } } - return str; + return str.toString(); } public final boolean match(Condition conditions) Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryContainerImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryContainerImpl.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryContainerImpl.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -61,9 +61,9 @@ */ public String getInfo() { - String str = "Info: Inmemory (for testing only) based container \n"; - str += "Name: " + name + "\n"; - return str; + StringBuilder str = new StringBuilder("Info: Inmemory (for testing only) based container \n"); + str.append("Name: ").append(name).append("\n"); + return str.toString(); } /** Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryStorageConnection.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryStorageConnection.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryStorageConnection.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -274,14 +274,14 @@ public String dump() { - String str = "Inmemory WorkspaceContainer Data: \n"; + StringBuilder str = new StringBuilder("Inmemory WorkspaceContainer Data: \n"); Iterator i = items.keySet().iterator(); while (i.hasNext()) { MapKey d = (MapKey)i.next(); - str += d.getQPath().getAsString() + '\t' + d.getItemType().toString() + "\n"; + str.append(d.getQPath().getAsString()).append('\t').append(d.getItemType().toString()).append("\n"); } - return str; + return str.toString(); } public void rename(NodeData destData) throws RepositoryException, UnsupportedOperationException, Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/OracleConnectionFactory.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/OracleConnectionFactory.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/OracleConnectionFactory.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -152,12 +152,12 @@ catch (Throwable e) { cds = null; - String err = "Oracle OCI connection cache is unavailable due to error " + e; + StringBuilder err = new StringBuilder("Oracle OCI connection cache is unavailable due to error ").append(e); if (e.getCause() != null) { - err += " (" + e.getCause() + ")"; + err.append(" (").append(e.getCause()).append(")"); } - err += ". Standard JDBC DriverManager will be used for connections opening."; + err.append(". Standard JDBC DriverManager will be used for connections opening."); if (log.isDebugEnabled()) log.warn(err, e); else Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/OraclePoolConnectionFactory.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/OraclePoolConnectionFactory.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/OraclePoolConnectionFactory.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -124,12 +124,12 @@ catch (Throwable e) { cpool = null; - String err = "Oracle OCI connection pool is unavailable due to error " + e; + StringBuilder err = new StringBuilder("Oracle OCI connection pool is unavailable due to error ").append(e); if (e.getCause() != null) { - err += " (" + e.getCause() + ")"; + err.append(" (").append(e.getCause()).append(")"); } - err += ". Standard JDBC DriverManager will be used for connections opening."; + err.append(". Standard JDBC DriverManager will be used for connections opening."); if (log.isDebugEnabled()) log.warn(err, e); else Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OracleConnectionFactory.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OracleConnectionFactory.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OracleConnectionFactory.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -154,12 +154,12 @@ catch (Throwable e) { cds = null; - String err = "Oracle OCI connection cache is unavailable due to error " + e; + StringBuilder err = new StringBuilder("Oracle OCI connection cache is unavailable due to error ").append(e); if (e.getCause() != null) { - err += " (" + e.getCause() + ")"; + err.append(" (").append(e.getCause()).append(")"); } - err += ". Standard JDBC DriverManager will be used for connections opening."; + err.append(". Standard JDBC DriverManager will be used for connections opening."); if (log.isDebugEnabled()) log.warn(err, e); else Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OraclePoolConnectionFactory.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OraclePoolConnectionFactory.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OraclePoolConnectionFactory.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -124,12 +124,12 @@ catch (Throwable e) { cpool = null; - String err = "Oracle OCI connection pool is unavailable due to error " + e; + StringBuilder err = new StringBuilder("Oracle OCI connection pool is unavailable due to error ").append(e); if (e.getCause() != null) { - err += " (" + e.getCause() + ")"; + err.append(" (").append(e.getCause()).append(")"); } - err += ". Standard JDBC DriverManager will be used for connections opening."; + err.append(". Standard JDBC DriverManager will be used for connections opening."); if (log.isDebugEnabled()) log.warn(err, e); else Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/BaseXmlExporter.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/BaseXmlExporter.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/BaseXmlExporter.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -227,11 +227,11 @@ nodeName = prefix.length() == 0 ? "" : prefix + ":"; if ("".equals(itemPath.getName().getName()) && itemPath.isDescendantOf(Constants.EXO_NAMESPACES_PATH)) { - nodeName += DEFAULT_EMPTY_NAMESPACE_PREFIX; + nodeName += DEFAULT_EMPTY_NAMESPACE_PREFIX; //NOSONAR } else { - nodeName += internalNodeName.getName(); + nodeName += internalNodeName.getName(); //NOSONAR } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/DocumentViewContentExporter.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/DocumentViewContentExporter.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/DocumentViewContentExporter.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -114,7 +114,7 @@ continue; } - strValue += + strValue += //NOSONAR MULTI_VALUE_DELIMITER + (property.getType() == PropertyType.BINARY ? strVal : StringConverter.normalizeString(strVal, true)); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/DocumentViewStreamExporter.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/DocumentViewStreamExporter.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/DocumentViewStreamExporter.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -117,7 +117,7 @@ { continue; } - strValue += + strValue += //NOSONAR MULTI_VALUE_DELIMITER + (property.getType() == PropertyType.BINARY ? strVal : StringConverter.normalizeString(strVal, true)); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -155,15 +155,16 @@ if (log.isDebugEnabled()) { - String str = ""; + StringBuilder str = new StringBuilder(); for (int i = 0; i < changesLog.getAllStates().size(); i++) - str += - " " + ItemState.nameFromValue(changesLog.getAllStates().get(i).getState()) + "\t\t" - + changesLog.getAllStates().get(i).getData().getIdentifier() + "\t" + "isPersisted=" - + changesLog.getAllStates().get(i).isPersisted() + "\t" + "isEventFire=" - + changesLog.getAllStates().get(i).isEventFire() + "\t" + "isInternallyCreated=" - + changesLog.getAllStates().get(i).isInternallyCreated() + "\t" - + changesLog.getAllStates().get(i).getData().getQPath().getAsString() + "\n"; + { + str.append(" ").append(ItemState.nameFromValue(changesLog.getAllStates().get(i).getState())).append("\t\t"); + str.append(changesLog.getAllStates().get(i).getData().getIdentifier()).append("\t").append("isPersisted="); + str.append(changesLog.getAllStates().get(i).isPersisted()).append("\t").append("isEventFire="); + str.append(changesLog.getAllStates().get(i).isEventFire()).append("\t").append("isInternallyCreated="); + str.append(changesLog.getAllStates().get(i).isInternallyCreated()).append("\t"); + str.append(changesLog.getAllStates().get(i).getData().getQPath().getAsString()).append("\n"); + } log.debug(str); } if (isNeedReloadAncestorToSave) Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/FileNameProducer.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/FileNameProducer.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/FileNameProducer.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -207,18 +207,18 @@ String sDate = getStrDate(date); String sTime = getStrTime(date); - String fileName = backupSetName + "-" + sDate + "_" + sTime + "."; + StringBuilder fileName = new StringBuilder(backupSetName).append("-").append(sDate).append("_").append(sTime).append("."); if (isFullBackup) { - fileName += "0"; + fileName.append("0"); } else { - fileName += getNextSufix(); + fileName.append(getNextSufix()); } - return fileName; + return fileName.toString(); } private String getNextSufix() Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/ReplicationService.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/ReplicationService.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/ReplicationService.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -532,13 +532,13 @@ Element root = doc.createElement(SERVICE_NAME); doc.appendChild(root); - String reps = ""; + StringBuilder reps = new StringBuilder(); for (String rep : repoNamesList) { - reps += rep + ";"; + reps.append(rep).append(";"); } Element element = doc.createElement("repositories"); - setAttributeSmart(element, "repositories", reps); + setAttributeSmart(element, "repositories", reps.toString()); root.appendChild(element); element = doc.createElement("replication-properties"); Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/recovery/FileNameFactory.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/recovery/FileNameFactory.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/recovery/FileNameFactory.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -117,19 +117,23 @@ */ public String getRandomSubPath() { - String subPath = new String(); + StringBuilder subPath = new StringBuilder(); for (int i = 0; i < SUB_PATH_LENGTH; i++) { int index = (int)(Math.random() * PATTERN_1000) % pathCharSequence.length(); if (i != SUB_PATH_LENGTH - 1) - subPath += (pathCharSequence.charAt(index) + File.separator); + { + subPath.append(pathCharSequence.charAt(index)).append(File.separator); + } else - subPath += pathCharSequence.charAt(index); + { + subPath.append(pathCharSequence.charAt(index)); + } } - return subPath; + return subPath.toString(); } /** Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/test/bandwidth/BandwidthAllocationTestCase.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/test/bandwidth/BandwidthAllocationTestCase.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/test/bandwidth/BandwidthAllocationTestCase.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -159,13 +159,13 @@ try { // create random value - String sValue = ""; + StringBuilder value = new StringBuilder(); for (int i = 0; i < size; i++) { int sIndex = (int)(Math.random() * RANDOM_VALUE) % ALPHABET.length(); - sValue += ALPHABET.substring(sIndex, sIndex + 1); + value.append(ALPHABET.substring(sIndex, sIndex + 1)); } - + String sValue = value.toString(); for (int i = 0; i < iterations; i++) { String normalizePath = getNormalizePath(repoPath); Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/script/groovy/JcrGroovyResourceLoader.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/script/groovy/JcrGroovyResourceLoader.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/script/groovy/JcrGroovyResourceLoader.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -49,7 +49,7 @@ } else if (ref.charAt(ref.length() - 1) != '/') { - ref = ref + "/"; + ref = ref + "/"; //NOSONAR } res[i] = new URL(src[i], "#" + ref); } Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/FtpTextUtils.java =================================================================== --- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/FtpTextUtils.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/FtpTextUtils.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -36,30 +36,30 @@ { try { - String datka = ""; + StringBuilder datka = new StringBuilder(); for (int i = 0; i < reqLen; i++) { if (i >= strVal.length()) { - datka += " "; + datka.append(" "); } else { - datka += strVal.charAt(i); + datka.append(strVal.charAt(i)); } } - return datka; + return datka.toString(); } catch (Exception exc) { log.info("Unhandled exception. " + exc.getMessage(), exc); } - String resStr = ""; + StringBuilder resStr = new StringBuilder(); for (int i = 0; i < reqLen; i++) { - resStr += " "; + resStr.append(" "); } - return resStr; + return resStr.toString(); } public static String getStrachedAtStart(String strVal, int reqLen) @@ -67,7 +67,7 @@ String result = strVal; while (result.length() < reqLen) { - result = " " + result; + result = " " + result; //NOSONAR } return result; } Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientCommandThread.java =================================================================== --- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientCommandThread.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientCommandThread.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -93,11 +93,11 @@ { if ("".equals(comms[i])) { - comms[1] += " "; + comms[1] += " "; //NOSONAR } else { - comms[1] += " " + comms[i]; + comms[1] += " " + comms[i]; //NOSONAR } } Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientSessionImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientSessionImpl.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientSessionImpl.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -315,16 +315,16 @@ public String getRepoPath(ArrayList<String> repoPath) { - String curPath = "/"; + StringBuilder curPath = new StringBuilder("/"); for (int i = 1; i < repoPath.size(); i++) { - curPath += repoPath.get(i); + curPath.append(repoPath.get(i)); if (i < (repoPath.size() - 1)) { - curPath += "/"; + curPath.append("/"); } } - return curPath; + return curPath.toString(); } public Session getSession(String workspaceName) throws Exception Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdPasv.java =================================================================== --- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdPasv.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdPasv.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -49,15 +49,13 @@ } clientSession().setDataTransiver(transiver); - String serverLocation = clientSession().getServerIp(); - serverLocation = serverLocation.replace('.', ','); - + StringBuilder serverLocation = new StringBuilder(clientSession().getServerIp().replace('.', ',')); int dataPort = transiver.getDataPort(); int high = dataPort / 256; int low = dataPort % 256; - serverLocation += String.format(",%s,%s", high, low); - reply(String.format(FtpConst.Replyes.REPLY_227, serverLocation)); + serverLocation.append(String.format(",%s,%s", high, low)); + reply(String.format(FtpConst.Replyes.REPLY_227, serverLocation.toString())); } } Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdPort.java =================================================================== --- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdPort.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdPort.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -50,7 +50,7 @@ return; } - String host = ""; + StringBuilder host = new StringBuilder(); int port = 0; try @@ -58,9 +58,9 @@ String[] ports = params[1].split(","); for (int i = 0; i < 3; i++) { - host += ports[i] + "."; + host.append(ports[i]).append("."); } - host += ports[3]; + host.append(ports[3]); port = new Integer(ports[4]) * 256 + new Integer(ports[5]); } catch (Exception exc) @@ -72,7 +72,8 @@ try { FtpDataTransiver dataTransiver = - new FtpDataTransiverImpl(host, port, clientSession().getFtpServer().getConfiguration(), clientSession()); + new FtpDataTransiverImpl(host.toString(), port, clientSession().getFtpServer().getConfiguration(), + clientSession()); clientSession().setDataTransiver(dataTransiver); reply(String.format(FtpConst.Replyes.REPLY_200, "Port command success")); Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdPwd.java =================================================================== --- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdPwd.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdPwd.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -41,17 +41,17 @@ { ArrayList<String> curPath = clientSession().getPath(); - String path = "/"; + StringBuilder path = new StringBuilder("/"); for (int i = 0; i < curPath.size(); i++) { - path += curPath.get(i); + path.append(curPath.get(i)); if (i != (curPath.size() - 1)) { - path += "/"; + path.append("/"); } } - reply(String.format(FtpConst.Replyes.REPLY_257, path)); + reply(String.format(FtpConst.Replyes.REPLY_257, path.toString())); } } Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/LockCommand.java =================================================================== --- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/LockCommand.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/LockCommand.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -133,7 +133,7 @@ LockRequestEntity requestEntity = new LockRequestEntity(body); - lockToken = WebDavConst.Lock.OPAQUE_LOCK_TOKEN + ":" + lockToken; + lockToken = WebDavConst.Lock.OPAQUE_LOCK_TOKEN + ":" + lockToken; //NOSONAR if (bodyIsEmpty) { Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/lnkproducer/LinkGenerator.java =================================================================== --- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/lnkproducer/LinkGenerator.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/lnkproducer/LinkGenerator.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -157,7 +157,7 @@ writeBytes(rootItem, outStream); pathes = targetPath.split("/"); - String curHref = servletPath; + StringBuilder curHref = new StringBuilder(servletPath); for (int i = 0; i < pathes.length; i++) { @@ -166,17 +166,17 @@ continue; } String curName = pathes[i]; - curHref += "/" + curName; + curHref.append("/").append(curName); if (i < pathes.length - 1) { - byte[] linkItem = getHreffedFolder(curName, curHref); + byte[] linkItem = getHreffedFolder(curName, curHref.toString()); writeInt(linkItem.length + 2, outStream); writeBytes(linkItem, outStream); } else { - byte[] linkFile = getHreffedFile(curName, curHref); + byte[] linkFile = getHreffedFile(curName, curHref.toString()); writeInt(linkFile.length + 2, outStream); writeBytes(linkFile, outStream); } Modified: jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/GetPropertiesCommand.java =================================================================== --- jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/GetPropertiesCommand.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/GetPropertiesCommand.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -35,23 +35,23 @@ @Override public boolean perform(CliAppContext ctx) { - String output = ""; + StringBuilder output; try { Node currentNode = (Node)ctx.getCurrentItem(); PropertyIterator propertyIterator = currentNode.getProperties(); - output = "Properties:\n"; + output = new StringBuilder("Properties:\n"); while (propertyIterator.hasNext()) { Property property = propertyIterator.nextProperty(); - output += property.getName() + "\n"; + output.append(property.getName()).append("\n"); } } catch (Exception e) { - output = "Can't execute command - " + e.getMessage() + "\n"; + output = new StringBuilder("Can't execute command - ").append(e.getMessage()).append("\n"); } - ctx.setOutput(output); + ctx.setOutput(output.toString()); return false; } } Modified: jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdNlst.java =================================================================== --- jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdNlst.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdNlst.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -87,13 +87,13 @@ byte[] data = dataTransiver.receive(); dataTransiver.close(); - String dd = ""; + StringBuilder dd = new StringBuilder(); for (int i = 0; i < data.length; i++) { - dd += (char)data[i]; + dd.append((char)data[i]); } - String[] lines = dd.split("\r\n"); + String[] lines = dd.toString().split("\r\n"); for (int i = 0; i < lines.length; i++) { names.add(lines[i]); Modified: jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/FtpCommandImpl.java =================================================================== --- jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/FtpCommandImpl.java 2011-12-29 08:37:37 UTC (rev 5382) +++ jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/FtpCommandImpl.java 2011-12-29 10:29:54 UTC (rev 5383) @@ -18,7 +18,6 @@ */ package org.exoplatform.frameworks.ftpclient.commands; -import org.exoplatform.frameworks.ftpclient.FtpConst; import org.exoplatform.frameworks.ftpclient.FtpUtils; import org.exoplatform.frameworks.ftpclient.client.FtpClientSession; import org.exoplatform.services.log.ExoLogger; @@ -100,7 +99,7 @@ public int getReply() throws Exception { log.info("try get reply.........."); - String reply = ""; + StringBuilder reply = new StringBuilder(); String curReply = ""; while (true) @@ -109,24 +108,24 @@ if ("".equals(curReply)) { - reply += "\r\n"; + reply.append("\r\n"); } else { - reply += curReply; + reply.append(curReply); if (isReplyString(curReply)) { break; } else { - reply += "\r\n"; + reply.append("\r\n"); } } } - descript = reply; + descript = reply.toString(); replyCode = FtpUtils.getReplyCode(curReply); log.info("<<< " + descript); @@ -163,12 +162,12 @@ if (prevByte == '\r' && received == '\n') { - String resultLine = ""; + StringBuilder resultLine = new StringBuilder(); for (int i = 0; i < bufPos - 2; i++) { - resultLine += (char)buffer[i]; + resultLine.append((char)buffer[i]); } - return resultLine; + return resultLine.toString(); } prevByte = (byte)received;

12 years, 4 months

1
0
0 / 0

exo-jcr SVN: r5382 - jcr/trunk/exo.jcr.component.statistics/src/main/java/org/exoplatform/services/jcr/statistics.

by do-not-reply＠jboss.org

Author: areshetnyak Date: 2011-12-29 03:37:37 -0500 (Thu, 29 Dec 2011) New Revision: 5382 Modified: jcr/trunk/exo.jcr.component.statistics/src/main/java/org/exoplatform/services/jcr/statistics/JCRAPIAspect.java Log: EXOJCR-1687 : Fix import in JCR statistics project. Modified: jcr/trunk/exo.jcr.component.statistics/src/main/java/org/exoplatform/services/jcr/statistics/JCRAPIAspect.java =================================================================== --- jcr/trunk/exo.jcr.component.statistics/src/main/java/org/exoplatform/services/jcr/statistics/JCRAPIAspect.java 2011-12-29 07:31:08 UTC (rev 5381) +++ jcr/trunk/exo.jcr.component.statistics/src/main/java/org/exoplatform/services/jcr/statistics/JCRAPIAspect.java 2011-12-29 08:37:37 UTC (rev 5382) @@ -32,6 +32,11 @@ */ package org.exoplatform.services.jcr.statistics; +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.annotation.After; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; +import org.aspectj.lang.annotation.Pointcut; import org.exoplatform.container.ExoContainer; import org.exoplatform.container.ExoContainerContext; import org.exoplatform.services.log.ExoLogger;

12 years, 4 months

1
0
0 / 0

exo-jcr SVN: r5381 - kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils.

by do-not-reply＠jboss.org

Author: tolusha Date: 2011-12-29 02:31:08 -0500 (Thu, 29 Dec 2011) New Revision: 5381 Modified: kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/ISO8601.java Log: EXOJCR-1687: fix sonar violations Modified: kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/ISO8601.java =================================================================== --- kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/ISO8601.java 2011-12-28 15:47:47 UTC (rev 5380) +++ kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/ISO8601.java 2011-12-29 07:31:08 UTC (rev 5381) @@ -284,7 +284,6 @@ problems.append(", error offset "); problems.append(e.getErrorOffset()); problems.append(" \n"); - } catch (NumberFormatException e) { @@ -294,10 +293,9 @@ problems.append(" - "); problems.append(e.getMessage()); problems.append(" \n"); - } } - throw new ParseException("Can not parse " + dateString + " as Date. " + problems, errOffset); + throw new ParseException("Can not parse " + dateString + " as Date. " + problems.toString(), errOffset); } }

12 years, 4 months

1
0
0 / 0

exo-jcr SVN: r5380 - in jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext: hierarchy/impl and 1 other directory.

by do-not-reply＠jboss.org

Author: tolusha Date: 2011-12-28 10:47:47 -0500 (Wed, 28 Dec 2011) New Revision: 5380 Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/distribution/impl/DataDistributionByName.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/hierarchy/impl/NodeHierarchyCreatorImpl.java Log: EXOJCR-1688: Upgrading JCR user directory structure doesnot consumes a lot of memory Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/distribution/impl/DataDistributionByName.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/distribution/impl/DataDistributionByName.java 2011-12-28 15:45:30 UTC (rev 5379) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/distribution/impl/DataDistributionByName.java 2011-12-28 15:47:47 UTC (rev 5380) @@ -21,6 +21,7 @@ import org.exoplatform.services.jcr.impl.core.NodeImpl; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; import java.util.Map; @@ -45,17 +46,17 @@ */ public class DataDistributionByName extends AbstractDataDistributionType { - + /** * The level of depth used by the algorithm */ private int depth = 4; - + /** * The suffix used by the algorithm to indicate that they are sub nodes inside */ private String suffix = "___"; - + /** * {@inheritDoc} */ @@ -98,57 +99,48 @@ public void migrate(Node rootNode, String nodeType, List<String> mixinTypes, Map<String, String[]> permissions) throws RepositoryException { - // try to detect if migration is needed - NodeIterator iter = ((NodeImpl)rootNode).getNodesLazily(1); + NodeIterator iter = ((NodeImpl)rootNode).getNodesLazily(); while (iter.hasNext()) { - String userName = iter.nextNode().getName(); - if (userName.length() == 1) - { - continue; - } - else if (userName.endsWith(suffix) || (!iter.hasNext())) - { - return; - } - else - { - break; - } - } - - iter = ((NodeImpl)rootNode).getNodesLazily(); - while (iter.hasNext()) - { Node userNode = iter.nextNode(); - if (userNode.getName().length() == 1) - { - continue; - } - List<String> ancestors = getAncestors(userNode.getName()); - Node node = rootNode; - - for (int i = 0, length = ancestors.size() - 1; i < length; i++) + if (!alreadyMigrated(userNode)) { - String nodeName = ancestors.get(i); - try + Node ancestorNode = rootNode; + + Iterator<String> ancestors = getAncestors(userNode.getName()).iterator(); + while (ancestors.hasNext()) { - node = node.getNode(nodeName); - continue; + String ancestorName = ancestors.next(); + + if (ancestors.hasNext()) + { + try + { + ancestorNode = ancestorNode.getNode(ancestorName); + continue; + } + catch (PathNotFoundException e) + { + ancestorNode = + createNode(ancestorNode, ancestorName, nodeType, mixinTypes, permissions, false, false); + } + } + else + { + rootNode.getSession().move(userNode.getPath(), ancestorNode.getPath() + "/" + ancestorName); + } } - catch (PathNotFoundException e) - { - // ignore me - } - // The node doesn't exist we need to create it - node = createNode(node, nodeName, nodeType, mixinTypes, permissions, false, false); + rootNode.getSession().save(); } - - userNode.getSession().move(userNode.getPath(), node.getPath() + "/" + ancestors.get(ancestors.size() - 1)); } + } - rootNode.getSession().save(); + private boolean alreadyMigrated(Node userNode) throws RepositoryException + { + String nodeName = userNode.getName(); + + return nodeName.length() == 1 || nodeName.endsWith(suffix); } } Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/hierarchy/impl/NodeHierarchyCreatorImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/hierarchy/impl/NodeHierarchyCreatorImpl.java 2011-12-28 15:45:30 UTC (rev 5379) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/hierarchy/impl/NodeHierarchyCreatorImpl.java 2011-12-28 15:47:47 UTC (rev 5380) @@ -122,14 +122,17 @@ log.error("An error occurs while processing the plugins", e); } - try + if (isNeededToMigrate()) { - checkForUpgrade(); + try + { + migrate(); + } + catch (RepositoryException e) + { + log.error("An error occurs while upgrading JCR structure", e); + } } - catch (RepositoryException e) - { - log.error("An error occurs while upgrading JCR structure", e); - } } /** @@ -309,9 +312,10 @@ */ public Node getUserNode(SessionProvider sessionProvider, String userName) throws Exception { - String userPath = getJcrPath(USERS_PATH); Session session = getSession(sessionProvider); - Node usersNode = (Node)session.getItem(userPath); + + Node usersNode = getRootOfUsersNodes(session); + DataDistributionType type = dataDistributionManager_.getDataDistributionType(oldDistribution ? DataDistributionMode.NONE : DataDistributionMode.READABLE); @@ -323,11 +327,11 @@ */ public void removeUserNode(SessionProvider sessionProvider, String userName) throws Exception { - String userPath = getJcrPath(USERS_PATH); Session session = getSession(sessionProvider); try { - Node usersNode = (Node)session.getItem(userPath); + Node usersNode = getRootOfUsersNodes(session); + DataDistributionType type = dataDistributionManager_.getDataDistributionType(oldDistribution ? DataDistributionMode.NONE : DataDistributionMode.READABLE); @@ -375,26 +379,29 @@ } } - private void checkForUpgrade() throws RepositoryException + private boolean isNeededToMigrate() { - if (!oldDistribution && autoMigrate) + return !oldDistribution && autoMigrate; + } + + private void migrate() throws RepositoryException + { + Session session = getSession(SessionProvider.createSystemProvider()); + + try { - ManageableRepository repo = jcrService_.getCurrentRepository(); - Session session = repo.getSystemSession(repo.getConfiguration().getDefaultWorkspaceName()); - try - { - String userPath = getJcrPath(USERS_PATH); - Node usersNode = (Node)session.getItem(userPath); - - dataDistributionManager_.getDataDistributionType(DataDistributionMode.READABLE).migrate(usersNode); - } - finally - { - if (session != null) - { - session.logout(); - } - } + Node rootNode = getRootOfUsersNodes(session); + dataDistributionManager_.getDataDistributionType(DataDistributionMode.READABLE).migrate(rootNode); } + finally + { + session.logout(); + } } + + private Node getRootOfUsersNodes(Session session) throws PathNotFoundException, RepositoryException + { + String usersPath = getJcrPath(USERS_PATH); + return (Node)session.getItem(usersPath); + } }

12 years, 4 months

1
0
0 / 0

exo-jcr SVN: r5379 - in jcr/trunk: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core and 5 other directories.

by do-not-reply＠jboss.org

Author: andrew.plotnikov Date: 2011-12-28 10:45:30 -0500 (Wed, 28 Dec 2011) New Revision: 5379 Modified: jcr/trunk/applications/exo.jcr.applications.backupconsole/src/main/java/org/exoplatform/jcr/backupconsole/BackupClientImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/SQLExceptionHandler.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/TreeFileIOChannel.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/GetContextInfoCommand.java jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/data/FtpFileInfoImpl.java Log: EXOJCR-1687: Fixed new sonar violations in project Modified: jcr/trunk/applications/exo.jcr.applications.backupconsole/src/main/java/org/exoplatform/jcr/backupconsole/BackupClientImpl.java =================================================================== --- jcr/trunk/applications/exo.jcr.applications.backupconsole/src/main/java/org/exoplatform/jcr/backupconsole/BackupClientImpl.java 2011-12-28 15:33:38 UTC (rev 5378) +++ jcr/trunk/applications/exo.jcr.applications.backupconsole/src/main/java/org/exoplatform/jcr/backupconsole/BackupClientImpl.java 2011-12-28 15:45:30 UTC (rev 5379) @@ -307,63 +307,50 @@ if (info.getType() == DetailedInfo.COMPLETED) { - String result = "\nThe completed (ready to restore) backup information : \n"; + StringBuilder result = new StringBuilder("\nThe completed (ready to restore) backup information : \n"); BackupConfigBean configBean = info.getBackupConfig(); - result += - ("\t\tbackup id : " - + info.getBackupId() - + "\n" - + "\t\tbackup folder : " - + configBean.getBackupDir() - + "\n" - + "\t\trepository name : " - + info.getRepositoryName() - + "\n" - + (info.getWorkspaceName().equals("") ? "" : "\t\tworkspace name : " - + info.getWorkspaceName() + "\n") - + "\t\tbackup type : " - + (configBean.getBackupType() == BackupManager.FULL_AND_INCREMENTAL ? "full + incremental" - : "full only") + "\n" + "\t\tstarted time : " + info.getStartedTime() - + "\n" + (info.getFinishedTime().equals("") ? "\n" : "\t\tfinished time : " - + info.getFinishedTime() + "\n\n")); + result.append("\t\tbackup id : ").append(info.getBackupId()).append("\n"); + result.append("\t\tbackup folder : ").append(configBean.getBackupDir()).append("\n"); + result.append("\t\trepository name : ").append(info.getRepositoryName()).append("\n"); + result.append(info.getWorkspaceName().equals("") ? "" : "\t\tworkspace name : " + + info.getWorkspaceName() + "\n"); + result.append("\t\tbackup type : "); + result.append(configBean.getBackupType() == BackupManager.FULL_AND_INCREMENTAL ? "full + incremental" + : "full only"); + result.append("\n"); + result.append("\t\tstarted time : ").append(info.getStartedTime()).append("\n"); + result.append(info.getFinishedTime().equals("") ? "\n" : "\t\tfinished time : " + + info.getFinishedTime() + "\n\n"); - return result; + return result.toString(); } else { - String result = "\nThe current backup information : \n"; - + StringBuilder result = new StringBuilder("\nThe current backup information : \n"); BackupConfigBean configBean = info.getBackupConfig(); - result += - ("\t\tbackup id : " - + info.getBackupId() - + "\n" - + "\t\tbackup folder : " - + configBean.getBackupDir() - + "\n" - + "\t\trepository name : " - + info.getRepositoryName() - + "\n" - + (info.getWorkspaceName().equals("") ? "" : "\t\tworkspace name : " - + info.getWorkspaceName() + "\n") - + "\t\tbackup type : " - + (configBean.getBackupType() == BackupManager.FULL_AND_INCREMENTAL ? "full + incremental" - : "full only") + "\n" + "\t\tfull backup state : " + (info - .getWorkspaceName().equals("") ? getRepositoryBackupToFullState(info.getState()) - : getState(info.getState()))) - + "\n" - + (info.getBackupType() == BackupManager.FULL_BACKUP_ONLY ? "" - : "\t\tincremental backup state : " + "working" + "\n") - + "\t\tstarted time : " - + info.getStartedTime() - + "\n" - + (info.getFinishedTime().equals("") ? "\n" : "\t\tfinished time : " - + info.getFinishedTime() + "\n\n"); - - return result; + result.append("\t\tbackup id : ").append(info.getBackupId()).append("\n"); + result.append("\t\tbackup folder : ").append(configBean.getBackupDir()).append("\n"); + result.append("\t\trepository name : ").append(info.getRepositoryName()).append("\n"); + result.append(info.getWorkspaceName().equals("") ? "" : "\t\tworkspace name : " + + info.getWorkspaceName() + "\n"); + result.append("\t\tbackup type : "); + result.append(configBean.getBackupType() == BackupManager.FULL_AND_INCREMENTAL ? "full + incremental" + : "full only"); + result.append("\n"); + result.append("\t\tfull backup state : "); + result.append(info.getWorkspaceName().equals("") ? getRepositoryBackupToFullState(info.getState()) + : getState(info.getState())); + result.append("\n"); + result.append(info.getBackupType() == BackupManager.FULL_BACKUP_ONLY ? "" + : "\t\tincremental backup state : " + "working" + "\n"); + result.append("\t\tstarted time : ").append(info.getStartedTime()).append("\n"); + result.append(info.getFinishedTime().equals("") ? "\n" : "\t\tfinished time : " + + info.getFinishedTime() + "\n\n"); + + return result.toString(); } } else @@ -754,64 +741,58 @@ throw new RuntimeException("Can not get ShortInfoList from responce.", e); } - String result = "\nThe current backups information : \n"; + StringBuilder result = new StringBuilder("\nThe current backups information : \n"); if ((repositoryInfoList.getBackups().size() == 0) && (workspaceInfoList.getBackups().size() == 0)) { - result += "\tNo active backups.\n\n"; + result.append("\tNo active backups.\n\n"); } int count = 1; for (ShortInfo shortInfo : repositoryInfoList.getBackups()) { - result += "\t" + count + ") Repository backup with id " + shortInfo.getBackupId() + " :\n"; - - result += - ("\t\trepository name : " - + shortInfo.getRepositoryName() - + "\n" - + "\t\tbackup type : " - + (shortInfo.getBackupType() == BackupManager.FULL_AND_INCREMENTAL ? "full + incremental" - : "full only") + "\n" + "\t\tfull backups state : " - + getRepositoryBackupToFullState(shortInfo.getState())) - + "\n" - + (shortInfo.getBackupType() == BackupManager.FULL_BACKUP_ONLY ? "" - : "\t\tincremental backups state : " + "working" + "\n") - + "\t\tstarted time : " - + shortInfo.getStartedTime() - + "\n" - + (shortInfo.getFinishedTime().equals("") ? "" : "\t\tfinished time : " - + shortInfo.getFinishedTime() + "\n"); + result.append("\t").append(count).append(") Repository backup with id ").append(shortInfo.getBackupId()) + .append(" :\n"); + result.append("\t\trepository name : ").append(shortInfo.getRepositoryName()).append("\n"); + result.append("\t\tbackup type : "); + result.append(shortInfo.getBackupType() == BackupManager.FULL_AND_INCREMENTAL ? "full + incremental" + : "full only"); + result.append("\n"); + result.append("\t\tfull backups state : ") + .append(getRepositoryBackupToFullState(shortInfo.getState())).append("\n"); + result.append(shortInfo.getBackupType() == BackupManager.FULL_BACKUP_ONLY ? "" + : "\t\tincremental backups state : " + "working" + "\n"); + result.append("\t\tstarted time : ").append(shortInfo.getStartedTime()).append("\n"); + result.append(shortInfo.getFinishedTime().equals("") ? "" : "\t\tfinished time : " + + shortInfo.getFinishedTime() + "\n"); + count++; } for (ShortInfo shortInfo : workspaceInfoList.getBackups()) { - result += "\t" + count + ") Workspace backup with id " + shortInfo.getBackupId() + " :\n"; + result.append("\t").append(count).append(") Workspace backup with id ").append(shortInfo.getBackupId()) + .append(" :\n"); - result += - ("\t\trepository name : " - + shortInfo.getRepositoryName() - + "\n" - + "\t\tworkspace name : " - + shortInfo.getWorkspaceName() - + "\n" - + "\t\tbackup type : " - + (shortInfo.getBackupType() == BackupManager.FULL_AND_INCREMENTAL ? "full + incremental" - : "full only") + "\n" + "\t\tfull backup state : " + getState(shortInfo - .getState())) - + "\n" - + (shortInfo.getBackupType() == BackupManager.FULL_BACKUP_ONLY ? "" - : "\t\tincremental backup state : " + "working" + "\n") - + "\t\tstarted time : " - + shortInfo.getStartedTime() - + "\n" - + (shortInfo.getFinishedTime().equals("") ? "" : "\t\tfinished time : " - + shortInfo.getFinishedTime() + "\n"); + result.append("\t\trepository name : ").append(shortInfo.getRepositoryName()).append("\n"); + result.append("\t\tworkspace name : ").append(shortInfo.getWorkspaceName()).append("\n"); + + result.append("\t\tbackup type : "); + result.append( + shortInfo.getBackupType() == BackupManager.FULL_AND_INCREMENTAL ? "full + incremental" : "full only") + .append("\n"); + + result.append("\t\tfull backup state : ").append(getState(shortInfo.getState())).append("\n"); + result.append(shortInfo.getBackupType() == BackupManager.FULL_BACKUP_ONLY ? "" + : "\t\tincremental backup state : " + "working\n"); + result.append("\t\tstarted time : ").append(shortInfo.getStartedTime()).append("\n"); + result.append(shortInfo.getFinishedTime().equals("") ? "" : "\t\tfinished time : " + + shortInfo.getFinishedTime() + "\n"); + count++; } - return result; + return result.toString(); } else { @@ -856,50 +837,50 @@ throw new RuntimeException("Can not get ShortInfoList from responce.", e); } - String result = "\nThe completed (ready to restore) backups information : \n"; + StringBuilder result = new StringBuilder("\nThe completed (ready to restore) backups information : \n"); if ((repositoryInfoList.getBackups().size() == 0) && (workspaceInfoList.getBackups().size() == 0)) { - result += "\tNo completed backups.\n\n"; + result.append("\tNo completed backups.\n\n"); } int count = 1; for (ShortInfo shortInfo : repositoryInfoList.getBackups()) { - result += "\t" + count + ") Repository backup with id " + shortInfo.getBackupId() + " :\n"; + result.append("\t").append(count).append(") Repository backup with id ").append(shortInfo.getBackupId()) + .append(" :\n"); + result.append("\t\trepository name : ").append(shortInfo.getRepositoryName()).append("\n"); - result += - ("\t\trepository name : " - + shortInfo.getRepositoryName() - + "\n" - + "\t\tbackup type : " - + (shortInfo.getBackupType() == BackupManager.FULL_AND_INCREMENTAL ? "full + incremental" - : "full only") + "\n" + "\t\tstarted time : " - + shortInfo.getStartedTime() + "\n" + (shortInfo.getFinishedTime().equals("") ? "\n" - : "\t\tfinished time : " + shortInfo.getFinishedTime() + "\n")); + result.append("\t\tbackup type : "); + result.append( + shortInfo.getBackupType() == BackupManager.FULL_AND_INCREMENTAL ? "full + incremental" : "full only") + .append("\n"); + result.append("\t\tstarted time : ").append(shortInfo.getStartedTime()).append("\n"); + result.append(shortInfo.getFinishedTime().equals("") ? "\n" + : "\t\tfinished time : " + shortInfo.getFinishedTime() + "\n"); + count++; } for (ShortInfo shortInfo : workspaceInfoList.getBackups()) { - result += "\t" + count + ") Workspace backup with id " + shortInfo.getBackupId() + " :\n"; + result.append("\t").append(count).append(") Workspace backup with id ").append(shortInfo.getBackupId()) + .append(" :\n"); + result.append("\t\trepository name : ").append(shortInfo.getRepositoryName()).append("\n"); + result.append("\t\tworkspace name : ").append(shortInfo.getWorkspaceName()).append("\n"); - result += - ("\t\trepository name : " - + shortInfo.getRepositoryName() - + "\n" - + "\t\tworkspace name : " - + shortInfo.getWorkspaceName() - + "\n" - + "\t\tbackup type : " - + (shortInfo.getBackupType() == BackupManager.FULL_AND_INCREMENTAL ? "full + incremental" - : "full only") + "\n" + "\t\tstarted time : " - + shortInfo.getStartedTime() + "\n" + (shortInfo.getFinishedTime().equals("") ? "\n" - : "\t\tfinished time : " + shortInfo.getFinishedTime() + "\n")); + result.append("\t\tbackup type : "); + result.append( + shortInfo.getBackupType() == BackupManager.FULL_AND_INCREMENTAL ? "full + incremental" : "full only") + .append("\n"); + result.append("\t\tstarted time : ").append(shortInfo.getStartedTime()).append("\n"); + result.append(shortInfo.getFinishedTime().equals("") ? "\n" + : "\t\tfinished time : " + shortInfo.getFinishedTime() + "\n"); + count++; } - return result; + return result.toString(); } else { @@ -932,30 +913,25 @@ throw new RuntimeException("Can not get DetailedInfo from responce.", e); } - String result = "\nThe current restores information : \n"; + StringBuilder result = new StringBuilder("\nThe current restores information : \n"); - result += "\tWorkspace restore with id " + info.getBackupId() + ":\n"; + result.append("\tWorkspace restore with id ").append(info.getBackupId()).append(":\n"); BackupConfigBean configBean = info.getBackupConfig(); - result += - ("\t\tbackup folder : " - + configBean.getBackupDir() - + "\n" - + "\t\trepository name : " - + info.getRepositoryName() - + "\n" - + "\t\tworkspace name : " - + info.getWorkspaceName() - + "\n" - + "\t\tbackup type : " - + (configBean.getBackupType() == BackupManager.FULL_AND_INCREMENTAL ? "full + incremental" - : "full only") + "\n" + "\t\trestore state : " - + getRestoreState(info.getState()) + "\n" + "\t\tstarted time : " - + info.getStartedTime() + "\n" + (info.getFinishedTime().equals("") ? "\n" - : "\t\tfinished time : " + info.getFinishedTime() + "\n\n")); + result.append("\t\tbackup folder : ").append(configBean.getBackupDir()).append("\n"); + result.append("\t\trepository name : ").append(info.getRepositoryName()).append("\n"); + result.append("\t\tworkspace name : ").append(info.getWorkspaceName()).append("\n"); + result.append("\t\tbackup type : "); + result.append( + configBean.getBackupType() == BackupManager.FULL_AND_INCREMENTAL ? "full + incremental" : "full only") + .append("\n"); + result.append("\t\trestore state : ").append(getRestoreState(info.getState())).append("\n"); + result.append("\t\tstarted time : ").append(info.getStartedTime()).append("\n"); + result.append(info.getFinishedTime().equals("") ? "\n" + : "\t\tfinished time : " + info.getFinishedTime() + "\n\n"); - return result; + return result.toString(); } else { @@ -983,27 +959,25 @@ throw new RuntimeException("Can not get DetailedInfo from responce.", e); } - String result = "\nThe current restores information : \n"; + StringBuilder result = new StringBuilder("\nThe current restores information : \n"); - result += "\tRepository restore with id " + info.getBackupId() + ":\n"; + result.append("\tRepository restore with id ").append(info.getBackupId()).append(":\n"); BackupConfigBean configBean = info.getBackupConfig(); - result += - ("\t\tbackup folder : " - + configBean.getBackupDir() - + "\n" - + "\t\trepository name : " - + info.getRepositoryName() - + "\n" - + "\t\tbackup type : " - + (configBean.getBackupType() == BackupManager.FULL_AND_INCREMENTAL ? "full + incremental" - : "full only") + "\n" + "\t\trestore state : " - + getRepositoryRestoreState(info.getState()) + "\n" + "\t\tstarted time : " - + info.getStartedTime() + "\n" + (info.getFinishedTime().equals("") ? "\n" - : "\t\tfinished time : " + info.getFinishedTime() + "\n\n")); - - return result; + result.append("\t\tbackup folder : ").append(configBean.getBackupDir()).append("\n"); + result.append("\t\trepository name : ").append(info.getRepositoryName()).append("\n"); + result.append("\t\tbackup type : "); + result.append( + configBean.getBackupType() == BackupManager.FULL_AND_INCREMENTAL ? "full + incremental" : "full only") + .append("\n"); + result.append("\t\trestore state : ").append(getRepositoryRestoreState(info.getState())) + .append("\n"); + result.append("\t\tstarted time : ").append(info.getStartedTime()).append("\n"); + result.append(info.getFinishedTime().equals("") ? "\n" + : "\t\tfinished time : " + info.getFinishedTime() + "\n\n"); + + return result.toString(); } else { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2011-12-28 15:33:38 UTC (rev 5378) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2011-12-28 15:45:30 UTC (rev 5379) @@ -124,11 +124,9 @@ public String dump() { - String d = "\nChanges:"; - d += changesLog.dump(); - d += "\nCache:"; - d += itemsPool.dump(); - return d; + StringBuilder d = new StringBuilder("\nChanges:"); + d.append(changesLog.dump()).append("\nCache:").append(itemsPool.dump()); + return d.toString(); } /** @@ -536,10 +534,10 @@ if (log.isDebugEnabled()) { start = System.currentTimeMillis(); - String debugPath = ""; + StringBuilder debugPath = new StringBuilder(); for (QPathEntry rp : relPath) { - debugPath += rp.getAsString(); + debugPath.append(rp.getAsString()); } log.debug("getItem(" + parent.getQPath().getAsString() + " + " + debugPath + " ) >>>>>"); } @@ -553,10 +551,10 @@ { if (log.isDebugEnabled()) { - String debugPath = ""; + StringBuilder debugPath = new StringBuilder(); for (QPathEntry rp : relPath) { - debugPath += rp.getAsString(); + debugPath.append(rp.getAsString()); } log.debug("getItem(" + parent.getQPath().getAsString() + " + " + debugPath + ") --> " + (item != null ? item.getPath() : "null") + " <<<<< " + ((System.currentTimeMillis() - start) / 1000d) @@ -1994,7 +1992,7 @@ PlainChangesLog slog = changesLog.pushLog(item.getQPath()); SessionChangesLog changes = new SessionChangesLog(slog.getAllStates(), session); - String exceptions = ""; + StringBuilder exceptions = new StringBuilder(); for (Iterator<ItemImpl> removedIter = invalidated.iterator(); removedIter.hasNext();) { @@ -2005,8 +2003,8 @@ if (rstate == null) { - exceptions += - "Can't find removed item " + removed.getLocation().getAsString(false) + " in changes for rollback.\n"; + exceptions.append("Can't find removed item ").append(removed.getLocation().getAsString(false)) + .append(" in changes for rollback.\n"); continue; } @@ -2016,9 +2014,8 @@ rstate = changes.findItemState(rstate.getData().getIdentifier(), false, new int[]{ItemState.DELETED}); if (rstate == null) { - exceptions += - "Can't find removed item (of move operation) " + removed.getLocation().getAsString(false) - + " in changes for rollback.\n"; + exceptions.append("Can't find removed item (of move operation) ") + .append(removed.getLocation().getAsString(false)).append(" in changes for rollback.\n"); continue; } } @@ -2040,7 +2037,7 @@ removedIter.remove(); } - if (exceptions.length() > 0 && log.isDebugEnabled()) + if (exceptions.toString().length() > 0 && log.isDebugEnabled()) { log.warn(exceptions); } @@ -2708,16 +2705,18 @@ String dump() { - String str = "Items Pool: \n"; + StringBuilder str = new StringBuilder("Items Pool: \n"); try { for (ItemImpl item : getAll()) { if (item != null) { - str += - (item.isNode() ? "Node\t\t" : "Property\t") + "\t" + item.isValid() + "\t" + item.isNew() + "\t" - + item.getInternalIdentifier() + "\t" + item.getPath() + "\n"; + str.append(item.isNode() ? "Node\t\t" : "Property\t"); + str.append("\t").append(item.isValid()); + str.append("\t").append(item.isNew()); + str.append("\t").append(item.getInternalIdentifier()); + str.append("\t").append(item.getPath()).append("\n"); } } } @@ -2726,7 +2725,7 @@ log.error(e.getLocalizedMessage(), e); } - return str; + return str.toString(); } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/SQLExceptionHandler.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/SQLExceptionHandler.java 2011-12-28 15:33:38 UTC (rev 5378) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/SQLExceptionHandler.java 2011-12-28 15:45:30 UTC (rev 5379) @@ -102,7 +102,9 @@ protected String handleAddException(SQLException e, ItemData item) throws RepositoryException, InvalidItemStateException { - String message = "[" + containerName + "] ADD " + (item.isNode() ? "NODE. " : "PROPERTY. "); + StringBuilder message = new StringBuilder("["); + message.append(containerName).append("] ADD ").append(item.isNode() ? "NODE. " : "PROPERTY. "); + String errMessage = e.getMessage(); String itemInfo = item.getQPath().getAsString() + ", ID: " + item.getIdentifier() + ", ParentID: " + item.getParentIdentifier() @@ -114,51 +116,55 @@ String umsg = errMessage.toLowerCase().toUpperCase(); if (umsg.indexOf(conn.JCR_FK_ITEM_PARENT) >= 0) { - message += "Parent not found. Item " + itemInfo; - throw new JCRInvalidItemStateException(message, item.getIdentifier(), ItemState.ADDED, e); + message.append("Parent not found. Item ").append(itemInfo); + throw new JCRInvalidItemStateException(message.toString(), item.getIdentifier(), ItemState.ADDED, e); } else if (umsg.indexOf(conn.JCR_PK_ITEM) >= 0) { - message += "Item already exists. Condition: ID. " + itemInfo; + message.append("Item already exists. Condition: ID. ").append(itemInfo); // InvalidItemStateException ! - because it's impossible add new item with existed UUID - throw new JCRInvalidItemStateException(message, item.getIdentifier(), ItemState.ADDED, e); + throw new JCRInvalidItemStateException(message.toString(), item.getIdentifier(), ItemState.ADDED, e); } else if (umsg.indexOf(conn.JCR_IDX_ITEM_PARENT) >= 0 || umsg.indexOf(conn.JCR_IDX_ITEM_PARENT_NAME) >= 0) { - message += "Item already exists. Condition: parent ID, name, index. " + itemInfo; - throw new ItemExistsException(message, e); + message.append("Item already exists. Condition: parent ID, name, index. ").append(itemInfo); + throw new ItemExistsException(message.toString(), e); } else if (umsg.indexOf(conn.JCR_IDX_ITEM_PARENT_ID) >= 0) { - message += "Item already exists. Condition: parent ID and ID. " + itemInfo; - throw new ItemExistsException(message, e); + message.append("Item already exists. Condition: parent ID and ID. ").append(itemInfo); + throw new ItemExistsException(message.toString(), e); } else if (umsg.indexOf(conn.JCR_FK_VALUE_PROPERTY) >= 0) { - message += "Property is not exist but the value is being created. Condition: property ID. " + itemInfo; - throw new RepositoryException(message, e); + message.append("Property is not exist but the value is being created. Condition: property ID. ").append( + itemInfo); + throw new RepositoryException(message.toString(), e); } else if (umsg.indexOf(conn.JCR_IDX_VALUE_PROPERTY) >= 0) { - message += "Property already exists. Condition: property ID, order number. " + itemInfo; - throw new RepositoryException(message, e); + message.append("Property already exists. Condition: property ID, order number. ").append(itemInfo); + throw new RepositoryException(message.toString(), e); } else if (umsg.indexOf(conn.JCR_PK_VALUE) >= 0) { - message += - "[FATAL] Value already exists with the ValueID. Impossible state, check is ValueID is autoincremented. " - + itemInfo; - throw new RepositoryException(message, e); + message + .append( + "[FATAL] Value already exists with the ValueID. Impossible state, check is ValueID is autoincremented. ") + .append(itemInfo); + throw new RepositoryException(message.toString(), e); } else if (umsg.indexOf(conn.JCR_PK_REF) >= 0) { - message += "Reference chain already exists. Condition: node ID, property ID, order number. " + itemInfo; - throw new RepositoryException(message, e); + message.append("Reference chain already exists. Condition: node ID, property ID, order number. ").append( + itemInfo); + throw new RepositoryException(message.toString(), e); } else if (umsg.indexOf(conn.JCR_IDX_REF_PROPERTY) >= 0) { - message += "Referenceable property value already exists. Condition: property ID, order number. " + itemInfo; - throw new RepositoryException(message, e); + message.append("Referenceable property value already exists. Condition: property ID, order number. ") + .append(itemInfo); + throw new RepositoryException(message.toString(), e); } } @@ -176,8 +182,8 @@ if (me != null) { // item already exists - message += "Item already exists in storage: " + itemInfo; - ownException = new JCRItemExistsException(message, me.getIdentifier(), ItemState.ADDED, e); + message.append("Item already exists in storage: ").append(itemInfo); + ownException = new JCRItemExistsException(message.toString(), me.getIdentifier(), ItemState.ADDED, e); throw ownException; } @@ -186,8 +192,8 @@ ItemType.getItemType(item)); if (me != null) { - message += "Item already exists in storage: " + itemInfo; - ownException = new JCRItemExistsException(message, me.getIdentifier(), ItemState.ADDED, e); + message.append("Item already exists in storage: ").append(itemInfo); + ownException = new JCRItemExistsException(message.toString(), me.getIdentifier(), ItemState.ADDED, e); throw ownException; } @@ -204,20 +210,20 @@ && errMessage.indexOf(item.getIdentifier()) >= 0) { // it's JCR_PK_ITEM violation - message += "Item already exists. Condition: ID. " + itemInfo; - throw new JCRInvalidItemStateException(message, item.getIdentifier(), ItemState.ADDED, e); + message.append("Item already exists. Condition: ID. ").append(itemInfo); + throw new JCRInvalidItemStateException(message.toString(), item.getIdentifier(), ItemState.ADDED, e); } // DB2 violation if (e.getClass().getName().indexOf("SqlIntegrityConstraintViolationException") >= 0 && errMessage.indexOf("SQLCODE=-803") >= 0) { - message += "Item already exists." + itemInfo; - throw new JCRInvalidItemStateException(message, item.getIdentifier(), ItemState.ADDED, e); + message.append("Item already exists.").append(itemInfo); + throw new JCRInvalidItemStateException(message.toString(), item.getIdentifier(), ItemState.ADDED, e); } - message += "Error of item add. " + itemInfo; - ownException = new RepositoryException(message, e); + message.append("Error of item add. ").append(itemInfo); + ownException = new RepositoryException(message.toString(), e); throw ownException; } } @@ -227,8 +233,8 @@ if (ownException != null) throw ownException; } - message += "Error of item add. " + itemInfo; - throw new JCRInvalidItemStateException(message, item.getIdentifier(), ItemState.ADDED, e); + message.append("Error of item add. ").append(itemInfo); + throw new JCRInvalidItemStateException(message.toString(), item.getIdentifier(), ItemState.ADDED, e); } /** @@ -247,7 +253,9 @@ protected String handleAddException(IOException e, ItemData item) throws RepositoryException, InvalidItemStateException { - String message = "[" + containerName + "] ADD " + (item.isNode() ? "NODE. " : "PROPERTY. "); + StringBuilder message = new StringBuilder("["); + message.append(containerName).append("] ADD ").append(item.isNode() ? "NODE. " : "PROPERTY. "); + String errMessage = e.getMessage(); String itemInfo = item.getQPath().getAsString() + ", ID: " + item.getIdentifier() + ", ParentID: " + item.getParentIdentifier() @@ -267,8 +275,8 @@ if (me != null) { // item already exists - message += "Item already exists in storage: " + itemInfo; - ownException = new ItemExistsException(message, e); + message.append("Item already exists in storage: ").append(itemInfo); + ownException = new ItemExistsException(message.toString(), e); throw ownException; } @@ -277,8 +285,8 @@ ItemType.getItemType(item)); if (me != null) { - message += "Item already exists in storage: " + itemInfo; - ownException = new ItemExistsException(message, e); + message.append("Item already exists in storage: ").append(itemInfo); + ownException = new ItemExistsException(message.toString(), e); throw ownException; } @@ -289,8 +297,8 @@ if (ownException != null) throw ownException; } - message += "Error of item add. " + itemInfo; - ownException = new RepositoryException(message, e); + message.append("Error of item add. ").append(itemInfo); + ownException = new RepositoryException(message.toString(), e); throw ownException; } } @@ -300,8 +308,8 @@ if (ownException != null) throw ownException; } - message += "Error of item add. " + itemInfo; - throw new JCRInvalidItemStateException(message, item.getIdentifier(), ItemState.ADDED, e); + message.append("Error of item add. ").append(itemInfo); + throw new JCRInvalidItemStateException(message.toString(), item.getIdentifier(), ItemState.ADDED, e); } /** @@ -320,7 +328,9 @@ protected String handleDeleteException(SQLException e, ItemData item) throws RepositoryException, InvalidItemStateException { - String message = "[" + containerName + "] DELETE " + (item.isNode() ? "NODE. " : "PROPERTY. "); + StringBuilder message = new StringBuilder("["); + message.append(containerName).append("] DELETE ").append(item.isNode() ? "NODE. " : "PROPERTY. "); + String errMessage = e.getMessage(); String itemInfo = item.getQPath().getAsString() + " " + item.getIdentifier() @@ -332,19 +342,19 @@ String umsg = errMessage.toLowerCase().toUpperCase(); if (umsg.indexOf(conn.JCR_FK_ITEM_PARENT) >= 0) { - message += "Can not delete parent till childs exists. Item " + itemInfo; - throw new JCRInvalidItemStateException(message, item.getIdentifier(), ItemState.DELETED, e); + message.append("Can not delete parent till childs exists. Item ").append(itemInfo); + throw new JCRInvalidItemStateException(message.toString(), item.getIdentifier(), ItemState.DELETED, e); } else if (umsg.indexOf(conn.JCR_FK_VALUE_PROPERTY) >= 0) { - message += - "[FATAL] Can not delete property item till it contains values. Condition: property ID. " + itemInfo; - throw new RepositoryException(message, e); + message.append("[FATAL] Can not delete property item till it contains values. Condition: property ID. ") + .append(itemInfo); + throw new RepositoryException(message.toString(), e); } } - message += "Error of item delete " + itemInfo; - throw new RepositoryException(message, e); + message.append("Error of item delete ").append(itemInfo); + throw new RepositoryException(message.toString(), e); } /** @@ -363,7 +373,9 @@ public String handleUpdateException(SQLException e, ItemData item) throws RepositoryException, InvalidItemStateException { - String message = "[" + containerName + "] EDIT " + (item.isNode() ? "NODE. " : "PROPERTY. "); + StringBuilder message = new StringBuilder("["); + message.append(containerName).append("] EDIT ").append(item.isNode() ? "NODE. " : "PROPERTY. "); + String errMessage = e.getMessage(); String itemInfo = item.getQPath().getAsString() + " " + item.getIdentifier() @@ -373,13 +385,14 @@ // try detect error by foreign key names if (errMessage.toLowerCase().toUpperCase().indexOf(conn.JCR_FK_VALUE_PROPERTY) >= 0) { - message += "Property is not exists but the value is being created. Condition: property ID. " + itemInfo; - throw new RepositoryException(message, e); + message.append("Property is not exists but the value is being created. Condition: property ID. ").append( + itemInfo); + throw new RepositoryException(message.toString(), e); } else if (errMessage.toLowerCase().toUpperCase().indexOf(conn.JCR_PK_ITEM) >= 0) { - message += "Item already exists. Condition: ID. " + itemInfo; - throw new JCRInvalidItemStateException(message, item.getIdentifier(), ItemState.UPDATED, e); + message.append("Item already exists. Condition: ID. ").append(itemInfo); + throw new JCRInvalidItemStateException(message.toString(), item.getIdentifier(), ItemState.UPDATED, e); } // try detect integrity violation @@ -390,8 +403,8 @@ if (me != null) { // item already exists - message += "Item already exists. But update errors. " + itemInfo; - ownException = new RepositoryException(message, e); + message.append("Item already exists. But update errors. ").append(itemInfo); + ownException = new RepositoryException(message.toString(), e); throw ownException; } } @@ -401,8 +414,8 @@ if (ownException != null) throw ownException; } - message += "Error of item update. " + itemInfo; - throw new JCRInvalidItemStateException(message, item.getIdentifier(), ItemState.UPDATED, e); + message.append("Error of item update. ").append(itemInfo); + throw new JCRInvalidItemStateException(message.toString(), item.getIdentifier(), ItemState.UPDATED, e); } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/TreeFileIOChannel.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/TreeFileIOChannel.java 2011-12-28 15:33:38 UTC (rev 5378) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/TreeFileIOChannel.java 2011-12-28 15:45:30 UTC (rev 5379) @@ -85,12 +85,12 @@ protected String buildPathX(String fileName) { char[] chs = fileName.toCharArray(); - String path = ""; + StringBuilder path = new StringBuilder(); for (char ch : chs) { - path += File.separator + ch; + path.append(File.separator).append(ch); } - return path; + return path.toString(); } // best for now, 12.07.07 @@ -98,13 +98,13 @@ { final int xLength = 8; char[] chs = fileName.toCharArray(); - String path = ""; + StringBuilder path = new StringBuilder(); for (int i = 0; i < xLength; i++) { - path += File.separator + chs[i]; + path.append(File.separator).append(chs[i]); } - path += fileName.substring(xLength); - return path; + path.append(fileName.substring(xLength)); + return path.toString(); } protected String buildPathXX2X4(String fileName) @@ -113,48 +113,49 @@ final int xLength = 8; boolean xxBlock = true; char[] chs = fileName.toCharArray(); - String path = ""; + StringBuilder path = new StringBuilder(); + for (int xxi = 0; xxi < xxLength; xxi++) { char ch = chs[xxi]; - path += xxBlock ? File.separator + ch : ch; + path.append(xxBlock ? File.separator + ch : ch); xxBlock = !xxBlock; } for (int xi = xxLength; xi < xLength; xi++) { - path += File.separator + chs[xi]; + path.append(File.separator).append(chs[xi]); } - path += fileName.substring(xLength); - return path; + path.append(fileName.substring(xLength)); + return path.toString(); } protected String buildPathXX(String fileName) { char[] chs = fileName.toCharArray(); - String path = ""; + StringBuilder path = new StringBuilder(); boolean block = true; for (char ch : chs) { - path += block ? File.separator + ch : ch; + path.append(block ? File.separator + ch : ch); block = !block; } - return path; + return path.toString(); } protected String buildPathXX8(String fileName) { final int xxLength = 16; // length / 2 = xx length char[] chs = fileName.toCharArray(); - String path = ""; + StringBuilder path = new StringBuilder(); boolean block = true; for (int i = 0; i < xxLength; i++) { char ch = chs[i]; - path += block ? File.separator + ch : ch; + path.append(block ? File.separator + ch : ch); block = !block; } - path += fileName.substring(xxLength); - return path; + path.append(fileName.substring(xxLength)); + return path.toString(); } private static void mkdirs(File dir) Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java 2011-12-28 15:33:38 UTC (rev 5378) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java 2011-12-28 15:45:30 UTC (rev 5379) @@ -249,48 +249,54 @@ private String makeJobInfo(BackupJob job, Throwable error) { - String jobInfo = ""; + StringBuilder jobInfo = new StringBuilder(); if (job != null) { switch (job.getType()) { - case BackupJob.FULL : - jobInfo += "FULL BACKUP"; + case BackupJob.FULL : { + jobInfo.append("FULL BACKUP"); break; - case BackupJob.INCREMENTAL : - jobInfo += "INCREMENTAL BACKUP"; + } + case BackupJob.INCREMENTAL : { + jobInfo.append("INCREMENTAL BACKUP"); break; + } } - jobInfo += " ["; + jobInfo.append(" ["); switch (job.getState()) { - case BackupJob.FINISHED : - jobInfo += "FINISHED"; + case BackupJob.FINISHED : { + jobInfo.append("FINISHED"); break; - case BackupJob.STARTING : - jobInfo += "STARTING"; + } + case BackupJob.STARTING : { + jobInfo.append("STARTING"); break; - case BackupJob.WAITING : - jobInfo += "WAITING"; + } + case BackupJob.WAITING : { + jobInfo.append("WAITING"); break; - case BackupJob.WORKING : - jobInfo += "WORKING"; + } + case BackupJob.WORKING : { + jobInfo.append("WORKING"); break; + } } - jobInfo += "]"; + jobInfo.append("]"); if (error != null) { - jobInfo += " Error: " + error.getMessage(); + jobInfo.append(" Error: ").append(error.getMessage()); } try { - jobInfo += " log: " + job.getStorageURL().getPath(); + jobInfo.append(" log: ").append(job.getStorageURL().getPath()); } catch (BackupOperationException e) { @@ -298,11 +304,11 @@ } finally { - jobInfo += " "; + jobInfo.append(" "); } } - return jobInfo; + return jobInfo.toString(); } public String printStackTrace(Throwable error) Modified: jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/GetContextInfoCommand.java =================================================================== --- jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/GetContextInfoCommand.java 2011-12-28 15:33:38 UTC (rev 5378) +++ jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/GetContextInfoCommand.java 2011-12-28 15:45:30 UTC (rev 5379) @@ -41,10 +41,10 @@ public boolean perform(CliAppContext ctx) { - String output = ""; + StringBuilder output = new StringBuilder(); try { - output = "Context info: \n"; + output.append("Context info: \n"); Item item = ctx.getCurrentItem(); ItemDefinition itemDefinition; if (item.isNode()) @@ -55,17 +55,19 @@ { itemDefinition = ((PropertyImpl)item).getDefinition(); } - output += "username: " + ctx.getUserName() + "\n"; - output += "workspace: " + ctx.getCurrentWorkspace() + "\n"; - output += "item path: " + item.getPath() + "\n"; - String itemType = item.isNode() ? "Node" : "Property"; - output += "item type: " + itemType + "\n"; - output += "item definitions:\n"; - output += " name: " + itemDefinition.getName() + "\n"; - output += " autocreated:" + itemDefinition.isAutoCreated() + "\n"; - output += " mandatory:" + itemDefinition.isMandatory() + "\n"; - output += " protected:" + itemDefinition.isProtected() + "\n"; - output += " onparentversion:" + itemDefinition.getOnParentVersion() + "\n"; + + output.append("username: ").append(ctx.getUserName()).append("\n"); + output.append("workspace: ").append(ctx.getCurrentWorkspace()).append("\n"); + output.append("item path: ").append(item.getPath()).append("\n"); + output.append("item type: ").append(item.isNode() ? "Node" : "Property").append("\n"); + output.append("item definitions:\n"); + output.append(" name: ").append(itemDefinition.getName()).append("\n"); + output.append(" autocreated:").append(itemDefinition.isAutoCreated()).append("\n"); + output.append(" mandatory:").append(itemDefinition.isMandatory()).append("\n"); + output.append(" protected:").append(itemDefinition.isProtected()).append("\n"); + output.append(" onparentversion:").append(itemDefinition.getOnParentVersion()).append("\n"); + + if (item.isNode() == false) { Property property = (Property)item; @@ -75,32 +77,33 @@ PropertyDefinition propertyDefinition = (PropertyDefinition)itemDefinition; if (propertyDefinition.isMultiple() == false) { - output += "property value:" + property.getValue().getString() + "\n"; + output.append("property value:").append(property.getValue().getString()).append("\n"); } else { - output += "property value is multiple" + "\n"; + output.append("property value is multiple\n"); } } else { - output += "can't show property value:" + "\n"; + output.append("can't show property value:\n"); } } - output += "parameters:\n"; + output.append("parameters:\n"); + Iterator parametersIterator = ctx.getParameters().iterator(); int i = 0; while (parametersIterator.hasNext()) { - output += " [" + i + "]" + " : " + (String)parametersIterator.next() + "\n"; + output.append(" [").append(i).append("] : ").append((String)parametersIterator.next()).append("\n"); i++; } } catch (Exception e) { - output = "Can't execute command - " + e.getMessage() + "\n"; + output.append("Can't execute command - ").append(e.getMessage()).append("\n"); } - ctx.setOutput(output); + ctx.setOutput(output.toString()); return false; } } Modified: jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/data/FtpFileInfoImpl.java =================================================================== --- jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/data/FtpFileInfoImpl.java 2011-12-28 15:33:38 UTC (rev 5378) +++ jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/data/FtpFileInfoImpl.java 2011-12-28 15:45:30 UTC (rev 5379) @@ -111,10 +111,10 @@ { String fileL = fileLine.substring(0); - String _date = ""; + StringBuilder _date = new StringBuilder(); while (fileL.charAt(0) != ' ') { - _date += fileL.charAt(0); + _date.append(fileL.charAt(0)); fileL = fileL.substring(1); } @@ -123,11 +123,11 @@ fileL = fileL.substring(1); } - String _time = ""; + StringBuilder _time = new StringBuilder(); while (fileL.charAt(0) != ' ') { - _time += fileL.charAt(0); + _time.append(fileL.charAt(0)); fileL = fileL.substring(1); } @@ -136,7 +136,7 @@ fileL = fileL.substring(1); } - String _size = ""; + StringBuilder _size = new StringBuilder(); if (fileL.indexOf("<DIR>") == 0) { @@ -145,13 +145,13 @@ { fileL = fileL.substring(1); } - _size = "0"; + _size = new StringBuilder("0"); } else { while (fileL.charAt(0) != ' ') { - _size += fileL.charAt(0); + _size.append(fileL.charAt(0)); fileL = fileL.substring(1); } } @@ -163,10 +163,10 @@ String _name = fileL; - this.name = _name; - this.date = _date; - this.time = _time; - this.size = new Long(_size); + this.name = _name.toString(); + this.date = _date.toString(); + this.time = _time.toString(); + this.size = new Long(_size.toString()); return false; } @@ -217,10 +217,10 @@ fileL = fileL.substring(1); } - String _size = ""; + StringBuilder _size = new StringBuilder(); while (fileL.charAt(0) != ' ') { - _size += fileL.charAt(0); + _size.append(fileL.charAt(0)); fileL = fileL.substring(1); } @@ -229,10 +229,10 @@ fileL = fileL.substring(1); } - String _month = ""; + StringBuilder _month = new StringBuilder(); while (fileL.charAt(0) != ' ') { - _month += fileL.charAt(0); + _month.append(fileL.charAt(0)); fileL = fileL.substring(1); } @@ -241,10 +241,10 @@ fileL = fileL.substring(1); } - String _day = ""; + StringBuilder _day = new StringBuilder(); while (fileL.charAt(0) != ' ') { - _day += fileL.charAt(0); + _day.append(fileL.charAt(0)); fileL = fileL.substring(1); } @@ -253,10 +253,10 @@ fileL = fileL.substring(1); } - String _time = ""; + StringBuilder _time = new StringBuilder(); while (fileL.charAt(0) != ' ') { - _time += fileL.charAt(0); + _time.append(fileL.charAt(0)); fileL = fileL.substring(1); } @@ -269,8 +269,8 @@ this.name = _name; this.date = _month + " " + _day; - this.time = _time; - this.size = new Long(_size); + this.time = _time.toString(); + this.size = new Long(_size.toString()); return false; }

12 years, 4 months

1
0
0 / 0

exo-jcr SVN: r5378 - in jcr/trunk: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene and 5 other directories.

by do-not-reply＠jboss.org

Author: areshetnyak Date: 2011-12-28 10:33:38 -0500 (Wed, 28 Dec 2011) New Revision: 5378 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/JCRPathExt.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/ChildAxisQuery.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DerefQuery.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DescendantSelfAxisQuery.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/IndexMerger.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NotQuery.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/ParentAxisQuery.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/Util.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/xpath/XPathQueryBuilder.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/ItemDataMoveVisitor.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java jcr/trunk/exo.jcr.component.statistics/src/main/java/org/exoplatform/services/jcr/statistics/JCRAPIAspect.java Log: EXOJCR-1687 : Fix new sonar violations in JCR project. Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/JCRPathExt.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/JCRPathExt.java 2011-12-28 13:22:33 UTC (rev 5377) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/JCRPathExt.java 2011-12-28 15:33:38 UTC (rev 5378) @@ -173,11 +173,11 @@ private static int addEntry(PathElement[] entries, int size, PathElement entry) { - if (entry == THIS_ELEMENT) + if (entry == THIS_ELEMENT) // NOSONAR { return size; } - if (size > 0 && entry == MOVE_UP_ELEMENT && !(entries[size - 1] == MOVE_UP_ELEMENT)) + if (size > 0 && entry == MOVE_UP_ELEMENT && !(entries[size - 1] == MOVE_UP_ELEMENT)) // NOSONAR { if (size <= 0) { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2011-12-28 13:22:33 UTC (rev 5377) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2011-12-28 15:33:38 UTC (rev 5378) @@ -1569,7 +1569,7 @@ return; } } - else if (wsSession != session) + else if (wsSession != session) // NOSONAR { // has a reference to the VH in traversed workspace, // it's not a version storage, i.e. it's a property of versionable @@ -1582,7 +1582,7 @@ } finally { - if (wsSession != session) + if (wsSession != session) // NOSONAR { wsSession.logout(); } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionImpl.java 2011-12-28 13:22:33 UTC (rev 5377) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionImpl.java 2011-12-28 15:33:38 UTC (rev 5378) @@ -1056,7 +1056,7 @@ ItemDataMoveVisitor initializer = new ItemDataMoveVisitor((NodeData)destParentNode.getData(), destNodePath.getName().getInternalName(), (NodeData)srcParentNode.getData(), nodeTypeManager, getTransientNodesManager(), true, - triggerEventsForDescendentsOnRename || srcParentNode != destParentNode); + triggerEventsForDescendentsOnRename || srcParentNode != destParentNode); // NOSONAR getTransientNodesManager().rename((NodeData)srcNode.getData(), initializer); } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/ChildAxisQuery.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/ChildAxisQuery.java 2011-12-28 13:22:33 UTC (rev 5377) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/ChildAxisQuery.java 2011-12-28 15:33:38 UTC (rev 5378) @@ -237,7 +237,7 @@ } // if we get here we could not compact the query - if (cQuery == contextQuery) + if (cQuery == contextQuery) // NOSONAR { return this; } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DerefQuery.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DerefQuery.java 2011-12-28 13:22:33 UTC (rev 5377) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DerefQuery.java 2011-12-28 15:33:38 UTC (rev 5378) @@ -20,7 +20,6 @@ import org.apache.lucene.index.Term; import org.apache.lucene.index.TermDocs; import org.apache.lucene.search.Explanation; -import org.apache.lucene.search.HitCollector; import org.apache.lucene.search.Query; import org.apache.lucene.search.Scorer; import org.apache.lucene.search.Searcher; @@ -140,7 +139,7 @@ public Query rewrite(IndexReader reader) throws IOException { Query cQuery = contextQuery.rewrite(reader); - if (cQuery == contextQuery) + if (cQuery == contextQuery) // NOSONAR { return this; } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DescendantSelfAxisQuery.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DescendantSelfAxisQuery.java 2011-12-28 13:22:33 UTC (rev 5377) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DescendantSelfAxisQuery.java 2011-12-28 15:33:38 UTC (rev 5378) @@ -231,7 +231,7 @@ .rewrite(reader); } } - if (cQuery == contextQuery && sQuery == subQuery) + if (cQuery == contextQuery && sQuery == subQuery) // NOSONAR { return this; } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/IndexMerger.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/IndexMerger.java 2011-12-28 13:22:33 UTC (rev 5377) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/IndexMerger.java 2011-12-28 15:33:38 UTC (rev 5378) @@ -294,7 +294,7 @@ isIdle = true; } Merge task = (Merge)mergeTasks.remove(); - if (task == QUIT) + if (task == QUIT) // NOSONAR { mergerIdle.release(); break; Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NotQuery.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NotQuery.java 2011-12-28 13:22:33 UTC (rev 5377) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NotQuery.java 2011-12-28 15:33:38 UTC (rev 5378) @@ -89,7 +89,7 @@ public Query rewrite(IndexReader reader) throws IOException { Query cQuery = context.rewrite(reader); - if (cQuery == context) + if (cQuery == context) // NOSONAR { return this; } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/ParentAxisQuery.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/ParentAxisQuery.java 2011-12-28 13:22:33 UTC (rev 5377) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/ParentAxisQuery.java 2011-12-28 15:33:38 UTC (rev 5378) @@ -117,7 +117,7 @@ public Query rewrite(IndexReader reader) throws IOException { Query cQuery = contextQuery.rewrite(reader); - if (cQuery == contextQuery) + if (cQuery == contextQuery) // NOSONAR { return this; } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/Util.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/Util.java 2011-12-28 13:22:33 UTC (rev 5377) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/Util.java 2011-12-28 15:33:38 UTC (rev 5378) @@ -246,7 +246,7 @@ */ public static int compare(Comparable c1, Comparable c2) { - if (c1 == c2) + if (c1 == c2) // NOSONAR { return 0; } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/xpath/XPathQueryBuilder.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/xpath/XPathQueryBuilder.java 2011-12-28 13:22:33 UTC (rev 5377) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/xpath/XPathQueryBuilder.java 2011-12-28 15:33:38 UTC (rev 5378) @@ -607,7 +607,7 @@ Node p = node.jjtGetParent(); for (int i = 0; i < p.jjtGetNumChildren(); i++) { SimpleNode c = (SimpleNode) p.jjtGetChild(i); - if (c == node) { + if (c == node) { // NOSONAR queryNode = factory.createLocationStepQueryNode(parent); queryNode.setNameTest(null); queryNode.setIncludeDescendants(descendant); @@ -976,7 +976,7 @@ Node p = node.jjtGetParent(); for (int i = 0; i < p.jjtGetNumChildren(); i++) { SimpleNode c = (SimpleNode) p.jjtGetChild(i); - if (c == node) { + if (c == node) { // NOSONAR break; } descendant = (c.getId() == JJTSLASHSLASH Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/ItemDataMoveVisitor.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/ItemDataMoveVisitor.java 2011-12-28 13:22:33 UTC (rev 5377) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/ItemDataMoveVisitor.java 2011-12-28 15:33:38 UTC (rev 5378) @@ -27,7 +27,6 @@ import org.exoplatform.services.jcr.datamodel.NodeData; import org.exoplatform.services.jcr.datamodel.PropertyData; import org.exoplatform.services.jcr.datamodel.QPath; -import org.exoplatform.services.jcr.datamodel.QPathEntry; import org.exoplatform.services.jcr.datamodel.ValueData; import org.exoplatform.services.jcr.impl.Constants; import org.exoplatform.services.jcr.impl.core.SessionDataManager; @@ -178,7 +177,7 @@ } } - if (destParent == srcParent)// (destParent.getIdentifier().equals(node.getParentIdentifier())) + if (destParent == srcParent) // NOSONAR { // move to same parent srcChilds = destChilds; @@ -216,7 +215,7 @@ srcIndex++; } // find index on destination in case when destination the same as source - if (srcChilds == destChilds && (child.getQPath().getName().equals(destNodeName))) + if (srcChilds == destChilds && (child.getQPath().getName().equals(destNodeName))) // NOSONAR { destIndex++; } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java 2011-12-28 13:22:33 UTC (rev 5377) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java 2011-12-28 15:33:38 UTC (rev 5378) @@ -374,7 +374,7 @@ { return systemConnection == null // we need system connection but it's not exist - ? systemConnection = (systemDataContainer != dataContainer + ? systemConnection = (systemDataContainer != dataContainer // NOSONAR // if it's different container instances ? systemDataContainer.equals(dataContainer) && thisConnection != null // but container confugrations are same and non-system connnection open @@ -396,7 +396,7 @@ { return thisConnection == null // we need this conatiner conection - ? thisConnection = (systemDataContainer != dataContainer + ? thisConnection = (systemDataContainer != dataContainer // NOSONAR // if it's different container instances ? dataContainer.equals(systemDataContainer) && systemConnection != null // but container confugrations are same and system connnection open Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java 2011-12-28 13:22:33 UTC (rev 5377) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java 2011-12-28 15:33:38 UTC (rev 5378) @@ -586,7 +586,7 @@ { String id1 = data.getParentIdentifier(); String id2 = parent.getIdentifier(); - if (id1 == id2) + if (id1 == id2) // NOSONAR return true; if (id1 == null && id2 != null) return false; Modified: jcr/trunk/exo.jcr.component.statistics/src/main/java/org/exoplatform/services/jcr/statistics/JCRAPIAspect.java =================================================================== --- jcr/trunk/exo.jcr.component.statistics/src/main/java/org/exoplatform/services/jcr/statistics/JCRAPIAspect.java 2011-12-28 13:22:33 UTC (rev 5377) +++ jcr/trunk/exo.jcr.component.statistics/src/main/java/org/exoplatform/services/jcr/statistics/JCRAPIAspect.java 2011-12-28 15:33:38 UTC (rev 5378) @@ -32,11 +32,6 @@ */ package org.exoplatform.services.jcr.statistics; -import org.aspectj.lang.JoinPoint; -import org.aspectj.lang.annotation.After; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Before; -import org.aspectj.lang.annotation.Pointcut; import org.exoplatform.container.ExoContainer; import org.exoplatform.container.ExoContainerContext; import org.exoplatform.services.log.ExoLogger; @@ -154,7 +149,7 @@ MAPPING = Collections.unmodifiableMap(tempMapping); } } - if (statistics == UNKNOWN) + if (statistics == UNKNOWN) // NOSONAR { return null; }

12 years, 4 months

1
0
0 / 0

exo-jcr SVN: r5377 - in jcr/branches/1.14.5-GA-CP01: applications and 25 other directories.

by do-not-reply＠jboss.org

Author: tolusha Date: 2011-12-28 08:22:33 -0500 (Wed, 28 Dec 2011) New Revision: 5377 Modified: jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.backupconsole.dist/pom.xml jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.backupconsole/pom.xml jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.browser/pom.xml jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.config/pom.xml jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.fckeditor/pom.xml jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.jboss/pom.xml jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.jetty/pom.xml jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.jonas/pom.xml jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.rest/pom.xml jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.tomcat/pom.xml jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.cluster.testclient/pom.xml jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.ear/pom.xml jcr/branches/1.14.5-GA-CP01/applications/pom.xml jcr/branches/1.14.5-GA-CP01/exo.jcr.component.core/pom.xml jcr/branches/1.14.5-GA-CP01/exo.jcr.component.ext/pom.xml jcr/branches/1.14.5-GA-CP01/exo.jcr.component.ftp/pom.xml jcr/branches/1.14.5-GA-CP01/exo.jcr.component.statistics/pom.xml jcr/branches/1.14.5-GA-CP01/exo.jcr.component.webdav/pom.xml jcr/branches/1.14.5-GA-CP01/exo.jcr.connectors.jca/pom.xml jcr/branches/1.14.5-GA-CP01/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml jcr/branches/1.14.5-GA-CP01/exo.jcr.docs/exo.jcr.docs.developer/pom.xml jcr/branches/1.14.5-GA-CP01/exo.jcr.docs/pom.xml jcr/branches/1.14.5-GA-CP01/exo.jcr.framework.command/pom.xml jcr/branches/1.14.5-GA-CP01/exo.jcr.framework.ftpclient/pom.xml jcr/branches/1.14.5-GA-CP01/exo.jcr.framework.web/pom.xml jcr/branches/1.14.5-GA-CP01/packaging/module/pom.xml jcr/branches/1.14.5-GA-CP01/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.backupconsole/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.backupconsole/pom.xml 2011-12-28 13:21:51 UTC (rev 5376) +++ jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.backupconsole/pom.xml 2011-12-28 13:22:33 UTC (rev 5377) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-applications-parent</artifactId> - <version>1.14.5-GA-CP01</version> + <version>1.14.5-GA-CP02-SNAPSHOT</version> </parent> <artifactId>exo.jcr.applications.backupconsole</artifactId> <name>eXo JCR :: Applications :: Backup Console</name> Modified: jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.backupconsole.dist/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.backupconsole.dist/pom.xml 2011-12-28 13:21:51 UTC (rev 5376) +++ jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.backupconsole.dist/pom.xml 2011-12-28 13:22:33 UTC (rev 5377) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-applications-parent</artifactId> - <version>1.14.5-GA-CP01</version> + <version>1.14.5-GA-CP02-SNAPSHOT</version> </parent> <artifactId>exo.jcr.applications.backupconsole.dist</artifactId> <name>eXo JCR :: Applications :: Backup Console Binary Distribution</name> @@ -37,7 +37,7 @@ <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.applications.backupconsole</artifactId> - <version>1.14.5-GA-CP01</version> + <version>1.14.5-GA-CP02-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.jcr</groupId> Modified: jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.browser/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.browser/pom.xml 2011-12-28 13:21:51 UTC (rev 5376) +++ jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.browser/pom.xml 2011-12-28 13:22:33 UTC (rev 5377) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-applications-parent</artifactId> - <version>1.14.5-GA-CP01</version> + <version>1.14.5-GA-CP02-SNAPSHOT</version> </parent> <artifactId>exo.jcr.applications.browser</artifactId> <packaging>war</packaging> Modified: jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.config/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.config/pom.xml 2011-12-28 13:21:51 UTC (rev 5376) +++ jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.config/pom.xml 2011-12-28 13:22:33 UTC (rev 5377) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-applications-parent</artifactId> - <version>1.14.5-GA-CP01</version> + <version>1.14.5-GA-CP02-SNAPSHOT</version> </parent> <artifactId>exo.jcr.applications.config</artifactId> <packaging>pom</packaging> Modified: jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.fckeditor/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.fckeditor/pom.xml 2011-12-28 13:21:51 UTC (rev 5376) +++ jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.fckeditor/pom.xml 2011-12-28 13:22:33 UTC (rev 5377) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-applications-parent</artifactId> - <version>1.14.5-GA-CP01</version> + <version>1.14.5-GA-CP02-SNAPSHOT</version> </parent> <artifactId>exo.jcr.applications.fckeditor</artifactId> <packaging>war</packaging> Modified: jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.jboss/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.jboss/pom.xml 2011-12-28 13:21:51 UTC (rev 5376) +++ jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.jboss/pom.xml 2011-12-28 13:22:33 UTC (rev 5377) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.applications.config</artifactId> - <version>1.14.5-GA-CP01</version> + <version>1.14.5-GA-CP02-SNAPSHOT</version> <relativePath>../exo.jcr.applications.config/pom.xml</relativePath> </parent> @@ -41,7 +41,7 @@ <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.ear</artifactId> - <version>1.14.5-GA-CP01</version> + <version>1.14.5-GA-CP02-SNAPSHOT</version> <type>ear</type> <scope>runtime</scope> </dependency> Modified: jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.jetty/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.jetty/pom.xml 2011-12-28 13:21:51 UTC (rev 5376) +++ jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.jetty/pom.xml 2011-12-28 13:22:33 UTC (rev 5377) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.applications.config</artifactId> - <version>1.14.5-GA-CP01</version> + <version>1.14.5-GA-CP02-SNAPSHOT</version> <relativePath>../exo.jcr.applications.config/pom.xml</relativePath> </parent> Modified: jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.jonas/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.jonas/pom.xml 2011-12-28 13:21:51 UTC (rev 5376) +++ jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.jonas/pom.xml 2011-12-28 13:22:33 UTC (rev 5377) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.applications.config</artifactId> - <version>1.14.5-GA-CP01</version> + <version>1.14.5-GA-CP02-SNAPSHOT</version> <relativePath>../exo.jcr.applications.config/pom.xml</relativePath> </parent> @@ -41,7 +41,7 @@ <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.connectors.jca</artifactId> - <version>1.14.5-GA-CP01</version> + <version>1.14.5-GA-CP02-SNAPSHOT</version> <type>rar</type> <scope>runtime</scope> </dependency> Modified: jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.rest/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.rest/pom.xml 2011-12-28 13:21:51 UTC (rev 5376) +++ jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.rest/pom.xml 2011-12-28 13:22:33 UTC (rev 5377) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-applications-parent</artifactId> - <version>1.14.5-GA-CP01</version> + <version>1.14.5-GA-CP02-SNAPSHOT</version> </parent> <artifactId>exo.jcr.applications.rest</artifactId> <packaging>war</packaging> Modified: jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.tomcat/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.tomcat/pom.xml 2011-12-28 13:21:51 UTC (rev 5376) +++ jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.tomcat/pom.xml 2011-12-28 13:22:33 UTC (rev 5377) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.applications.config</artifactId> - <version>1.14.5-GA-CP01</version> + <version>1.14.5-GA-CP02-SNAPSHOT</version> <relativePath>../exo.jcr.applications.config/pom.xml</relativePath> </parent> Modified: jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.cluster.testclient/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.cluster.testclient/pom.xml 2011-12-28 13:21:51 UTC (rev 5376) +++ jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.cluster.testclient/pom.xml 2011-12-28 13:22:33 UTC (rev 5377) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-applications-parent</artifactId> - <version>1.14.5-GA-CP01</version> + <version>1.14.5-GA-CP02-SNAPSHOT</version> </parent> <artifactId>exo.jcr.cluster.testclient</artifactId> <name>eXo JCR :: Cluster :: Test Client</name> Modified: jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.ear/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.ear/pom.xml 2011-12-28 13:21:51 UTC (rev 5376) +++ jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.ear/pom.xml 2011-12-28 13:22:33 UTC (rev 5377) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-applications-parent</artifactId> - <version>1.14.5-GA-CP01</version> + <version>1.14.5-GA-CP02-SNAPSHOT</version> </parent> <artifactId>exo.jcr.ear</artifactId> <packaging>ear</packaging> Modified: jcr/branches/1.14.5-GA-CP01/applications/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/applications/pom.xml 2011-12-28 13:21:51 UTC (rev 5376) +++ jcr/branches/1.14.5-GA-CP01/applications/pom.xml 2011-12-28 13:22:33 UTC (rev 5377) @@ -22,12 +22,12 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.14.5-GA-CP01</version> + <version>1.14.5-GA-CP02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jcr-applications-parent</artifactId> - <version>1.14.5-GA-CP01</version> + <version>1.14.5-GA-CP02-SNAPSHOT</version> <name>eXo JCR :: Applications :: Reactor</name> <packaging>pom</packaging> Modified: jcr/branches/1.14.5-GA-CP01/exo.jcr.component.core/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/exo.jcr.component.core/pom.xml 2011-12-28 13:21:51 UTC (rev 5376) +++ jcr/branches/1.14.5-GA-CP01/exo.jcr.component.core/pom.xml 2011-12-28 13:22:33 UTC (rev 5377) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.14.5-GA-CP01</version> + <version>1.14.5-GA-CP02-SNAPSHOT</version> </parent> <artifactId>exo.jcr.component.core</artifactId> <name>eXo JCR :: Component :: Core Service</name> Modified: jcr/branches/1.14.5-GA-CP01/exo.jcr.component.ext/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/exo.jcr.component.ext/pom.xml 2011-12-28 13:21:51 UTC (rev 5376) +++ jcr/branches/1.14.5-GA-CP01/exo.jcr.component.ext/pom.xml 2011-12-28 13:22:33 UTC (rev 5377) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.14.5-GA-CP01</version> + <version>1.14.5-GA-CP02-SNAPSHOT</version> </parent> <artifactId>exo.jcr.component.ext</artifactId> <name>eXo JCR :: Component :: Extension Service</name> Modified: jcr/branches/1.14.5-GA-CP01/exo.jcr.component.ftp/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/exo.jcr.component.ftp/pom.xml 2011-12-28 13:21:51 UTC (rev 5376) +++ jcr/branches/1.14.5-GA-CP01/exo.jcr.component.ftp/pom.xml 2011-12-28 13:22:33 UTC (rev 5377) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.14.5-GA-CP01</version> + <version>1.14.5-GA-CP02-SNAPSHOT</version> </parent> <artifactId>exo.jcr.component.ftp</artifactId> <name>eXo JCR :: Component :: FTP Service</name> Modified: jcr/branches/1.14.5-GA-CP01/exo.jcr.component.statistics/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/exo.jcr.component.statistics/pom.xml 2011-12-28 13:21:51 UTC (rev 5376) +++ jcr/branches/1.14.5-GA-CP01/exo.jcr.component.statistics/pom.xml 2011-12-28 13:22:33 UTC (rev 5377) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.14.5-GA-CP01</version> + <version>1.14.5-GA-CP02-SNAPSHOT</version> </parent> <artifactId>exo.jcr.component.statistics</artifactId> <name>eXo JCR :: Component :: Statistics Provider</name> Modified: jcr/branches/1.14.5-GA-CP01/exo.jcr.component.webdav/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/exo.jcr.component.webdav/pom.xml 2011-12-28 13:21:51 UTC (rev 5376) +++ jcr/branches/1.14.5-GA-CP01/exo.jcr.component.webdav/pom.xml 2011-12-28 13:22:33 UTC (rev 5377) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.14.5-GA-CP01</version> + <version>1.14.5-GA-CP02-SNAPSHOT</version> </parent> <artifactId>exo.jcr.component.webdav</artifactId> <name>eXo JCR :: Component :: Webdav Service</name> Modified: jcr/branches/1.14.5-GA-CP01/exo.jcr.connectors.jca/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/exo.jcr.connectors.jca/pom.xml 2011-12-28 13:21:51 UTC (rev 5376) +++ jcr/branches/1.14.5-GA-CP01/exo.jcr.connectors.jca/pom.xml 2011-12-28 13:22:33 UTC (rev 5377) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.14.5-GA-CP01</version> + <version>1.14.5-GA-CP02-SNAPSHOT</version> </parent> <artifactId>exo.jcr.connectors.jca</artifactId> <packaging>rar</packaging> Modified: jcr/branches/1.14.5-GA-CP01/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml 2011-12-28 13:21:51 UTC (rev 5376) +++ jcr/branches/1.14.5-GA-CP01/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml 2011-12-28 13:22:33 UTC (rev 5377) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.docs.developer</artifactId> - <version>1.14.5-GA-CP01</version> + <version>1.14.5-GA-CP02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: jcr/branches/1.14.5-GA-CP01/exo.jcr.docs/exo.jcr.docs.developer/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/exo.jcr.docs/exo.jcr.docs.developer/pom.xml 2011-12-28 13:21:51 UTC (rev 5376) +++ jcr/branches/1.14.5-GA-CP01/exo.jcr.docs/exo.jcr.docs.developer/pom.xml 2011-12-28 13:22:33 UTC (rev 5377) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.docs</artifactId> - <version>1.14.5-GA-CP01</version> + <version>1.14.5-GA-CP02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: jcr/branches/1.14.5-GA-CP01/exo.jcr.docs/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/exo.jcr.docs/pom.xml 2011-12-28 13:21:51 UTC (rev 5376) +++ jcr/branches/1.14.5-GA-CP01/exo.jcr.docs/pom.xml 2011-12-28 13:22:33 UTC (rev 5377) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.14.5-GA-CP01</version> + <version>1.14.5-GA-CP02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: jcr/branches/1.14.5-GA-CP01/exo.jcr.framework.command/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/exo.jcr.framework.command/pom.xml 2011-12-28 13:21:51 UTC (rev 5376) +++ jcr/branches/1.14.5-GA-CP01/exo.jcr.framework.command/pom.xml 2011-12-28 13:22:33 UTC (rev 5377) @@ -12,7 +12,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.14.5-GA-CP01</version> + <version>1.14.5-GA-CP02-SNAPSHOT</version> </parent> <artifactId>exo.jcr.framework.command</artifactId> <name>eXo JCR :: Framework :: Command</name> Modified: jcr/branches/1.14.5-GA-CP01/exo.jcr.framework.ftpclient/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/exo.jcr.framework.ftpclient/pom.xml 2011-12-28 13:21:51 UTC (rev 5376) +++ jcr/branches/1.14.5-GA-CP01/exo.jcr.framework.ftpclient/pom.xml 2011-12-28 13:22:33 UTC (rev 5377) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.14.5-GA-CP01</version> + <version>1.14.5-GA-CP02-SNAPSHOT</version> </parent> <artifactId>exo.jcr.framework.ftpclient</artifactId> <name>eXo JCR :: Framework :: FTP Client</name> Modified: jcr/branches/1.14.5-GA-CP01/exo.jcr.framework.web/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/exo.jcr.framework.web/pom.xml 2011-12-28 13:21:51 UTC (rev 5376) +++ jcr/branches/1.14.5-GA-CP01/exo.jcr.framework.web/pom.xml 2011-12-28 13:22:33 UTC (rev 5377) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.14.5-GA-CP01</version> + <version>1.14.5-GA-CP02-SNAPSHOT</version> </parent> <artifactId>exo.jcr.framework.web</artifactId> <name>eXo JCR :: Framework :: Web</name> Modified: jcr/branches/1.14.5-GA-CP01/packaging/module/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/packaging/module/pom.xml 2011-12-28 13:21:51 UTC (rev 5376) +++ jcr/branches/1.14.5-GA-CP01/packaging/module/pom.xml 2011-12-28 13:22:33 UTC (rev 5377) @@ -4,7 +4,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.14.5-GA-CP01</version> + <version>1.14.5-GA-CP02-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <artifactId>jcr.packaging.module</artifactId> Modified: jcr/branches/1.14.5-GA-CP01/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/pom.xml 2011-12-28 13:21:51 UTC (rev 5376) +++ jcr/branches/1.14.5-GA-CP01/pom.xml 2011-12-28 13:22:33 UTC (rev 5377) @@ -29,14 +29,14 @@ <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.14.5-GA-CP01</version> + <version>1.14.5-GA-CP02-SNAPSHOT</version> <packaging>pom</packaging> <name>eXo JCR</name> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/jcr/tags/1.14.5-GA-CP01</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/jcr/tags/1.14.5-GA-CP01</developerConnection> - <url>http://fisheye.jboss.org/browse/exo-jcr/jcr/tags/1.14.5-GA-CP01</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/jcr/branches/1.14.5-GA-CP01</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/jcr/branches/1.14.5-GA-CP01</developerConnection> + <url>http://fisheye.jboss.org/browse/exo-jcr/jcr/branches/1.14.5-GA-CP01</url> </scm> <properties>

12 years, 4 months

1
0
0 / 0

exo-jcr SVN: r5376 - jcr/tags.

by do-not-reply＠jboss.org

Author: tolusha Date: 2011-12-28 08:21:51 -0500 (Wed, 28 Dec 2011) New Revision: 5376 Added: jcr/tags/1.14.5-GA-CP01/ Log: [maven-scm] copy for tag 1.14.5-GA-CP01

12 years, 4 months

1
0
0 / 0

exo-jcr SVN: r5375 - in jcr/branches/1.14.5-GA-CP01: applications and 25 other directories.

by do-not-reply＠jboss.org

Author: tolusha Date: 2011-12-28 08:21:38 -0500 (Wed, 28 Dec 2011) New Revision: 5375 Modified: jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.backupconsole.dist/pom.xml jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.backupconsole/pom.xml jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.browser/pom.xml jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.config/pom.xml jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.fckeditor/pom.xml jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.jboss/pom.xml jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.jetty/pom.xml jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.jonas/pom.xml jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.rest/pom.xml jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.tomcat/pom.xml jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.cluster.testclient/pom.xml jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.ear/pom.xml jcr/branches/1.14.5-GA-CP01/applications/pom.xml jcr/branches/1.14.5-GA-CP01/exo.jcr.component.core/pom.xml jcr/branches/1.14.5-GA-CP01/exo.jcr.component.ext/pom.xml jcr/branches/1.14.5-GA-CP01/exo.jcr.component.ftp/pom.xml jcr/branches/1.14.5-GA-CP01/exo.jcr.component.statistics/pom.xml jcr/branches/1.14.5-GA-CP01/exo.jcr.component.webdav/pom.xml jcr/branches/1.14.5-GA-CP01/exo.jcr.connectors.jca/pom.xml jcr/branches/1.14.5-GA-CP01/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml jcr/branches/1.14.5-GA-CP01/exo.jcr.docs/exo.jcr.docs.developer/pom.xml jcr/branches/1.14.5-GA-CP01/exo.jcr.docs/pom.xml jcr/branches/1.14.5-GA-CP01/exo.jcr.framework.command/pom.xml jcr/branches/1.14.5-GA-CP01/exo.jcr.framework.ftpclient/pom.xml jcr/branches/1.14.5-GA-CP01/exo.jcr.framework.web/pom.xml jcr/branches/1.14.5-GA-CP01/packaging/module/pom.xml jcr/branches/1.14.5-GA-CP01/pom.xml Log: [maven-release-plugin] prepare release 1.14.5-GA-CP01 Modified: jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.backupconsole/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.backupconsole/pom.xml 2011-12-28 13:09:19 UTC (rev 5374) +++ jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.backupconsole/pom.xml 2011-12-28 13:21:38 UTC (rev 5375) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-applications-parent</artifactId> - <version>1.14.5-GA-CP01-SNAPSHOT</version> + <version>1.14.5-GA-CP01</version> </parent> <artifactId>exo.jcr.applications.backupconsole</artifactId> <name>eXo JCR :: Applications :: Backup Console</name> Modified: jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.backupconsole.dist/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.backupconsole.dist/pom.xml 2011-12-28 13:09:19 UTC (rev 5374) +++ jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.backupconsole.dist/pom.xml 2011-12-28 13:21:38 UTC (rev 5375) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-applications-parent</artifactId> - <version>1.14.5-GA-CP01-SNAPSHOT</version> + <version>1.14.5-GA-CP01</version> </parent> <artifactId>exo.jcr.applications.backupconsole.dist</artifactId> <name>eXo JCR :: Applications :: Backup Console Binary Distribution</name> @@ -37,7 +37,7 @@ <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.applications.backupconsole</artifactId> - <version>1.14.5-GA-CP01-SNAPSHOT</version> + <version>1.14.5-GA-CP01</version> </dependency> <dependency> <groupId>org.exoplatform.jcr</groupId> Modified: jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.browser/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.browser/pom.xml 2011-12-28 13:09:19 UTC (rev 5374) +++ jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.browser/pom.xml 2011-12-28 13:21:38 UTC (rev 5375) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-applications-parent</artifactId> - <version>1.14.5-GA-CP01-SNAPSHOT</version> + <version>1.14.5-GA-CP01</version> </parent> <artifactId>exo.jcr.applications.browser</artifactId> <packaging>war</packaging> Modified: jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.config/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.config/pom.xml 2011-12-28 13:09:19 UTC (rev 5374) +++ jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.config/pom.xml 2011-12-28 13:21:38 UTC (rev 5375) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-applications-parent</artifactId> - <version>1.14.5-GA-CP01-SNAPSHOT</version> + <version>1.14.5-GA-CP01</version> </parent> <artifactId>exo.jcr.applications.config</artifactId> <packaging>pom</packaging> Modified: jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.fckeditor/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.fckeditor/pom.xml 2011-12-28 13:09:19 UTC (rev 5374) +++ jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.fckeditor/pom.xml 2011-12-28 13:21:38 UTC (rev 5375) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-applications-parent</artifactId> - <version>1.14.5-GA-CP01-SNAPSHOT</version> + <version>1.14.5-GA-CP01</version> </parent> <artifactId>exo.jcr.applications.fckeditor</artifactId> <packaging>war</packaging> Modified: jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.jboss/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.jboss/pom.xml 2011-12-28 13:09:19 UTC (rev 5374) +++ jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.jboss/pom.xml 2011-12-28 13:21:38 UTC (rev 5375) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.applications.config</artifactId> - <version>1.14.5-GA-CP01-SNAPSHOT</version> + <version>1.14.5-GA-CP01</version> <relativePath>../exo.jcr.applications.config/pom.xml</relativePath> </parent> @@ -41,7 +41,7 @@ <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.ear</artifactId> - <version>1.14.5-GA-CP01-SNAPSHOT</version> + <version>1.14.5-GA-CP01</version> <type>ear</type> <scope>runtime</scope> </dependency> Modified: jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.jetty/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.jetty/pom.xml 2011-12-28 13:09:19 UTC (rev 5374) +++ jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.jetty/pom.xml 2011-12-28 13:21:38 UTC (rev 5375) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.applications.config</artifactId> - <version>1.14.5-GA-CP01-SNAPSHOT</version> + <version>1.14.5-GA-CP01</version> <relativePath>../exo.jcr.applications.config/pom.xml</relativePath> </parent> Modified: jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.jonas/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.jonas/pom.xml 2011-12-28 13:09:19 UTC (rev 5374) +++ jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.jonas/pom.xml 2011-12-28 13:21:38 UTC (rev 5375) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.applications.config</artifactId> - <version>1.14.5-GA-CP01-SNAPSHOT</version> + <version>1.14.5-GA-CP01</version> <relativePath>../exo.jcr.applications.config/pom.xml</relativePath> </parent> @@ -41,7 +41,7 @@ <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.connectors.jca</artifactId> - <version>1.14.5-GA-CP01-SNAPSHOT</version> + <version>1.14.5-GA-CP01</version> <type>rar</type> <scope>runtime</scope> </dependency> Modified: jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.rest/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.rest/pom.xml 2011-12-28 13:09:19 UTC (rev 5374) +++ jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.rest/pom.xml 2011-12-28 13:21:38 UTC (rev 5375) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-applications-parent</artifactId> - <version>1.14.5-GA-CP01-SNAPSHOT</version> + <version>1.14.5-GA-CP01</version> </parent> <artifactId>exo.jcr.applications.rest</artifactId> <packaging>war</packaging> Modified: jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.tomcat/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.tomcat/pom.xml 2011-12-28 13:09:19 UTC (rev 5374) +++ jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.applications.tomcat/pom.xml 2011-12-28 13:21:38 UTC (rev 5375) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.applications.config</artifactId> - <version>1.14.5-GA-CP01-SNAPSHOT</version> + <version>1.14.5-GA-CP01</version> <relativePath>../exo.jcr.applications.config/pom.xml</relativePath> </parent> Modified: jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.cluster.testclient/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.cluster.testclient/pom.xml 2011-12-28 13:09:19 UTC (rev 5374) +++ jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.cluster.testclient/pom.xml 2011-12-28 13:21:38 UTC (rev 5375) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-applications-parent</artifactId> - <version>1.14.5-GA-CP01-SNAPSHOT</version> + <version>1.14.5-GA-CP01</version> </parent> <artifactId>exo.jcr.cluster.testclient</artifactId> <name>eXo JCR :: Cluster :: Test Client</name> Modified: jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.ear/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.ear/pom.xml 2011-12-28 13:09:19 UTC (rev 5374) +++ jcr/branches/1.14.5-GA-CP01/applications/exo.jcr.ear/pom.xml 2011-12-28 13:21:38 UTC (rev 5375) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-applications-parent</artifactId> - <version>1.14.5-GA-CP01-SNAPSHOT</version> + <version>1.14.5-GA-CP01</version> </parent> <artifactId>exo.jcr.ear</artifactId> <packaging>ear</packaging> Modified: jcr/branches/1.14.5-GA-CP01/applications/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/applications/pom.xml 2011-12-28 13:09:19 UTC (rev 5374) +++ jcr/branches/1.14.5-GA-CP01/applications/pom.xml 2011-12-28 13:21:38 UTC (rev 5375) @@ -22,12 +22,12 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.14.5-GA-CP01-SNAPSHOT</version> + <version>1.14.5-GA-CP01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jcr-applications-parent</artifactId> - <version>1.14.5-GA-CP01-SNAPSHOT</version> + <version>1.14.5-GA-CP01</version> <name>eXo JCR :: Applications :: Reactor</name> <packaging>pom</packaging> Modified: jcr/branches/1.14.5-GA-CP01/exo.jcr.component.core/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/exo.jcr.component.core/pom.xml 2011-12-28 13:09:19 UTC (rev 5374) +++ jcr/branches/1.14.5-GA-CP01/exo.jcr.component.core/pom.xml 2011-12-28 13:21:38 UTC (rev 5375) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.14.5-GA-CP01-SNAPSHOT</version> + <version>1.14.5-GA-CP01</version> </parent> <artifactId>exo.jcr.component.core</artifactId> <name>eXo JCR :: Component :: Core Service</name> Modified: jcr/branches/1.14.5-GA-CP01/exo.jcr.component.ext/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/exo.jcr.component.ext/pom.xml 2011-12-28 13:09:19 UTC (rev 5374) +++ jcr/branches/1.14.5-GA-CP01/exo.jcr.component.ext/pom.xml 2011-12-28 13:21:38 UTC (rev 5375) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.14.5-GA-CP01-SNAPSHOT</version> + <version>1.14.5-GA-CP01</version> </parent> <artifactId>exo.jcr.component.ext</artifactId> <name>eXo JCR :: Component :: Extension Service</name> Modified: jcr/branches/1.14.5-GA-CP01/exo.jcr.component.ftp/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/exo.jcr.component.ftp/pom.xml 2011-12-28 13:09:19 UTC (rev 5374) +++ jcr/branches/1.14.5-GA-CP01/exo.jcr.component.ftp/pom.xml 2011-12-28 13:21:38 UTC (rev 5375) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.14.5-GA-CP01-SNAPSHOT</version> + <version>1.14.5-GA-CP01</version> </parent> <artifactId>exo.jcr.component.ftp</artifactId> <name>eXo JCR :: Component :: FTP Service</name> Modified: jcr/branches/1.14.5-GA-CP01/exo.jcr.component.statistics/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/exo.jcr.component.statistics/pom.xml 2011-12-28 13:09:19 UTC (rev 5374) +++ jcr/branches/1.14.5-GA-CP01/exo.jcr.component.statistics/pom.xml 2011-12-28 13:21:38 UTC (rev 5375) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.14.5-GA-CP01-SNAPSHOT</version> + <version>1.14.5-GA-CP01</version> </parent> <artifactId>exo.jcr.component.statistics</artifactId> <name>eXo JCR :: Component :: Statistics Provider</name> Modified: jcr/branches/1.14.5-GA-CP01/exo.jcr.component.webdav/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/exo.jcr.component.webdav/pom.xml 2011-12-28 13:09:19 UTC (rev 5374) +++ jcr/branches/1.14.5-GA-CP01/exo.jcr.component.webdav/pom.xml 2011-12-28 13:21:38 UTC (rev 5375) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.14.5-GA-CP01-SNAPSHOT</version> + <version>1.14.5-GA-CP01</version> </parent> <artifactId>exo.jcr.component.webdav</artifactId> <name>eXo JCR :: Component :: Webdav Service</name> Modified: jcr/branches/1.14.5-GA-CP01/exo.jcr.connectors.jca/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/exo.jcr.connectors.jca/pom.xml 2011-12-28 13:09:19 UTC (rev 5374) +++ jcr/branches/1.14.5-GA-CP01/exo.jcr.connectors.jca/pom.xml 2011-12-28 13:21:38 UTC (rev 5375) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.14.5-GA-CP01-SNAPSHOT</version> + <version>1.14.5-GA-CP01</version> </parent> <artifactId>exo.jcr.connectors.jca</artifactId> <packaging>rar</packaging> Modified: jcr/branches/1.14.5-GA-CP01/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml 2011-12-28 13:09:19 UTC (rev 5374) +++ jcr/branches/1.14.5-GA-CP01/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml 2011-12-28 13:21:38 UTC (rev 5375) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.docs.developer</artifactId> - <version>1.14.5-GA-CP01-SNAPSHOT</version> + <version>1.14.5-GA-CP01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: jcr/branches/1.14.5-GA-CP01/exo.jcr.docs/exo.jcr.docs.developer/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/exo.jcr.docs/exo.jcr.docs.developer/pom.xml 2011-12-28 13:09:19 UTC (rev 5374) +++ jcr/branches/1.14.5-GA-CP01/exo.jcr.docs/exo.jcr.docs.developer/pom.xml 2011-12-28 13:21:38 UTC (rev 5375) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.docs</artifactId> - <version>1.14.5-GA-CP01-SNAPSHOT</version> + <version>1.14.5-GA-CP01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: jcr/branches/1.14.5-GA-CP01/exo.jcr.docs/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/exo.jcr.docs/pom.xml 2011-12-28 13:09:19 UTC (rev 5374) +++ jcr/branches/1.14.5-GA-CP01/exo.jcr.docs/pom.xml 2011-12-28 13:21:38 UTC (rev 5375) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.14.5-GA-CP01-SNAPSHOT</version> + <version>1.14.5-GA-CP01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: jcr/branches/1.14.5-GA-CP01/exo.jcr.framework.command/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/exo.jcr.framework.command/pom.xml 2011-12-28 13:09:19 UTC (rev 5374) +++ jcr/branches/1.14.5-GA-CP01/exo.jcr.framework.command/pom.xml 2011-12-28 13:21:38 UTC (rev 5375) @@ -12,7 +12,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.14.5-GA-CP01-SNAPSHOT</version> + <version>1.14.5-GA-CP01</version> </parent> <artifactId>exo.jcr.framework.command</artifactId> <name>eXo JCR :: Framework :: Command</name> Modified: jcr/branches/1.14.5-GA-CP01/exo.jcr.framework.ftpclient/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/exo.jcr.framework.ftpclient/pom.xml 2011-12-28 13:09:19 UTC (rev 5374) +++ jcr/branches/1.14.5-GA-CP01/exo.jcr.framework.ftpclient/pom.xml 2011-12-28 13:21:38 UTC (rev 5375) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.14.5-GA-CP01-SNAPSHOT</version> + <version>1.14.5-GA-CP01</version> </parent> <artifactId>exo.jcr.framework.ftpclient</artifactId> <name>eXo JCR :: Framework :: FTP Client</name> Modified: jcr/branches/1.14.5-GA-CP01/exo.jcr.framework.web/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/exo.jcr.framework.web/pom.xml 2011-12-28 13:09:19 UTC (rev 5374) +++ jcr/branches/1.14.5-GA-CP01/exo.jcr.framework.web/pom.xml 2011-12-28 13:21:38 UTC (rev 5375) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.14.5-GA-CP01-SNAPSHOT</version> + <version>1.14.5-GA-CP01</version> </parent> <artifactId>exo.jcr.framework.web</artifactId> <name>eXo JCR :: Framework :: Web</name> Modified: jcr/branches/1.14.5-GA-CP01/packaging/module/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/packaging/module/pom.xml 2011-12-28 13:09:19 UTC (rev 5374) +++ jcr/branches/1.14.5-GA-CP01/packaging/module/pom.xml 2011-12-28 13:21:38 UTC (rev 5375) @@ -4,7 +4,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.14.5-GA-CP01-SNAPSHOT</version> + <version>1.14.5-GA-CP01</version> <relativePath>../../pom.xml</relativePath> </parent> <artifactId>jcr.packaging.module</artifactId> Modified: jcr/branches/1.14.5-GA-CP01/pom.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/pom.xml 2011-12-28 13:09:19 UTC (rev 5374) +++ jcr/branches/1.14.5-GA-CP01/pom.xml 2011-12-28 13:21:38 UTC (rev 5375) @@ -29,14 +29,14 @@ <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.14.5-GA-CP01-SNAPSHOT</version> + <version>1.14.5-GA-CP01</version> <packaging>pom</packaging> <name>eXo JCR</name> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/jcr/branches/1.14.5-GA-CP01</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/jcr/branches/1.14.5-GA-CP01</developerConnection> - <url>http://fisheye.jboss.org/browse/exo-jcr/jcr/branches/1.14.5-GA-CP01</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/jcr/tags/1.14.5-GA-CP01</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/jcr/tags/1.14.5-GA-CP01</developerConnection> + <url>http://fisheye.jboss.org/browse/exo-jcr/jcr/tags/1.14.5-GA-CP01</url> </scm> <properties>

12 years, 4 months

1
0
0 / 0

exo-jcr SVN: r5374 - jcr/branches/1.14.5-GA-CP01/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration.

by do-not-reply＠jboss.org

Author: tolusha Date: 2011-12-28 08:09:19 -0500 (Wed, 28 Dec 2011) New Revision: 5374 Modified: jcr/branches/1.14.5-GA-CP01/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/multi-db-schema-support.xml Log: EXOJCR-1699: fix chapter id Modified: jcr/branches/1.14.5-GA-CP01/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/multi-db-schema-support.xml =================================================================== --- jcr/branches/1.14.5-GA-CP01/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/multi-db-schema-support.xml 2011-12-28 12:12:42 UTC (rev 5373) +++ jcr/branches/1.14.5-GA-CP01/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/multi-db-schema-support.xml 2011-12-28 13:09:19 UTC (rev 5374) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> -<chapter id="JCR.RESTServicesOnGroovy"> +<chapter id="JCR.MultiDBSchemaSupport"> <?dbhtml filename="multi-db-schema-support.html"?> <title>How to host several JCR instances on the same database

12 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

exo-jcr-commits December 2011