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

exo-jcr SVN: r5353 - in core/trunk/exo.core.component.organization.tests: src and 1 other directory.

by do-not-reply＠jboss.org

Author: tolusha Date: 2011-12-26 07:23:30 -0500 (Mon, 26 Dec 2011) New Revision: 5353 Removed: core/trunk/exo.core.component.organization.tests/src/main/ Modified: core/trunk/exo.core.component.organization.tests/pom.xml Log: EXOJCR-1694: Fixed the build for Sonar Modified: core/trunk/exo.core.component.organization.tests/pom.xml =================================================================== --- core/trunk/exo.core.component.organization.tests/pom.xml 2011-12-26 11:51:02 UTC (rev 5352) +++ core/trunk/exo.core.component.organization.tests/pom.xml 2011-12-26 12:23:30 UTC (rev 5353) @@ -32,35 +32,27 @@ <name>eXo Core :: Component :: Organization Service Tests</name> <description>Create an Organisation Service TCK package</description> + + <properties> +  + <maven.test.skip>true</maven.test.skip> + </properties> <build> <plugins> -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/*.*</exclude> - </excludes> - </configuration> - </plugin>  <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> - <version>2.1.2</version> <executions> <execution> <id>attach-sources</id> - <phase>verify</phase> + <phase>package</phase> <goals> - <goal>jar-no-fork</goal> + <goal>test-jar-no-fork</goal> </goals> </execution> </executions>

14 years, 4 months

1
0
0 / 0

exo-jcr SVN: r5352 - in core/branches/EXOJCR-1694: exo.core.component.organization.jdbc and 3 other directories.

by do-not-reply＠jboss.org

Author: aheritier Date: 2011-12-26 06:51:02 -0500 (Mon, 26 Dec 2011) New Revision: 5352 Added: core/branches/EXOJCR-1694/exo.core.component.organization.tests/src/test/ Removed: core/branches/EXOJCR-1694/exo.core.component.organization.tests/src/main/ Modified: core/branches/EXOJCR-1694/exo.core.component.organization.jdbc/pom.xml core/branches/EXOJCR-1694/exo.core.component.organization.ldap/pom.xml core/branches/EXOJCR-1694/exo.core.component.organization.tests/pom.xml core/branches/EXOJCR-1694/pom.xml Log: EXOJCR-1694 : Deploy a jar with tests sources from exo.core.component.organization.tests to reuse it in others tests Modified: core/branches/EXOJCR-1694/exo.core.component.organization.jdbc/pom.xml =================================================================== --- core/branches/EXOJCR-1694/exo.core.component.organization.jdbc/pom.xml 2011-12-26 11:48:43 UTC (rev 5351) +++ core/branches/EXOJCR-1694/exo.core.component.organization.jdbc/pom.xml 2011-12-26 11:51:02 UTC (rev 5352) @@ -81,7 +81,7 @@ <dependency> <groupId>org.exoplatform.core</groupId> <artifactId>exo.core.component.organization.tests</artifactId> - <classifier>sources</classifier> + <classifier>test-sources</classifier> <scope>test</scope> </dependency> <dependency> @@ -184,7 +184,7 @@ <artifactItem> <groupId>org.exoplatform.core</groupId> <artifactId>exo.core.component.organization.tests</artifactId> - <classifier>sources</classifier> + <classifier>test-sources</classifier> <type>jar</type> <overWrite>false</overWrite> </artifactItem> Modified: core/branches/EXOJCR-1694/exo.core.component.organization.ldap/pom.xml =================================================================== --- core/branches/EXOJCR-1694/exo.core.component.organization.ldap/pom.xml 2011-12-26 11:48:43 UTC (rev 5351) +++ core/branches/EXOJCR-1694/exo.core.component.organization.ldap/pom.xml 2011-12-26 11:51:02 UTC (rev 5352) @@ -70,7 +70,7 @@ <dependency> <groupId>org.exoplatform.core</groupId> <artifactId>exo.core.component.organization.tests</artifactId> - <classifier>sources</classifier> + <classifier>test-sources</classifier> <scope>test</scope> </dependency> <dependency> @@ -104,7 +104,7 @@ <artifactItem> <groupId>org.exoplatform.core</groupId> <artifactId>exo.core.component.organization.tests</artifactId> - <classifier>sources</classifier> + <classifier>test-sources</classifier> <type>jar</type> <overWrite>false</overWrite> </artifactItem> Modified: core/branches/EXOJCR-1694/exo.core.component.organization.tests/pom.xml =================================================================== --- core/branches/EXOJCR-1694/exo.core.component.organization.tests/pom.xml 2011-12-26 11:48:43 UTC (rev 5351) +++ core/branches/EXOJCR-1694/exo.core.component.organization.tests/pom.xml 2011-12-26 11:51:02 UTC (rev 5352) @@ -32,35 +32,27 @@ <name>eXo Core :: Component :: Organization Service Tests</name> <description>Create an Organisation Service TCK package</description> + + <properties> +  + <maven.test.skip>true</maven.test.skip> + </properties> <build> <plugins> -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/*.*</exclude> - </excludes> - </configuration> - </plugin>  <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> - <version>2.1.2</version> <executions> <execution> <id>attach-sources</id> - <phase>verify</phase> + <phase>package</phase> <goals> - <goal>jar-no-fork</goal> + <goal>test-jar-no-fork</goal> </goals> </execution> </executions> Modified: core/branches/EXOJCR-1694/pom.xml =================================================================== --- core/branches/EXOJCR-1694/pom.xml 2011-12-26 11:48:43 UTC (rev 5351) +++ core/branches/EXOJCR-1694/pom.xml 2011-12-26 11:51:02 UTC (rev 5352) @@ -40,6 +40,9 @@ <org.exoplatform.framework.junit.version>1.2.1-GA</org.exoplatform.framework.junit.version> <org.exoplatform.kernel.version>2.3.6-GA-SNAPSHOT</org.exoplatform.kernel.version> + +  + <version.source.plugin>2.1.2</version.source.plugin> </properties> <scm> @@ -131,7 +134,7 @@ <groupId>org.exoplatform.core</groupId> <artifactId>exo.core.component.organization.tests</artifactId> <version>${project.version}</version> - <classifier>sources</classifier> + <classifier>test-sources</classifier> <scope>test</scope> </dependency>

14 years, 4 months

1
0
0 / 0

exo-jcr SVN: r5351 - core/branches.

by do-not-reply＠jboss.org

Author: aheritier Date: 2011-12-26 06:48:43 -0500 (Mon, 26 Dec 2011) New Revision: 5351 Added: core/branches/EXOJCR-1694/ Log: EXOJCR-1694 : Branch to cleanup the build for sonar compatibility

14 years, 4 months

1
0
0 / 0

exo-jcr SVN: r5350 - in ws/trunk: exo.ws.rest.ext/src/main/java/org/exoplatform/services/rest/ext/groovy and 1 other directory.

by do-not-reply＠jboss.org

Author: andrew.plotnikov Date: 2011-12-26 04:28:09 -0500 (Mon, 26 Dec 2011) New Revision: 5350 Modified: ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Cookie2.java ws/trunk/exo.ws.rest.ext/src/main/java/org/exoplatform/services/rest/ext/groovy/GroovyJaxrsPublisher.java Log: EXOJCR-1687: Fixed new sonar violations in project Modified: ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Cookie2.java =================================================================== --- ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Cookie2.java 2011-12-23 15:33:44 UTC (rev 5349) +++ ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Cookie2.java 2011-12-26 09:28:09 UTC (rev 5350) @@ -463,7 +463,9 @@ String eff_host = con.getHost(); if (eff_host.indexOf('.') == -1) - eff_host += ".local"; + { + eff_host += ".local"; //NOSONAR + } return ((domain.charAt(0) == '.' && eff_host.endsWith(domain) || domain.charAt(0) != '.' && eff_host.equals(domain)) Modified: ws/trunk/exo.ws.rest.ext/src/main/java/org/exoplatform/services/rest/ext/groovy/GroovyJaxrsPublisher.java =================================================================== --- ws/trunk/exo.ws.rest.ext/src/main/java/org/exoplatform/services/rest/ext/groovy/GroovyJaxrsPublisher.java 2011-12-23 15:33:44 UTC (rev 5349) +++ ws/trunk/exo.ws.rest.ext/src/main/java/org/exoplatform/services/rest/ext/groovy/GroovyJaxrsPublisher.java 2011-12-26 09:28:09 UTC (rev 5350) @@ -42,7 +42,7 @@ import java.lang.reflect.InvocationTargetException; import java.net.MalformedURLException; import java.nio.charset.Charset; -import java.nio.charset.UnsupportedCharsetException; +import java.nio.charset.UnsupportedCharsetException; //NOSONAR import java.security.PrivilegedAction; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction;

14 years, 4 months

1
0
0 / 0

exo-jcr SVN: r5349 - in ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common: util and 1 other directory.

by do-not-reply＠jboss.org

Author: andrew.plotnikov Date: 2011-12-23 10:33:44 -0500 (Fri, 23 Dec 2011) New Revision: 5349 Modified: ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPConnection.java ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/util/HierarchicalProperty.java Log: EXOJCR-1687: Fixed new sonar violations in project Modified: ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPConnection.java =================================================================== --- ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPConnection.java 2011-12-23 15:32:41 UTC (rev 5348) +++ ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPConnection.java 2011-12-23 15:33:44 UTC (rev 5349) @@ -790,7 +790,7 @@ public HTTPResponse Head(String file, NVPair[] form_data, NVPair[] headers) throws IOException, ModuleException { String query = Codecs.nv2query(form_data); - StringBuffer resource = new StringBuffer(stripRef(file)); + StringBuilder resource = new StringBuilder(stripRef(file)); if (query != null && query.length() > 0) { @@ -831,7 +831,7 @@ */ public HTTPResponse Head(String file, String query, NVPair[] headers) throws IOException, ModuleException { - StringBuffer resource = new StringBuffer(stripRef(file)); + StringBuilder resource = new StringBuilder(stripRef(file)); if (query != null && query.length() > 0) { @@ -886,7 +886,7 @@ public HTTPResponse Get(String file, NVPair[] form_data, NVPair[] headers) throws IOException, ModuleException { String query = Codecs.nv2query(form_data); - StringBuffer resource = new StringBuffer(stripRef(file)); + StringBuilder resource = new StringBuilder(stripRef(file)); if (query != null && query.length() > 0) { @@ -927,7 +927,7 @@ @Deprecated public HTTPResponse Get(String file, String query, NVPair[] headers) throws IOException, ModuleException { - StringBuffer resource = new StringBuffer(stripRef(file)); + StringBuilder resource = new StringBuilder(stripRef(file)); if (query != null && query.length() > 0) { Modified: ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/util/HierarchicalProperty.java =================================================================== --- ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/util/HierarchicalProperty.java 2011-12-23 15:32:41 UTC (rev 5348) +++ ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/util/HierarchicalProperty.java 2011-12-23 15:33:44 UTC (rev 5349) @@ -240,7 +240,7 @@ private String makeStringFromQName(QName qname) { - StringBuffer str = new StringBuffer(); + StringBuilder str = new StringBuilder(); if (qname.getPrefix() != null && qname.getPrefix().length() > 0) {

14 years, 4 months

1
0
0 / 0

exo-jcr SVN: r5348 - in kernel/trunk: exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/io and 2 other directories.

by do-not-reply＠jboss.org

Author: andrew.plotnikov Date: 2011-12-23 10:32:41 -0500 (Fri, 23 Dec 2011) New Revision: 5348 Modified: kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/ExoExpression.java 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/io/ZipUtil.java kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/compress/CompressData.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/ObjectParam.java Log: EXOJCR-1687: Fixed new sonar violations in project Modified: kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/ExoExpression.java =================================================================== --- kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/ExoExpression.java 2011-12-23 13:38:34 UTC (rev 5347) +++ kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/ExoExpression.java 2011-12-23 15:32:41 UTC (rev 5348) @@ -244,23 +244,23 @@ return new ByteArrayInputStream(baos.toByteArray()); for (File f : list) { - StringBuffer filePath = new StringBuffer(f.getAbsolutePath()); + StringBuilder filePath = new StringBuilder(f.getAbsolutePath()); if (f.getAbsolutePath().startsWith(path)) { if (containParent && input.isDirectory()) { - filePath = new StringBuffer(input.getName()); + filePath = new StringBuilder(input.getName()); filePath.append(File.separator); filePath.append(f.getAbsolutePath().substring(path.length() + 1)); } else if (input.isDirectory()) { - filePath = new StringBuffer(f.getAbsolutePath().substring(path.length() + 1)); + filePath = new StringBuilder(f.getAbsolutePath().substring(path.length() + 1)); } else { - filePath = new StringBuffer(input.getName()); + filePath = new StringBuilder(input.getName()); } } 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-23 13:38:34 UTC (rev 5347) +++ kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/ISO8601.java 2011-12-23 15:32:41 UTC (rev 5348) @@ -263,7 +263,7 @@ */ public static Calendar parse(String dateString, String[] formats) throws ParseException { - StringBuffer problems = new StringBuffer(); + StringBuilder problems = new StringBuilder(); int errOffset = 0; for (String format : formats) Modified: kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/io/ZipUtil.java =================================================================== --- kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/io/ZipUtil.java 2011-12-23 13:38:34 UTC (rev 5347) +++ kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/io/ZipUtil.java 2011-12-23 15:32:41 UTC (rev 5348) @@ -72,23 +72,23 @@ return zipOutput; for (File f : list) { - StringBuffer filePath = new StringBuffer(f.getAbsolutePath()); + StringBuilder filePath = new StringBuilder(f.getAbsolutePath()); if (f.getAbsolutePath().startsWith(path)) { if (containParent && input.isDirectory()) { - filePath = new StringBuffer(input.getName()); + filePath = new StringBuilder(input.getName()); filePath.append(File.separator); filePath.append(f.getAbsolutePath().substring(path.length() + 1)); } else if (input.isDirectory()) { - filePath = new StringBuffer(f.getAbsolutePath().substring(path.length() + 1)); + filePath = new StringBuilder(f.getAbsolutePath().substring(path.length() + 1)); } else { - filePath = new StringBuffer(input.getName()); + filePath = new StringBuilder(input.getName()); } } Modified: kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/compress/CompressData.java =================================================================== --- kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/compress/CompressData.java 2011-12-23 13:38:34 UTC (rev 5347) +++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/compress/CompressData.java 2011-12-23 15:32:41 UTC (rev 5348) @@ -354,23 +354,23 @@ throw new Exception("nothing in the list"); for (File f : list) { - StringBuffer filePath = new StringBuffer(f.getAbsolutePath()); + StringBuilder filePath = new StringBuilder(f.getAbsolutePath()); if (f.getAbsolutePath().startsWith(path)) { if (containParent && file_.isDirectory()) { - filePath = new StringBuffer(file_.getName()); + filePath = new StringBuilder(file_.getName()); filePath.append(File.separator); filePath.append(f.getAbsolutePath().substring(path.length() + 1)); } else if (file_.isDirectory()) { - filePath = new StringBuffer(f.getAbsolutePath().substring(path.length() + 1)); + filePath = new StringBuilder(f.getAbsolutePath().substring(path.length() + 1)); } else { - filePath = new StringBuffer(file_.getName()); + filePath = new StringBuilder(file_.getName()); } } @@ -452,23 +452,23 @@ throw new Exception("nothing in the list"); for (File f : list) { - StringBuffer filePath = new StringBuffer(f.getAbsolutePath()); + StringBuilder filePath = new StringBuilder(f.getAbsolutePath()); if (f.getAbsolutePath().startsWith(path)) { if (containParent && file_.isDirectory()) { - filePath = new StringBuffer(file_.getName()); + filePath = new StringBuilder(file_.getName()); filePath.append(File.separator); filePath.append(f.getAbsolutePath().substring(path.length() + 1)); } else if (file_.isDirectory()) { - filePath = new StringBuffer(f.getAbsolutePath().substring(path.length() + 1)); + filePath = new StringBuilder(f.getAbsolutePath().substring(path.length() + 1)); } else { - filePath = new StringBuffer(file_.getName()); + filePath = new StringBuilder(file_.getName()); } } @@ -484,7 +484,6 @@ addToArchive(zos, bufInput, filePath.toString()); } } - } public static class InputStreamDataInstance extends DataInstance Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/ObjectParam.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/ObjectParam.java 2011-12-23 13:38:34 UTC (rev 5347) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/ObjectParam.java 2011-12-23 15:32:41 UTC (rev 5348) @@ -152,7 +152,7 @@ if (className.indexOf(".") < 0) { - StringBuffer fullName = new StringBuffer(); + StringBuilder fullName = new StringBuilder(); fullName.append(package_); fullName.append("."); fullName.append(className);

14 years, 4 months

1
0
0 / 0

exo-jcr SVN: r5347 - ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client.

by do-not-reply＠jboss.org

Author: andrew.plotnikov Date: 2011-12-23 08:38:34 -0500 (Fri, 23 Dec 2011) New Revision: 5347 Modified: ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Codecs.java ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/DefaultAuthHandler.java ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPConnection.java Log: EXOJCR-1687: Fixed new sonar violations in project Modified: ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Codecs.java =================================================================== --- ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Codecs.java 2011-12-23 13:21:25 UTC (rev 5346) +++ ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Codecs.java 2011-12-23 13:38:34 UTC (rev 5347) @@ -740,8 +740,12 @@ { int next = findEOL(data, start) + 2; if (next - 2 <= start) + { break; // empty line -> end of headers + } + hdr = new String(data, start, next - 2 - start, "8859_1"); + start = next; // handle line continuation @@ -749,12 +753,13 @@ while (next < data.length - 1 && ((ch = data[next]) == ' ' || ch == '\t')) { next = findEOL(data, start) + 2; - hdr += new String(data, start, next - 2 - start, "8859_1"); + hdr += new String(data, start, next - 2 - start, "8859_1"); //NOSONAR start = next; } if (!hdr.regionMatches(true, 0, "Content-Disposition", 0, 19)) continue; + Vector pcd = Util.parseHeader(hdr.substring(hdr.indexOf(':') + 1)); HttpHeaderElement elem = Util.getElement(pcd, "form-data"); Modified: ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/DefaultAuthHandler.java =================================================================== --- ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/DefaultAuthHandler.java 2011-12-23 13:21:25 UTC (rev 5346) +++ ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/DefaultAuthHandler.java 2011-12-23 13:38:34 UTC (rev 5347) @@ -841,10 +841,12 @@ A1 = extra[DI_A1]; A2 = method + ":" + params[uri].getValue(); + if (qop != -1 && params[qop].getValue().equalsIgnoreCase("auth-int")) { - A2 += ":" + hash; + A2 += ":" + hash; //NOSONAR } + A2 = MD5.hexDigest(A2); if (qop == -1) @@ -1215,8 +1217,12 @@ // draft-01 was: A2 = resp.getStatusCode() + ":" + uri; A2 = ":" + uri; + if (qop.equalsIgnoreCase("auth-int")) - A2 += ":" + MD5.toHex(hash); + { + A2 += ":" + MD5.toHex(hash); //NOSONAR + } + A2 = MD5.hexDigest(A2); hash = MD5.digest(A1 + ":" + nonce + ":" + nc + ":" + cnonce + ":" + qop + ":" + A2); Modified: ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPConnection.java =================================================================== --- ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPConnection.java 2011-12-23 13:21:25 UTC (rev 5346) +++ ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPConnection.java 2011-12-23 13:38:34 UTC (rev 5347) @@ -789,11 +789,16 @@ */ public HTTPResponse Head(String file, NVPair[] form_data, NVPair[] headers) throws IOException, ModuleException { - String File = stripRef(file), query = Codecs.nv2query(form_data); + String query = Codecs.nv2query(form_data); + StringBuffer resource = new StringBuffer(stripRef(file)); + if (query != null && query.length() > 0) - File += "?" + query; + { + resource.append("?"); + resource.append(query); + } - return setupRequest("HEAD", File, headers, null, null); + return setupRequest("HEAD", resource.toString(), headers, null, null); } /** @@ -826,11 +831,15 @@ */ public HTTPResponse Head(String file, String query, NVPair[] headers) throws IOException, ModuleException { - String File = stripRef(file); + StringBuffer resource = new StringBuffer(stripRef(file)); + if (query != null && query.length() > 0) - File += "?" + Codecs.URLEncode(query); + { + resource.append("?"); + resource.append(Codecs.URLEncode(query)); + } - return setupRequest("HEAD", File, headers, null, null); + return setupRequest("HEAD", resource.toString(), headers, null, null); } /** @@ -876,11 +885,16 @@ */ public HTTPResponse Get(String file, NVPair[] form_data, NVPair[] headers) throws IOException, ModuleException { - String File = stripRef(file), query = Codecs.nv2query(form_data); + String query = Codecs.nv2query(form_data); + StringBuffer resource = new StringBuffer(stripRef(file)); + if (query != null && query.length() > 0) - File += "?" + query; + { + resource.append("?"); + resource.append(query); + } - return setupRequest("GET", File, headers, null, null); + return setupRequest("GET", resource.toString(), headers, null, null); } /** @@ -913,11 +927,15 @@ @Deprecated public HTTPResponse Get(String file, String query, NVPair[] headers) throws IOException, ModuleException { - String File = stripRef(file); + StringBuffer resource = new StringBuffer(stripRef(file)); + if (query != null && query.length() > 0) - File += "?" + Codecs.URLEncode(query); + { + resource.append("?"); + resource.append(Codecs.URLEncode(query)); + } - return setupRequest("GET", File, headers, null, null); + return setupRequest("GET", resource.toString(), headers, null, null); } /** @@ -2166,8 +2184,10 @@ } if (log.isDebugEnabled()) - log.debug("Added module " + module.getName() + " to " + ((list == DefaultModuleList) ? "default " : "") + { + log.debug("Added module " + module.getName() + " to " + ((list == DefaultModuleList) ? "default " : "") //NOSONAR + "list"); + } return true; } @@ -2181,9 +2201,10 @@ if (removed) { if (log.isDebugEnabled()) - log.debug("Removed module " + module.getName() + " from " + ((list == DefaultModuleList) ? "default " : "") + { + log.debug("Removed module " + module.getName() + " from " + ((list == DefaultModuleList) ? "default " : "") //NOSONAR + "list"); - + } } return removed; @@ -3617,7 +3638,9 @@ try { if (!Util.hasToken(co_hdr, "TE")) - co_hdr += ", TE"; + { + co_hdr += ", TE"; //NOSONAR + } } catch (ParseException pe) { @@ -3625,10 +3648,14 @@ } } else + { co_hdr = "TE"; + } if (ug_idx != -1) - co_hdr += ", Upgrade"; + { + co_hdr += ", Upgrade"; //NOSONAR + } if (co_hdr != null) {

14 years, 4 months

1
0
0 / 0

exo-jcr SVN: r5346 - ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client.

by do-not-reply＠jboss.org

Author: andrew.plotnikov Date: 2011-12-23 08:21:25 -0500 (Fri, 23 Dec 2011) New Revision: 5346 Modified: ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Cookie.java ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Cookie2.java ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/CookieModule.java ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPResponse.java Log: EXOJCR-1687: Fixed new sonar violations in project Modified: ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Cookie.java =================================================================== --- ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Cookie.java 2011-12-23 13:18:15 UTC (rev 5345) +++ ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Cookie.java 2011-12-23 13:21:25 UTC (rev 5346) @@ -493,11 +493,14 @@ */ protected boolean sendWith(RoRequest req) { - HTTPConnection con = req.getConnection(); + HTTPConnection con = req.getConnection(); String eff_host = con.getHost(); + if (eff_host.indexOf('.') == -1) - eff_host += ".local"; - + { + eff_host += ".local"; //NOSONAR + } + return ((domain.charAt(0) == '.' && eff_host.endsWith(domain) || domain.charAt(0) != '.' && eff_host.equals(domain)) && Util.getPath(req.getRequestURI()).startsWith(path) && (!secure || con.getProtocol().equals("https") || con Modified: ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Cookie2.java =================================================================== --- ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Cookie2.java 2011-12-23 13:18:15 UTC (rev 5345) +++ ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Cookie2.java 2011-12-23 13:21:25 UTC (rev 5346) @@ -346,12 +346,14 @@ continue; } - // if host name is simple (i.e w/o a domain) then append .local + // if host name is simple (i.e w/o a domain) then append .local String eff_host = req.getConnection().getHost(); if (eff_host.indexOf('.') == -1) - eff_host += ".local"; + { + eff_host += ".local"; //NOSONAR + } - // domain must be either .local or must contain at least two dots + // domain must be either .local or must contain at least two dots if (!curr.domain.equals(".local") && curr.domain.indexOf('.', 1) == -1) { log.warn("Bad Set-Cookie2 header: " + set_cookie + ", domain '" + curr.domain + "' is not '.local' and " @@ -359,7 +361,7 @@ continue; } - // domain must domain match host + // domain must domain match host if (!eff_host.endsWith(curr.domain)) { log.warn("Bad Set-Cookie2 header: " + set_cookie + ", domain '" + curr.domain + "' does not match current" @@ -367,7 +369,7 @@ continue; } - // host minus domain may not contain any dots + // host minus domain may not contain any dots if (eff_host.substring(0, eff_host.length() - curr.domain.length()).indexOf('.') != -1) { log.warn("Bad Set-Cookie2 header: " + set_cookie + ", domain '" + curr.domain + "' is more than one '.'" Modified: ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/CookieModule.java =================================================================== --- ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/CookieModule.java 2011-12-23 13:18:15 UTC (rev 5345) +++ ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/CookieModule.java 2011-12-23 13:21:25 UTC (rev 5346) @@ -701,8 +701,11 @@ public boolean acceptCookie(Cookie cookie, RoRequest req, RoResponse resp) { String server = req.getConnection().getHost(); + if (server.indexOf('.') == -1) - server += ".local"; + { + server += ".local"; //NOSONAR + } // Check lists. Reject takes priority over accept Modified: ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPResponse.java =================================================================== --- ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPResponse.java 2011-12-23 13:18:15 UTC (rev 5345) +++ ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPResponse.java 2011-12-23 13:21:25 UTC (rev 5346) @@ -314,12 +314,17 @@ public Date getHeaderAsDate(String hdr) throws IOException, IllegalArgumentException, ModuleException { String raw_date = getHeader(hdr); + if (raw_date == null) + { return null; + } // asctime() format is missing an explicit GMT specifier if (raw_date.toUpperCase().indexOf("GMT") == -1 && raw_date.indexOf(' ') > 0) - raw_date += " GMT"; + { + raw_date += " GMT"; //NOSONAR + } Date date; @@ -414,7 +419,9 @@ // asctime() format is missing an explicit GMT specifier if (raw_date.toUpperCase().indexOf("GMT") == -1 && raw_date.indexOf(' ') > 0) - raw_date += " GMT"; + { + raw_date += " GMT"; //NOSONAR + } Date date;

14 years, 4 months

1
0
0 / 0

exo-jcr SVN: r5345 - in ws/trunk: exo.ws.commons/src/main/java/org/exoplatform/common/util and 12 other directories.

by do-not-reply＠jboss.org

Author: andrew.plotnikov Date: 2011-12-23 08:18:15 -0500 (Fri, 23 Dec 2011) New Revision: 5345 Modified: ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/IdempotentSequence.java ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Response.java ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/StreamDemultiplexor.java ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/util/HierarchicalProperty.java ws/trunk/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/JsonWriterImpl.java ws/trunk/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/ObjectBuilder.java ws/trunk/exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet/AliasedURLRequestRedirector.java ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ContainerRequest.java ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/DependencySupplier.java ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/FieldInjectorImpl.java ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/InputHeadersMap.java ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/OutputHeadersMap.java ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ResourceBinder.java ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/RuntimeDelegateImpl.java ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/method/ParameterHelper.java ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/JsonEntityProvider.java ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/resource/AbstractResourceDescriptorImpl.java ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/resource/ResourceDescriptorValidator.java ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/uri/UriComponent.java ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/uri/UriTemplateParser.java ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/util/MediaTypeMap.java ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/wadl/BaseWadlGeneratorImpl.java ws/trunk/exo.ws.rest.ext/src/main/java/org/exoplatform/services/rest/ext/groovy/DefaultGroovyResourceLoader.java ws/trunk/exo.ws.rest.ext/src/main/java/org/exoplatform/services/rest/ext/groovy/ExtendedGroovyClassLoader.java ws/trunk/exo.ws.rest.ext/src/main/java/org/exoplatform/services/rest/ext/groovy/GroovyJaxrsPublisher.java ws/trunk/exo.ws.testframework/src/main/java/org/exoplatform/services/test/mock/MockHttpServletResponse.java ws/trunk/exo.ws.testframework/src/main/java/org/exoplatform/services/test/mock/MockHttpSession.java Log: EXOJCR-1687: Fixed new sonar violations in project Modified: ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/IdempotentSequence.java =================================================================== --- ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/IdempotentSequence.java 2011-12-23 07:46:46 UTC (rev 5344) +++ ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/IdempotentSequence.java 2011-12-23 13:18:15 UTC (rev 5345) @@ -180,8 +180,10 @@ else // update thread { - if (t_state == INDET && methodHasSideEffects(m_history[idx])) + if (t_state == INDET && methodHasSideEffects(m_history[idx])) //NOSONAR + { threads.put(r_history[idx], Boolean.FALSE); + } } } Modified: ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Response.java =================================================================== --- ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Response.java 2011-12-23 07:46:46 UTC (rev 5344) +++ ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Response.java 2011-12-23 13:18:15 UTC (rev 5345) @@ -382,12 +382,15 @@ public Date getHeaderAsDate(String hdr) throws IOException, IllegalArgumentException { String raw_date = getHeader(hdr); + if (raw_date == null) return null; // asctime() format is missing an explicit GMT specifier if (raw_date.toUpperCase().indexOf("GMT") == -1 && raw_date.indexOf(' ') > 0) - raw_date += " GMT"; + { + raw_date += " GMT"; //NOSONAR + } Date date; @@ -492,7 +495,9 @@ // asctime() format is missing an explicit GMT specifier if (raw_date.toUpperCase().indexOf("GMT") == -1 && raw_date.indexOf(' ') > 0) - raw_date += " GMT"; + { + raw_date += " GMT"; //NOSONAR + } Date date; Modified: ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/StreamDemultiplexor.java =================================================================== --- ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/StreamDemultiplexor.java 2011-12-23 07:46:46 UTC (rev 5344) +++ ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/StreamDemultiplexor.java 2011-12-23 13:18:15 UTC (rev 5345) @@ -213,7 +213,7 @@ // read the headers and data for all responses preceding us. ResponseHandler head; - while ((head = (ResponseHandler)RespHandlerList.getFirst()) != null && head != resph) + while ((head = (ResponseHandler)RespHandlerList.getFirst()) != null && head != resph) //NOSONAR { try { @@ -553,10 +553,14 @@ RespHandlerList.remove(resph); } - if (resph == MarkedForClose) + if (resph == MarkedForClose) //NOSONAR + { close(new IOException("Premature end of Keep-Alive"), false); + } else + { closeSocketIfAllStreamsClosed(); + } } /** @@ -587,7 +591,7 @@ while (resph != null && resph.stream.closed) { - if (resph == MarkedForClose) + if (resph == MarkedForClose) //NOSONAR { // remove all response handlers first ResponseHandler tmp; @@ -596,7 +600,7 @@ tmp = (ResponseHandler)RespHandlerList.getFirst(); RespHandlerList.remove(tmp); } - while (tmp != resph); + while (tmp != resph); //NOSONAR // close the socket close(new IOException("Premature end of Keep-Alive"), false); @@ -658,7 +662,7 @@ return; } - if (MarkedForClose == resph) + if (MarkedForClose == resph) //NOSONAR return; // already marked for closing after an earlier resp lasth = resph; Modified: ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/util/HierarchicalProperty.java =================================================================== --- ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/util/HierarchicalProperty.java 2011-12-23 07:46:46 UTC (rev 5344) +++ ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/util/HierarchicalProperty.java 2011-12-23 13:18:15 UTC (rev 5345) @@ -240,9 +240,14 @@ private String makeStringFromQName(QName qname) { - String str = ""; + StringBuffer str = new StringBuffer(); + if (qname.getPrefix() != null && qname.getPrefix().length() > 0) - str += qname.getPrefix() + ":"; - return str + qname.getLocalPart(); + { + str.append(qname.getPrefix()); + str.append(":"); + } + + return str.append(qname.getLocalPart()).toString(); } } Modified: ws/trunk/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/JsonWriterImpl.java =================================================================== --- ws/trunk/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/JsonWriterImpl.java 2011-12-23 07:46:46 UTC (rev 5344) +++ ws/trunk/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/JsonWriterImpl.java 2011-12-23 13:18:15 UTC (rev 5345) @@ -24,7 +24,6 @@ import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; -import java.io.UnsupportedEncodingException; import java.io.Writer; /** @@ -34,252 +33,6 @@ public class JsonWriterImpl implements JsonWriter { -// /** -// * Stack for control position in document. -// */ -// private final Stack<JsonToken> jsonTokens = new Stack<JsonToken>(); -// -// /** -// * Writer. -// */ -// private final Writer writer; -// -// /** -// * Indicate is current value is the first, if not before value must be written -// * comma. -// */ -// private boolean commaFirst = false; -// -// /** -// * Constructs JsonWriter. -// * -// * @param writer Writer. -// */ -// public JsonWriterImpl(Writer writer) -// { -// this.writer = writer; -// } -// -// /** -// * Constructs JsonWriter. -// * -// * @param out OutputStream. -// * @throws UnsupportedEncodingException -// */ -// public JsonWriterImpl(OutputStream out) -// { -// this(new OutputStreamWriter(out, JsonUtils.DEFAULT_CHARSET)); -// } -// -// /** -// * {@inheritDoc} -// */ -// public void writeStartObject() throws JsonException -// { -// if (!jsonTokens.isEmpty()) -// { -// // Object can be stated after key with followed ':' or as array item. -// if (jsonTokens.peek() != JsonToken.key && jsonTokens.peek() != JsonToken.array) -// throw new JsonException("Syntax error. Unexpected element '{'."); -// } -// try -// { -// if (commaFirst) // needed ',' before -// writer.write(','); -// writer.write('{'); -// // if at the top of stack is 'key' then remove it. -// if (!jsonTokens.isEmpty() && jsonTokens.peek() == JsonToken.key) -// jsonTokens.pop(); -// jsonTokens.push(JsonToken.object); // remember new object opened -// commaFirst = false; -// } -// catch (IOException e) -// { -// throw new JsonException(e); -// } -// } -// -// /** -// * {@inheritDoc} -// */ -// public void writeEndObject() throws JsonException -// { -// try -// { -// if (jsonTokens.pop() != JsonToken.object) // wrong JSON structure. -// throw new JsonException("Sysntax error. Unexpected element '}'."); -// writer.write('}'); -// commaFirst = true; -// } -// catch (IOException e) -// { -// throw new JsonException(e); -// } -// } -// -// /** -// * {@inheritDoc} -// */ -// public void writeStartArray() throws JsonException -// { -// if (jsonTokens.isEmpty() || (jsonTokens.peek() != JsonToken.key && jsonTokens.peek() != JsonToken.array)) -// throw new JsonException("Sysntax error. Unexpected element '['.."); -// try -// { -// if (commaFirst) // needed ',' before -// writer.write(','); -// writer.write('['); -// if (jsonTokens.peek() == JsonToken.key) -// // if at the top of stack is 'key' then remove it. -// jsonTokens.pop(); -// jsonTokens.push(JsonToken.array); // remember new array opened -// commaFirst = false; -// } -// catch (IOException e) -// { -// throw new JsonException(e); -// } -// } -// -// /** -// * {@inheritDoc} -// */ -// public void writeEndArray() throws JsonException -// { -// try -// { -// if (jsonTokens.pop() != JsonToken.array) // wrong JSON structure -// throw new JsonException("Sysntax error. Unexpected element ']'."); -// writer.write(']'); -// commaFirst = true; -// } -// catch (IOException e) -// { -// throw new JsonException(e); -// } -// } -// -// /** -// * {@inheritDoc} -// */ -// public void writeKey(String key) throws JsonException -// { -// if (key == null) -// throw new JsonException("Key is null."); -// if (jsonTokens.isEmpty() || jsonTokens.peek() != JsonToken.object) -// throw new JsonException("Sysntax error. Unexpected characters '" + key + "'." + jsonTokens); -// try -// { -// if (commaFirst) -// writer.write(','); -// // create JSON representation for given string. -// writer.write(JsonUtils.getJsonString(key)); -// writer.write(':'); -// commaFirst = false; -// jsonTokens.push(JsonToken.key); -// } -// catch (IOException e) -// { -// throw new JsonException(e); -// } -// } -// -// /** -// * {@inheritDoc} -// */ -// public void writeString(String value) throws JsonException -// { -// write(JsonUtils.getJsonString(value)); -// } -// -// /** -// * {@inheritDoc} -// */ -// public void writeValue(long value) throws JsonException -// { -// write(Long.toString(value)); -// } -// -// /** -// * {@inheritDoc} -// */ -// public void writeValue(double value) throws JsonException -// { -// write(Double.toString(value)); -// } -// -// /** -// * {@inheritDoc} -// */ -// public void writeValue(boolean value) throws JsonException -// { -// write(Boolean.toString(value)); -// } -// -// /** -// * {@inheritDoc} -// */ -// public void writeNull() throws JsonException -// { -// write("null"); -// } -// -// /** -// * {@inheritDoc} -// */ -// public void flush() throws JsonException -// { -// try -// { -// writer.flush(); -// } -// catch (IOException e) -// { -// new JsonException(e); -// } -// } -// -// /** -// * {@inheritDoc} -// */ -// public void close() throws JsonException -// { -// try -// { -// writer.close(); -// } -// catch (IOException e) -// { -// new JsonException(e); -// } -// } -// -// /** -// * Write single String. -// * -// * @param value String. -// * @throws JsonException if any errors occurs. -// */ -// private void write(String value) throws JsonException -// { -// try -// { -// if (jsonTokens.isEmpty() || (jsonTokens.peek() != JsonToken.key && jsonTokens.peek() != JsonToken.array)) -// throw new JsonException("Sysntax error. Unexpected characters '" + value + "'."); -// if (commaFirst) -// writer.write(','); -// writer.write(value); -// commaFirst = true; -// if (jsonTokens.peek() == JsonToken.key) -// jsonTokens.pop(); -// } -// catch (IOException e) -// { -// throw new JsonException(e); -// } -// } - - /** Stack for control position in document. */ private final JsonStack<JsonToken> stack; @@ -305,7 +58,6 @@ * Constructs JsonWriter. * * @param out OutputStream. - * @throws UnsupportedEncodingException */ public JsonWriterImpl(OutputStream out) { Modified: ws/trunk/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/ObjectBuilder.java =================================================================== --- ws/trunk/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/ObjectBuilder.java 2011-12-23 07:46:46 UTC (rev 5344) +++ ws/trunk/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/ObjectBuilder.java 2011-12-23 13:18:15 UTC (rev 5345) @@ -481,7 +481,6 @@ case DOUBLE : return jsonValue.getDoubleValue(); case CHAR : - // TODO check String length return jsonValue.getStringValue().charAt(0); case STRING : return jsonValue.getStringValue(); @@ -568,7 +567,6 @@ char[] params = new char[jsonValue.size()]; Iterator<JsonValue> values = jsonValue.getElements(); int i = 0; - // TODO better checking an transformation string to char while (values.hasNext()) { params[i++] = values.next().getStringValue().charAt(0); Modified: ws/trunk/exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet/AliasedURLRequestRedirector.java =================================================================== --- ws/trunk/exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet/AliasedURLRequestRedirector.java 2011-12-23 07:46:46 UTC (rev 5344) +++ ws/trunk/exo.ws.frameworks.servlet/src/main/java/org/exoplatform/ws/frameworks/servlet/AliasedURLRequestRedirector.java 2011-12-23 13:18:15 UTC (rev 5345) @@ -41,7 +41,6 @@ public class AliasedURLRequestRedirector implements Filter { - //TODO private static String START_ESCAPED = "%7B$"; private static String END_ESCAPED = "%7D"; @@ -169,7 +168,6 @@ * @param path * @return */ - //TODO private String replaceByMap(String path) { if (path == null) Modified: ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ContainerRequest.java =================================================================== --- ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ContainerRequest.java 2011-12-23 07:46:46 UTC (rev 5344) +++ ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ContainerRequest.java 2011-12-23 13:18:15 UTC (rev 5345) @@ -41,8 +41,8 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; +import javax.ws.rs.core.Response.ResponseBuilder; import javax.ws.rs.core.Variant; -import javax.ws.rs.core.Response.ResponseBuilder; /** * @author <a href="mailto:andrew00x@gmail.com">Andrey Parfonov</a> @@ -355,8 +355,9 @@ public Variant selectVariant(List<Variant> variants) { if (variants == null || variants.isEmpty()) + { throw new IllegalArgumentException("The list of variants is null or empty"); - // TODO constructs and set 'Vary' header in response + } // Response will be set in RequestDispatcher if set Response // now then it will be any way rewrite in RequestDispatcher. return VariantsHandler.handleVariants(this, variants); @@ -432,9 +433,10 @@ */ public Locale getLanguage() { - // TODO Not efficient implementation, header map can be checked few times if (contentLanguage == null && httpHeaders.getFirst(CONTENT_LANGUAGE) != null) + { contentLanguage = Language.getLocale(httpHeaders.getFirst(CONTENT_LANGUAGE)); + } return contentLanguage; } @@ -444,9 +446,10 @@ */ public MediaType getMediaType() { - // TODO Not efficient implementation, if header map can be checked few times if (contentType == null && httpHeaders.getFirst(CONTENT_TYPE) != null) + { contentType = MediaType.valueOf(httpHeaders.getFirst(CONTENT_TYPE)); + } return contentType; } @@ -488,10 +491,11 @@ EntityTag otherEtag = EntityTag.valueOf(ifMatch); - // TODO check is status 412 valid if one of tag is weak if ((etag.isWeak() || otherEtag.isWeak()) // one of tag is weak || (!"*".equals(otherEtag.getValue()) && !etag.getValue().equals(otherEtag.getValue()))) + { return Response.status(Response.Status.PRECONDITION_FAILED); + } // if tags are not matched then do as tag 'if-match' is absent return null; Modified: ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/DependencySupplier.java =================================================================== --- ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/DependencySupplier.java 2011-12-23 07:46:46 UTC (rev 5344) +++ ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/DependencySupplier.java 2011-12-23 13:18:15 UTC (rev 5345) @@ -134,8 +134,10 @@ if (parameterActualTypes[0] instanceof Class<?>) { Class<?> actualType = (Class<?>)parameterActualTypes[0]; - if (actualType == injectedType) + if (actualType == injectedType) //NOSONAR + { return provider; + } } else if (parameterActualTypes[0] instanceof ParameterizedType) { Modified: ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/FieldInjectorImpl.java =================================================================== --- ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/FieldInjectorImpl.java 2011-12-23 07:46:46 UTC (rev 5344) +++ ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/FieldInjectorImpl.java 2011-12-23 13:18:15 UTC (rev 5345) @@ -280,7 +280,6 @@ { throw new WebApplicationException(e, Response.status(Response.Status.INTERNAL_SERVER_ERROR).build()); } - // TODO Need to throw exception ????? } } } Modified: ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/InputHeadersMap.java =================================================================== --- ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/InputHeadersMap.java 2011-12-23 07:46:46 UTC (rev 5344) +++ ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/InputHeadersMap.java 2011-12-23 13:18:15 UTC (rev 5345) @@ -36,8 +36,6 @@ * @author <a href="mailto:andrew00x@gmail.com">Andrey Parfonov</a> * @version $Id: $ */ -// TODO this implementation is not efficient, probably can be better extend -// java.util.AbstractMap public final class InputHeadersMap extends HashMap<String, List<String>> implements MultivaluedMap<String, String> { Modified: ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/OutputHeadersMap.java =================================================================== --- ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/OutputHeadersMap.java 2011-12-23 07:46:46 UTC (rev 5344) +++ ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/OutputHeadersMap.java 2011-12-23 13:18:15 UTC (rev 5345) @@ -31,8 +31,6 @@ * @author <a href="mailto:andrew00x@gmail.com">Andrey Parfonov</a> * @version $Id: $ */ -//TODO this implementation is not efficient, probably can be better extend -//java.util.AbstractMap public final class OutputHeadersMap extends HashMap<String, List<Object>> implements MultivaluedMap<String, Object> { Modified: ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ResourceBinder.java =================================================================== --- ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ResourceBinder.java 2011-12-23 07:46:46 UTC (rev 5344) +++ ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ResourceBinder.java 2011-12-23 13:18:15 UTC (rev 5345) @@ -210,7 +210,6 @@ this.invokerFactory = invokerFactory; // Initialize RuntimeDelegate instance // This is first component in life cycle what needs. - // TODO better solution to initialize RuntimeDelegate SecurityHelper.doPrivilegedAction(new PrivilegedAction<Void>() { public Void run() Modified: ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/RuntimeDelegateImpl.java =================================================================== --- ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/RuntimeDelegateImpl.java 2011-12-23 07:46:46 UTC (rev 5344) +++ ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/RuntimeDelegateImpl.java 2011-12-23 13:18:15 UTC (rev 5345) @@ -45,8 +45,8 @@ import javax.ws.rs.core.EntityTag; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.NewCookie; -import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.Response.ResponseBuilder; +import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.Variant.VariantListBuilder; import javax.ws.rs.ext.RuntimeDelegate; @@ -102,7 +102,6 @@ @Override public <T> HeaderDelegate<T> createHeaderDelegate(Class<T> type) { - // TODO mechanism for use external HeaderDelegate return (HeaderDelegate<T>)headerDelegates.get(type); } Modified: ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/method/ParameterHelper.java =================================================================== --- ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/method/ParameterHelper.java 2011-12-23 07:46:46 UTC (rev 5344) +++ ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/method/ParameterHelper.java 2011-12-23 13:18:15 UTC (rev 5345) @@ -214,7 +214,6 @@ * @param annotation parameter annotation * @return true it parameter is valid, false otherwise */ - // TODO remove this method boolean isValidAnnotatedParameter(Class<?> parameterClass, Type parameterType, Annotation annotation) { if (parameterClass == List.class || parameterClass == Set.class || parameterClass == SortedSet.class) Modified: ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/JsonEntityProvider.java =================================================================== --- ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/JsonEntityProvider.java 2011-12-23 07:46:46 UTC (rev 5344) +++ ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/JsonEntityProvider.java 2011-12-23 13:18:15 UTC (rev 5345) @@ -24,9 +24,9 @@ import org.exoplatform.ws.frameworks.json.impl.JsonGeneratorImpl; import org.exoplatform.ws.frameworks.json.impl.JsonParserImpl; import org.exoplatform.ws.frameworks.json.impl.JsonUtils; +import org.exoplatform.ws.frameworks.json.impl.JsonUtils.Types; import org.exoplatform.ws.frameworks.json.impl.JsonWriterImpl; import org.exoplatform.ws.frameworks.json.impl.ObjectBuilder; -import org.exoplatform.ws.frameworks.json.impl.JsonUtils.Types; import org.exoplatform.ws.frameworks.json.value.JsonValue; import java.io.File; @@ -63,7 +63,7 @@ { // It is common task for #isReadable() and #isWriteable - // TODO Not sure it is required but ... + // Not sure it is required but ... // Investigation about checking can type be write as JSON (useful JSON). // Probably should be better added this checking in JSON framework. // Or probably enough check only content type 'application/json' Modified: ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/resource/AbstractResourceDescriptorImpl.java =================================================================== --- ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/resource/AbstractResourceDescriptorImpl.java 2011-12-23 07:46:46 UTC (rev 5344) +++ ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/resource/AbstractResourceDescriptorImpl.java 2011-12-23 13:18:15 UTC (rev 5345) @@ -528,7 +528,6 @@ o.add(new OptionsRequestResourceMethodDescriptorImpl(null, "OPTIONS", mps, this, consumes, produces, new OptionsRequestMethodInvoker())); } - // TODO need process sub-resources ? } /** Modified: ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/resource/ResourceDescriptorValidator.java =================================================================== --- ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/resource/ResourceDescriptorValidator.java 2011-12-23 07:46:46 UTC (rev 5344) +++ ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/resource/ResourceDescriptorValidator.java 2011-12-23 13:18:15 UTC (rev 5345) @@ -309,8 +309,6 @@ } } // not parameterized type - // TODO must be tolerant for not parameterized type and use string as - // default ? return false; } Modified: ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/uri/UriComponent.java =================================================================== --- ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/uri/UriComponent.java 2011-12-23 07:46:46 UTC (rev 5344) +++ ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/uri/UriComponent.java 2011-12-23 13:18:15 UTC (rev 5345) @@ -181,7 +181,6 @@ * @param component component of URI, scheme, host, port, etc * @return encoded string */ - // TODO encoding for IPv6 public static String encode(String str, int component, boolean containsUriParams) { if (str == null) @@ -197,7 +196,6 @@ * @param containsUriParams true if the source string contains URI parameters * @return the source string */ - // TODO validation for IPv6 public static String validate(String str, int component, boolean containsUriParams) { for (int i = 0; i < str.length(); i++) @@ -315,7 +313,6 @@ * addresses * @return decoded string */ - // TODO decoding for IPv6 public static String decode(String str, int component) { if (str == null) Modified: ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/uri/UriTemplateParser.java =================================================================== --- ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/uri/UriTemplateParser.java 2011-12-23 07:46:46 UTC (rev 5344) +++ ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/uri/UriTemplateParser.java 2011-12-23 13:18:15 UTC (rev 5345) @@ -243,13 +243,13 @@ else throw new IllegalArgumentException("Wrong character at part " + str); } + name = sb.toString(); - // TODO remove restriction that not allowed have few path parameters with - // the same name. This should be allowed but part of URI template also MUST - // be the same. E.g. /a/{x}/b/{x} and /a/{x:\d+}/b/{x:\d+} must be allowed, - // but /a/{x}/b/{x:\d+} is not allowed. This task is not high priority. if (names.contains(name)) + { throw new IllegalArgumentException("URI template variables name " + name + " already registered."); + } + names.add(name); return p; } Modified: ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/util/MediaTypeMap.java =================================================================== --- ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/util/MediaTypeMap.java 2011-12-23 07:46:46 UTC (rev 5344) +++ ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/util/MediaTypeMap.java 2011-12-23 13:18:15 UTC (rev 5345) @@ -70,8 +70,10 @@ // should e compared lexicographically, otherwise new entry with the // same 'weight' will be not added in map. if (r == 0) - // TODO weak solution + { r = _toString(o1).compareToIgnoreCase(_toString(o2)); + } + return r; } Modified: ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/wadl/BaseWadlGeneratorImpl.java =================================================================== --- ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/wadl/BaseWadlGeneratorImpl.java 2011-12-23 07:46:46 UTC (rev 5344) +++ ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/wadl/BaseWadlGeneratorImpl.java 2011-12-23 13:18:15 UTC (rev 5345) @@ -93,7 +93,7 @@ public org.exoplatform.services.rest.wadl.research.Method createMethod(ResourceMethodDescriptor rmd) { String httpMethod = rmd.getHttpMethod(); - // TODO Ignore HEAD methods currently. + // Ignore HEAD methods currently. // Implementation of wadl2java for generation client code does not support // HEAD method. See https://wadl.dev.java.net/ . // If WADL contains HEAD method description then client code get part of Modified: ws/trunk/exo.ws.rest.ext/src/main/java/org/exoplatform/services/rest/ext/groovy/DefaultGroovyResourceLoader.java =================================================================== --- ws/trunk/exo.ws.rest.ext/src/main/java/org/exoplatform/services/rest/ext/groovy/DefaultGroovyResourceLoader.java 2011-12-23 07:46:46 UTC (rev 5344) +++ ws/trunk/exo.ws.rest.ext/src/main/java/org/exoplatform/services/rest/ext/groovy/DefaultGroovyResourceLoader.java 2011-12-23 13:18:15 UTC (rev 5345) @@ -51,7 +51,6 @@ public final ConcurrentMap<String, Future<URL>> findResourceURLTasks = new ConcurrentHashMap<String, Future<URL>>(); - // TODO need configurable ? private int maxEntries = 512; protected final Map<String, URL> resources; Modified: ws/trunk/exo.ws.rest.ext/src/main/java/org/exoplatform/services/rest/ext/groovy/ExtendedGroovyClassLoader.java =================================================================== --- ws/trunk/exo.ws.rest.ext/src/main/java/org/exoplatform/services/rest/ext/groovy/ExtendedGroovyClassLoader.java 2011-12-23 07:46:46 UTC (rev 5344) +++ ws/trunk/exo.ws.rest.ext/src/main/java/org/exoplatform/services/rest/ext/groovy/ExtendedGroovyClassLoader.java 2011-12-23 13:18:15 UTC (rev 5345) @@ -81,13 +81,17 @@ ClassNode targetClassNode = null; SourceUnit targetSunit = null; ModuleNode module = classNode.getModule(); + if (module != null) { targetClassNode = (ClassNode)module.getClasses().get(0); targetSunit = module.getContext(); } - if (targetSunit == sunit && targetClassNode == classNode) + + if (targetSunit == sunit && targetClassNode == classNode) //NOSONAR + { target = clazz; + } } return clazz; } Modified: ws/trunk/exo.ws.rest.ext/src/main/java/org/exoplatform/services/rest/ext/groovy/GroovyJaxrsPublisher.java =================================================================== --- ws/trunk/exo.ws.rest.ext/src/main/java/org/exoplatform/services/rest/ext/groovy/GroovyJaxrsPublisher.java 2011-12-23 07:46:46 UTC (rev 5344) +++ ws/trunk/exo.ws.rest.ext/src/main/java/org/exoplatform/services/rest/ext/groovy/GroovyJaxrsPublisher.java 2011-12-23 13:18:15 UTC (rev 5345) @@ -540,8 +540,7 @@ new AbstractResourceDescriptorImpl(rc).accept(ResourceDescriptorValidator.getInstance()); } catch (RuntimeException e) - { - // TODO : Need have proper exception for invalid resources in 'exo.ws.rest.core'. + { throw new MalformedScriptException(e.getMessage()); }*/ } Modified: ws/trunk/exo.ws.testframework/src/main/java/org/exoplatform/services/test/mock/MockHttpServletResponse.java =================================================================== --- ws/trunk/exo.ws.testframework/src/main/java/org/exoplatform/services/test/mock/MockHttpServletResponse.java 2011-12-23 07:46:46 UTC (rev 5344) +++ ws/trunk/exo.ws.testframework/src/main/java/org/exoplatform/services/test/mock/MockHttpServletResponse.java 2011-12-23 13:18:15 UTC (rev 5345) @@ -237,7 +237,7 @@ */ public String encodeRedirectURL(String url) { - return url; // TODO encode + return url; } /** @@ -245,7 +245,7 @@ */ public String encodeRedirectUrl(String url) { - return url;// TODO encode + return url; } /** @@ -253,7 +253,7 @@ */ public String encodeURL(String url) { - return url;// TODO encode + return url; } /** @@ -261,7 +261,7 @@ */ public String encodeUrl(String url) { - return url;// TODO encode + return url; } /** Modified: ws/trunk/exo.ws.testframework/src/main/java/org/exoplatform/services/test/mock/MockHttpSession.java =================================================================== --- ws/trunk/exo.ws.testframework/src/main/java/org/exoplatform/services/test/mock/MockHttpSession.java 2011-12-23 07:46:46 UTC (rev 5344) +++ ws/trunk/exo.ws.testframework/src/main/java/org/exoplatform/services/test/mock/MockHttpSession.java 2011-12-23 13:18:15 UTC (rev 5345) @@ -27,7 +27,6 @@ import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSessionContext; -// TODO: Auto-generated Javadoc /** * The Class MockHttpSession. *

14 years, 4 months

1
0
0 / 0

exo-jcr SVN: r5344 - in jcr/trunk/exo.jcr.component.core/src/main: java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db and 1 other directories.

by do-not-reply＠jboss.org

Author: areshetnyak Date: 2011-12-23 02:46:46 -0500 (Fri, 23 Dec 2011) New Revision: 5344 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleaner.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OracleMultiDbJDBCConnection.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OracleSingleDbJDBCConnection.java jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2.sql jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2v8.sql jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.derby.sql jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.h2.sql jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ingres.sql jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mssql.sql jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-myisam-utf8.sql jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-myisam.sql jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-utf8.sql jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql.sql jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora-analyze.sql jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora.sql jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.pgsql.sql jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sql jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sybase.sql jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2.sql jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2v8.sql jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.derby.sql jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.h2.sql jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ingres.sql jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mssql.sql jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-myisam-utf8.sql jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-myisam.sql jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-utf8.sql jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql.sql jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora-analyze.sql jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora.sql jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.pgsql.sql jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sybase.sql Log: EXOJCR-1656 : The index by N_ORDER_NUM was added. Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java 2011-12-23 07:26:01 UTC (rev 5343) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java 2011-12-23 07:46:46 UTC (rev 5344) @@ -278,6 +278,7 @@ dropScript.add("DROP INDEX JCR_IDX_" + multiDb + "ITEM_PARENT"); dropScript.add("DROP INDEX JCR_IDX_" + multiDb + "ITEM_PARENT_NAME"); dropScript.add("DROP INDEX JCR_IDX_" + multiDb + "ITEM_PARENT_ID"); + dropScript.add("DROP INDEX JCR_IDX_" + multiDb + "ITEM_N_ORDER_NUM"); dropScript.add("DROP INDEX JCR_IDX_" + multiDb + "VALUE_PROPERTY"); dropScript.add("DROP INDEX JCR_IDX_" + multiDb + "REF_PROPERTY"); } @@ -289,6 +290,7 @@ dropScript.add("DROP INDEX JCR_" + multiDb + "ITEM.JCR_IDX_" + multiDb + "ITEM_PARENT"); dropScript.add("DROP INDEX JCR_" + multiDb + "ITEM.JCR_IDX_" + multiDb + "ITEM_PARENT_NAME"); dropScript.add("DROP INDEX JCR_" + multiDb + "ITEM.JCR_IDX_" + multiDb + "ITEM_PARENT_ID"); + dropScript.add("DROP INDEX JCR_" + multiDb + "ITEM.JCR_IDX_" + multiDb + "ITEM_N_ORDER_NUM"); dropScript.add("DROP INDEX JCR_" + multiDb + "VALUE.JCR_IDX_" + multiDb + "VALUE_PROPERTY"); dropScript.add("DROP INDEX JCR_" + multiDb + "REF.JCR_IDX_" + multiDb + "REF_PROPERTY"); } @@ -336,6 +338,8 @@ addScript.add(DBInitializerHelper.getObjectScript("CREATE UNIQUE INDEX JCR_IDX_" + multiDb + "ITEM_PARENT_ID ON JCR_" + multiDb + "ITEM", isMultiDB, dialect)); addScript.add(DBInitializerHelper.getObjectScript("CREATE UNIQUE INDEX JCR_IDX_" + multiDb + + "ITEM_N_ORDER_NUM ON JCR_" + multiDb + "ITEM", isMultiDB, dialect)); + addScript.add(DBInitializerHelper.getObjectScript("CREATE UNIQUE INDEX JCR_IDX_" + multiDb + "VALUE_PROPERTY ON JCR_" + multiDb + "VALUE", isMultiDB, dialect)); addScript.add(DBInitializerHelper.getObjectScript("CREATE UNIQUE INDEX JCR_IDX_" + multiDb + "REF_PROPERTY ON JCR_" + multiDb + "REF", isMultiDB, dialect)); @@ -382,6 +386,8 @@ + "ITEM", isMultiDB, dialect)); addScript.add(DBInitializerHelper.getObjectScript("JCR_IDX_" + multiDb + "ITEM_PARENT_ID ON JCR_" + multiDb + "ITEM", isMultiDB, dialect)); + addScript.add(DBInitializerHelper.getObjectScript("JCR_IDX_" + multiDb + "ITEM_N_ORDER_NUM ON JCR_" + multiDb + + "ITEM", isMultiDB, dialect)); addScript.add(DBInitializerHelper.getObjectScript("JCR_IDX_" + multiDb + "VALUE_PROPERTY ON JCR_" + multiDb + "VALUE", isMultiDB, dialect)); addScript.add(DBInitializerHelper.getObjectScript("JCR_IDX_" + multiDb + "REF_PROPERTY ON JCR_" + multiDb @@ -521,6 +527,8 @@ + "ITEM_PARENT_NAME" + OLD_OBJECT_SUFFIX); renameScripts.add("ALTER INDEX JCR_IDX_" + isMultiDB + "ITEM_PARENT_ID RENAME TO JCR_IDX_" + isMultiDB + "ITEM_PARENT_ID" + OLD_OBJECT_SUFFIX); + renameScripts.add("ALTER INDEX JCR_IDX_" + isMultiDB + "ITEM_N_ORDER_NUM RENAME TO JCR_IDX_" + isMultiDB + + "ITEM_N_ORDER_NUM" + OLD_OBJECT_SUFFIX); // JCR_[S,M]REF renameScripts.add("ALTER TABLE JCR_" + isMultiDB + "REF RENAME TO JCR_" + isMultiDB + "REF" @@ -587,6 +595,9 @@ renameScripts.add("ALTER INDEX JCR_IDX_" + isMultiDB + "ITEM_PARENT_ID RENAME TO JCR_IDX_" + isMultiDB + "ITEM_PARENT_ID" + OLD_OBJECT_SUFFIX); + renameScripts.add("ALTER INDEX JCR_IDX_" + isMultiDB + "ITEM_N_ORDER_NUM RENAME TO JCR_IDX_" + isMultiDB + + "ITEM_N_ORDER_NUM" + OLD_OBJECT_SUFFIX); + renameScripts.add("ALTER INDEX JCR_IDX_" + isMultiDB + "VALUE_PROPERTY RENAME TO JCR_IDX_" + isMultiDB + "VALUE_PROPERTY" + OLD_OBJECT_SUFFIX); @@ -654,6 +665,8 @@ + " RENAME TO JCR_IDX_" + isMultiDB + "ITEM_PARENT_NAME"); rollbackScripts.add("ALTER INDEX JCR_IDX_" + isMultiDB + "ITEM_PARENT_ID" + OLD_OBJECT_SUFFIX + " RENAME TO JCR_IDX_" + isMultiDB + "ITEM_PARENT_ID"); + rollbackScripts.add("ALTER INDEX JCR_IDX_" + isMultiDB + "ITEM_N_ORDER_NUM" + OLD_OBJECT_SUFFIX + + " RENAME TO JCR_IDX_" + isMultiDB + "ITEM_N_ORDER_NUM"); // JCR_[S,M]REF rollbackScripts.add("ALTER TABLE JCR_" + isMultiDB + "REF" + OLD_OBJECT_SUFFIX + " RENAME TO JCR_" + isMultiDB @@ -724,6 +737,9 @@ rollbackScripts.add("ALTER INDEX JCR_IDX_" + isMultiDB + "ITEM_PARENT_ID" + OLD_OBJECT_SUFFIX + " RENAME TO JCR_IDX_" + isMultiDB + "ITEM_PARENT_ID"); + rollbackScripts.add("ALTER INDEX JCR_IDX_" + isMultiDB + "ITEM_N_ORDER_NUM" + OLD_OBJECT_SUFFIX + + " RENAME TO JCR_IDX_" + isMultiDB + "ITEM_N_ORDER_NUM"); + rollbackScripts.add("ALTER INDEX JCR_IDX_" + isMultiDB + "VALUE_PROPERTY" + OLD_OBJECT_SUFFIX + " RENAME TO JCR_IDX_" + isMultiDB + "VALUE_PROPERTY"); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleaner.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleaner.java 2011-12-23 07:26:01 UTC (rev 5343) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleaner.java 2011-12-23 07:46:46 UTC (rev 5344) @@ -196,7 +196,15 @@ LOG.debug("Execute script: \n[" + sql + "]"); } - executeQuery(st, sql); + if ((sql.startsWith("ALTER INDEX") || sql.startsWith("DROP INDEX")) + && (sql.contains("JCR_IDX_SITEM_N_ORDER_NUM") || sql.contains("JCR_IDX_MITEM_N_ORDER_NUM"))) + { + executeQueryAndCatchException(st, sql); + } + else + { + executeQuery(st, sql); + } } } } @@ -219,9 +227,6 @@ } } - /** - * Execute query. - */ protected void executeQuery(final Statement statement, final String sql) throws SQLException { SecurityHelper.doPrivilegedSQLExceptionAction(new PrivilegedExceptionAction<Object>() @@ -233,4 +238,19 @@ } }); } + + protected void executeQueryAndCatchException(final Statement statement, final String sql) + { + try + { + executeQuery(statement, sql); + } + catch (SQLException e) + { + if (LOG.isDebugEnabled()) + { + LOG.debug("Can not execute query : '" + sql + "'.", e); + } + } + } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OracleMultiDbJDBCConnection.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OracleMultiDbJDBCConnection.java 2011-12-23 07:26:01 UTC (rev 5343) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OracleMultiDbJDBCConnection.java 2011-12-23 07:46:46 UTC (rev 5344) @@ -98,7 +98,11 @@ + " where I.I_CLASS=1 order by I.ID) A where ROWNUM <= ?) where r__ > ?) J on P.PARENT_ID = J.ID" + " where P.I_CLASS=2 and V.PROPERTY_ID=P.ID order by J.ID"; - FIND_NODES_BY_PARENTID_LAZILY_CQ = FIND_NODES_BY_PARENTID_LAZILY_CQ.replaceFirst("select", "select /*+ INDEX(I JCR_FK_SITEM_PARENT) INDEX(V JCR_IDX_SVALUE_PROPERTY)*/"); + FIND_NODES_BY_PARENTID_LAZILY_CQ = + FIND_NODES_BY_PARENTID_LAZILY_CQ + .replaceFirst( + "select", + "select /*+ USE_NL(V) INDEX(I JCR_IDX_MITEM_N_ORDER_NUM) INDEX(P JCR_IDX_MITEM_PARENT_FK) INDEX(V JCR_IDX_MVALUE_PROPERTY) */"); } /** Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OracleSingleDbJDBCConnection.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OracleSingleDbJDBCConnection.java 2011-12-23 07:26:01 UTC (rev 5343) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/OracleSingleDbJDBCConnection.java 2011-12-23 07:46:46 UTC (rev 5344) @@ -99,7 +99,11 @@ + " ) A where ROWNUM <= ?) where r__ > ?) J on P.PARENT_ID = J.ID" + " where P.I_CLASS=2 and P.CONTAINER_NAME=? and V.PROPERTY_ID=P.ID order by J.ID"; - FIND_NODES_BY_PARENTID_LAZILY_CQ = FIND_NODES_BY_PARENTID_LAZILY_CQ.replaceFirst("select", "select /*+ INDEX(I JCR_FK_SITEM_PARENT) INDEX(V JCR_IDX_SVALUE_PROPERTY)*/"); + FIND_NODES_BY_PARENTID_LAZILY_CQ = + FIND_NODES_BY_PARENTID_LAZILY_CQ + .replaceFirst( + "select", + "select /*+ USE_NL(V) INDEX(I JCR_IDX_SITEM_N_ORDER_NUM) INDEX(P JCR_IDX_SITEM_PARENT_FK) INDEX(V JCR_IDX_SVALUE_PROPERTY) */ "); } /** Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2.sql =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2.sql 2011-12-23 07:26:01 UTC (rev 5343) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2.sql 2011-12-23 07:46:46 UTC (rev 5344) @@ -18,6 +18,7 @@ CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT ON JCR_MITEM(PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_NAME ON JCR_MITEM(I_CLASS, PARENT_ID, NAME, I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC); +CREATE INDEX JCR_IDX_MITEM_N_ORDER_NUM ON JCR_MITEM(I_CLASS, PARENT_ID, N_ORDER_NUM); CREATE TABLE JCR_MVALUE( ID BIGINT generated by default as identity (START WITH 2, INCREMENT BY 1) NOT NULL, DATA BLOB(2G) NOT LOGGED COMPACT, Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2v8.sql =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2v8.sql 2011-12-23 07:26:01 UTC (rev 5343) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2v8.sql 2011-12-23 07:46:46 UTC (rev 5344) @@ -18,6 +18,7 @@ CREATE UNIQUE INDEX JCR_IDX_MITEM_P ON JCR_MITEM(PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_MITEM_P ON JCR_MITEM(I_CLASS, PARENT_ID, NAME, I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_MITEM_PID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC); +CREATE INDEX JCR_IDX_MITEM_N_ORDER_NUM ON JCR_MITEM(I_CLASS, PARENT_ID, N_ORDER_NUM); CREATE TABLE JCR_MVALUE( ID BIGINT generated by default as identity (START WITH 2, INCREMENT BY 1) NOT NULL, DATA BLOB(2G) NOT LOGGED COMPACT, Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.derby.sql =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.derby.sql 2011-12-23 07:26:01 UTC (rev 5343) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.derby.sql 2011-12-23 07:46:46 UTC (rev 5344) @@ -18,6 +18,7 @@ CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT ON JCR_MITEM(PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_NAME ON JCR_MITEM(I_CLASS, PARENT_ID, NAME, I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC); +CREATE INDEX JCR_IDX_MITEM_N_ORDER_NUM ON JCR_MITEM(I_CLASS, PARENT_ID, N_ORDER_NUM); CREATE TABLE JCR_MVALUE( ID BIGINT generated by default as identity (START WITH 2, INCREMENT BY 1) NOT NULL, DATA BLOB(56M), Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.h2.sql =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.h2.sql 2011-12-23 07:26:01 UTC (rev 5343) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.h2.sql 2011-12-23 07:46:46 UTC (rev 5344) @@ -18,6 +18,7 @@ CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT ON JCR_MITEM(PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_NAME ON JCR_MITEM(I_CLASS, PARENT_ID, NAME, I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC); +CREATE INDEX JCR_IDX_MITEM_N_ORDER_NUM ON JCR_MITEM(I_CLASS, PARENT_ID, N_ORDER_NUM); CREATE TABLE JCR_MVALUE( DATA VARBINARY(65535), ORDER_NUM INTEGER NOT NULL, Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ingres.sql =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ingres.sql 2011-12-23 07:26:01 UTC (rev 5343) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ingres.sql 2011-12-23 07:46:46 UTC (rev 5344) @@ -18,6 +18,7 @@ CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT ON JCR_MITEM(PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_NAME ON JCR_MITEM(I_CLASS, PARENT_ID, NAME, I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC); +CREATE INDEX JCR_IDX_MITEM_N_ORDER_NUM ON JCR_MITEM(I_CLASS, PARENT_ID, N_ORDER_NUM); CREATE SEQUENCE JCR_MVALUE_SEQ; CREATE TABLE JCR_MVALUE( ID BIGINT NOT NULL WITH DEFAULT NEXT VALUE FOR JCR_MVALUE_SEQ, Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mssql.sql =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mssql.sql 2011-12-23 07:26:01 UTC (rev 5343) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mssql.sql 2011-12-23 07:46:46 UTC (rev 5344) @@ -18,6 +18,7 @@ CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT ON JCR_MITEM(PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_NAME ON JCR_MITEM(I_CLASS, PARENT_ID, NAME, I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC); +CREATE INDEX JCR_IDX_MITEM_N_ORDER_NUM ON JCR_MITEM(I_CLASS, PARENT_ID, N_ORDER_NUM); CREATE TABLE JCR_MVALUE( ID BIGINT IDENTITY(1,1) NOT NULL, DATA VARBINARY(MAX), Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-myisam-utf8.sql =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-myisam-utf8.sql 2011-12-23 07:26:01 UTC (rev 5343) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-myisam-utf8.sql 2011-12-23 07:46:46 UTC (rev 5344) @@ -19,6 +19,7 @@ CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_NAME ON JCR_MITEM(I_CLASS, PARENT_ID, NAME(255), I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC); CREATE INDEX JCR_IDX_MITEM_PARENT_N_ORDER_NUM ON JCR_MITEM(I_CLASS, PARENT_ID, N_ORDER_NUM, ID); +CREATE INDEX JCR_IDX_MITEM_N_ORDER_NUM ON JCR_MITEM(I_CLASS, PARENT_ID, N_ORDER_NUM); CREATE TABLE JCR_MVALUE( ID SERIAL NOT NULL, DATA LONGBLOB, Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-myisam.sql =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-myisam.sql 2011-12-23 07:26:01 UTC (rev 5343) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-myisam.sql 2011-12-23 07:46:46 UTC (rev 5344) @@ -19,6 +19,7 @@ CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_NAME ON JCR_MITEM(I_CLASS, PARENT_ID, NAME, I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC); CREATE INDEX JCR_IDX_MITEM_PARENT_N_ORDER_NUM ON JCR_MITEM(I_CLASS, PARENT_ID, N_ORDER_NUM, ID); +CREATE INDEX JCR_IDX_MITEM_N_ORDER_NUM ON JCR_MITEM(I_CLASS, PARENT_ID, N_ORDER_NUM); CREATE TABLE JCR_MVALUE( ID SERIAL NOT NULL, DATA LONGBLOB, Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-utf8.sql =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-utf8.sql 2011-12-23 07:26:01 UTC (rev 5343) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-utf8.sql 2011-12-23 07:46:46 UTC (rev 5344) @@ -19,6 +19,7 @@ CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_NAME ON JCR_MITEM(I_CLASS, PARENT_ID, NAME(255), I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC); CREATE INDEX JCR_IDX_MITEM_PARENT_N_ORDER_NUM ON JCR_MITEM(I_CLASS, PARENT_ID, N_ORDER_NUM, ID); +CREATE INDEX JCR_IDX_MITEM_N_ORDER_NUM ON JCR_MITEM(I_CLASS, PARENT_ID, N_ORDER_NUM); CREATE TABLE JCR_MVALUE( ID SERIAL NOT NULL, DATA LONGBLOB, Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql.sql =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql.sql 2011-12-23 07:26:01 UTC (rev 5343) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql.sql 2011-12-23 07:46:46 UTC (rev 5344) @@ -19,6 +19,7 @@ CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_NAME ON JCR_MITEM(I_CLASS, PARENT_ID, NAME, I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC); CREATE INDEX JCR_IDX_MITEM_PARENT_N_ORDER_NUM ON JCR_MITEM(I_CLASS, PARENT_ID, N_ORDER_NUM, ID); +CREATE INDEX JCR_IDX_MITEM_N_ORDER_NUM ON JCR_MITEM(I_CLASS, PARENT_ID, N_ORDER_NUM); CREATE TABLE JCR_MVALUE( ID SERIAL NOT NULL, DATA LONGBLOB, Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora-analyze.sql =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora-analyze.sql 2011-12-23 07:26:01 UTC (rev 5343) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora-analyze.sql 2011-12-23 07:46:46 UTC (rev 5344) @@ -26,6 +26,8 @@ / CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC) / +CREATE INDEX JCR_IDX_MITEM_N_ORDER_NUM ON JCR_MITEM(I_CLASS, PARENT_ID, N_ORDER_NUM) +/ CREATE TABLE JCR_MVALUE( ID INTEGER NOT NULL, DATA BLOB, Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora.sql =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora.sql 2011-12-23 07:26:01 UTC (rev 5343) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora.sql 2011-12-23 07:46:46 UTC (rev 5344) @@ -26,6 +26,8 @@ / CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC) / +CREATE INDEX JCR_IDX_MITEM_N_ORDER_NUM ON JCR_MITEM(I_CLASS, PARENT_ID, N_ORDER_NUM) +/ CREATE TABLE JCR_MVALUE( ID INTEGER NOT NULL, DATA BLOB, Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.pgsql.sql =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.pgsql.sql 2011-12-23 07:26:01 UTC (rev 5343) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.pgsql.sql 2011-12-23 07:46:46 UTC (rev 5344) @@ -18,6 +18,7 @@ CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT ON JCR_MITEM(PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION); CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_NAME ON JCR_MITEM(I_CLASS, PARENT_ID, NAME, I_INDEX, VERSION); CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION); +CREATE INDEX JCR_IDX_MITEM_N_ORDER_NUM ON JCR_MITEM(I_CLASS, PARENT_ID, N_ORDER_NUM); CREATE TABLE JCR_MVALUE( ID BIGSERIAL NOT NULL, DATA BYTEA, Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sql =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sql 2011-12-23 07:26:01 UTC (rev 5343) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sql 2011-12-23 07:46:46 UTC (rev 5344) @@ -18,6 +18,7 @@ CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT ON JCR_MITEM(PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_NAME ON JCR_MITEM(I_CLASS, PARENT_ID, NAME, I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC); +CREATE INDEX JCR_IDX_MITEM_N_ORDER_NUM ON JCR_MITEM(I_CLASS, PARENT_ID, N_ORDER_NUM); CREATE TABLE JCR_MVALUE( ID BIGINT generated by default as identity (START WITH 2) NOT NULL, DATA VARBINARY(16777216), Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sybase.sql =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sybase.sql 2011-12-23 07:26:01 UTC (rev 5343) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sybase.sql 2011-12-23 07:46:46 UTC (rev 5344) @@ -18,6 +18,7 @@ CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT ON JCR_MITEM(PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_NAME ON JCR_MITEM(I_CLASS, PARENT_ID, NAME, I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC); +CREATE INDEX JCR_IDX_MITEM_N_ORDER_NUM ON JCR_MITEM(I_CLASS, PARENT_ID, N_ORDER_NUM); CREATE TABLE JCR_MVALUE( ID BIGINT IDENTITY NOT NULL, DATA IMAGE NULL, Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2.sql =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2.sql 2011-12-23 07:26:01 UTC (rev 5343) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2.sql 2011-12-23 07:46:46 UTC (rev 5344) @@ -20,6 +20,7 @@ CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC); CREATE INDEX JCR_IDX_SITEM_PARENT_FK ON JCR_SITEM(PARENT_ID); +CREATE INDEX JCR_IDX_SITEM_N_ORDER_NUM ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, N_ORDER_NUM); CREATE TABLE JCR_SVALUE( ID BIGINT generated by default as identity (START WITH 2, INCREMENT BY 1) NOT NULL, DATA BLOB(2G) NOT LOGGED COMPACT, Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2v8.sql =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2v8.sql 2011-12-23 07:26:01 UTC (rev 5343) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2v8.sql 2011-12-23 07:46:46 UTC (rev 5344) @@ -20,6 +20,7 @@ CREATE UNIQUE INDEX JCR_IDX_SITEM_PN ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_SITEM_PID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC); CREATE INDEX JCR_IDX_SITEM_PFK ON JCR_SITEM(PARENT_ID); +CREATE INDEX JCR_IDX_SITEM_N_ORDER_NUM ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, N_ORDER_NUM); CREATE TABLE JCR_SVALUE( ID BIGINT generated by default as identity (START WITH 2, INCREMENT BY 1) NOT NULL, DATA BLOB(2G) NOT LOGGED COMPACT, Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.derby.sql =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.derby.sql 2011-12-23 07:26:01 UTC (rev 5343) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.derby.sql 2011-12-23 07:46:46 UTC (rev 5344) @@ -19,6 +19,7 @@ CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC); +CREATE INDEX JCR_IDX_SITEM_N_ORDER_NUM ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, N_ORDER_NUM); CREATE TABLE JCR_SVALUE( ID BIGINT generated by default as identity (START WITH 2, INCREMENT BY 1) NOT NULL, DATA BLOB(56M), Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.h2.sql =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.h2.sql 2011-12-23 07:26:01 UTC (rev 5343) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.h2.sql 2011-12-23 07:46:46 UTC (rev 5344) @@ -19,6 +19,7 @@ CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC); +CREATE INDEX JCR_IDX_SITEM_N_ORDER_NUM ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, N_ORDER_NUM); CREATE TABLE JCR_SVALUE( DATA VARBINARY(65535), ORDER_NUM INTEGER NOT NULL, Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ingres.sql =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ingres.sql 2011-12-23 07:26:01 UTC (rev 5343) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ingres.sql 2011-12-23 07:46:46 UTC (rev 5344) @@ -20,6 +20,7 @@ CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION); CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION); CREATE INDEX JCR_IDX_SITEM_PARENT_FK ON JCR_SITEM(PARENT_ID); +CREATE INDEX JCR_IDX_SITEM_N_ORDER_NUM ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, N_ORDER_NUM); CREATE SEQUENCE JCR_SVALUE_SEQ; CREATE TABLE JCR_SVALUE( ID BIGINT NOT NULL WITH DEFAULT NEXT VALUE FOR JCR_SVALUE_SEQ, Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mssql.sql =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mssql.sql 2011-12-23 07:26:01 UTC (rev 5343) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mssql.sql 2011-12-23 07:46:46 UTC (rev 5344) @@ -19,6 +19,7 @@ CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC); +CREATE INDEX JCR_IDX_SITEM_N_ORDER_NUM ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, N_ORDER_NUM); CREATE TABLE JCR_SVALUE( ID BIGINT IDENTITY(1,1) NOT NULL, DATA VARBINARY(MAX), Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-myisam-utf8.sql =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-myisam-utf8.sql 2011-12-23 07:26:01 UTC (rev 5343) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-myisam-utf8.sql 2011-12-23 07:46:46 UTC (rev 5344) @@ -20,6 +20,7 @@ CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME(255), I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC); CREATE INDEX JCR_IDX_SITEM_PARENT_N_ORDER_NUM ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, N_ORDER_NUM, ID); +CREATE INDEX JCR_IDX_SITEM_N_ORDER_NUM ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, N_ORDER_NUM); CREATE TABLE JCR_SVALUE( ID SERIAL NOT NULL, DATA LONGBLOB, Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-myisam.sql =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-myisam.sql 2011-12-23 07:26:01 UTC (rev 5343) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-myisam.sql 2011-12-23 07:46:46 UTC (rev 5344) @@ -20,6 +20,7 @@ CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC); CREATE INDEX JCR_IDX_SITEM_PARENT_N_ORDER_NUM ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, N_ORDER_NUM, ID); +CREATE INDEX JCR_IDX_SITEM_N_ORDER_NUM ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, N_ORDER_NUM); CREATE TABLE JCR_SVALUE( ID SERIAL NOT NULL, DATA LONGBLOB, Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-utf8.sql =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-utf8.sql 2011-12-23 07:26:01 UTC (rev 5343) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-utf8.sql 2011-12-23 07:46:46 UTC (rev 5344) @@ -20,6 +20,7 @@ CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME(255), I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC); CREATE INDEX JCR_IDX_SITEM_PARENT_N_ORDER_NUM ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, N_ORDER_NUM, ID); +CREATE INDEX JCR_IDX_SITEM_N_ORDER_NUM ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, N_ORDER_NUM); CREATE TABLE JCR_SVALUE( ID SERIAL NOT NULL, DATA LONGBLOB, Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql.sql =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql.sql 2011-12-23 07:26:01 UTC (rev 5343) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql.sql 2011-12-23 07:46:46 UTC (rev 5344) @@ -20,6 +20,7 @@ CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC); CREATE INDEX JCR_IDX_SITEM_PARENT_N_ORDER_NUM ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, N_ORDER_NUM, ID); +CREATE INDEX JCR_IDX_SITEM_N_ORDER_NUM ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, N_ORDER_NUM); CREATE TABLE JCR_SVALUE( ID SERIAL NOT NULL, DATA LONGBLOB, Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora-analyze.sql =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora-analyze.sql 2011-12-23 07:26:01 UTC (rev 5343) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora-analyze.sql 2011-12-23 07:46:46 UTC (rev 5344) @@ -27,6 +27,8 @@ / CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC) / +CREATE INDEX JCR_IDX_SITEM_N_ORDER_NUM ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, N_ORDER_NUM) +/ CREATE TABLE JCR_SVALUE( ID INTEGER NOT NULL, DATA BLOB, Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora.sql =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora.sql 2011-12-23 07:26:01 UTC (rev 5343) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora.sql 2011-12-23 07:46:46 UTC (rev 5344) @@ -27,6 +27,8 @@ / CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC) / +CREATE INDEX JCR_IDX_SITEM_N_ORDER_NUM ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, N_ORDER_NUM) +/ CREATE TABLE JCR_SVALUE( ID INTEGER NOT NULL, DATA BLOB, Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.pgsql.sql =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.pgsql.sql 2011-12-23 07:26:01 UTC (rev 5343) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.pgsql.sql 2011-12-23 07:46:46 UTC (rev 5344) @@ -20,6 +20,7 @@ CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION); CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION); CREATE INDEX JCR_IDX_SITEM_PARENT_FK ON JCR_SITEM(PARENT_ID); +CREATE INDEX JCR_IDX_SITEM_N_ORDER_NUM ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, N_ORDER_NUM); CREATE TABLE JCR_SVALUE( ID BIGSERIAL NOT NULL, DATA BYTEA, Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql 2011-12-23 07:26:01 UTC (rev 5343) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql 2011-12-23 07:46:46 UTC (rev 5344) @@ -19,6 +19,7 @@ CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC); +CREATE INDEX JCR_IDX_SITEM_N_ORDER_NUM ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, N_ORDER_NUM); CREATE TABLE JCR_SVALUE( ID BIGINT generated by default as identity (START WITH 2) NOT NULL, DATA VARBINARY(16777216), Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sybase.sql =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sybase.sql 2011-12-23 07:26:01 UTC (rev 5343) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sybase.sql 2011-12-23 07:46:46 UTC (rev 5344) @@ -19,6 +19,7 @@ CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC); +CREATE INDEX JCR_IDX_SITEM_N_ORDER_NUM ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, N_ORDER_NUM); CREATE TABLE JCR_SVALUE( ID BIGINT IDENTITY NOT NULL, DATA IMAGE NULL,

14 years, 4 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

exo-jcr-commits December 2011