You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2012/05/31 11:16:30 UTC
svn commit: r1344611 - in /camel/branches/camel-2.9.x: ./
camel-core/src/main/java/org/apache/camel/util/
camel-core/src/test/resources/org/apache/camel/component/validator/dotslash/
camel-core/src/test/resources/org/apache/camel/component/validator/do...
Author: ningjiang
Date: Thu May 31 09:16:29 2012
New Revision: 1344611
URL: http://svn.apache.org/viewvc?rev=1344611&view=rev
Log:
Merged revisions 1344595,1344597 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1344595 | ningjiang | 2012-05-31 16:41:20 +0800 (Thu, 31 May 2012) | 1 line
CAMEL-5321 Fix the CS error of ObjectHelper
........
r1344597 | ningjiang | 2012-05-31 16:43:57 +0800 (Thu, 31 May 2012) | 1 line
CAMEL-5321 moved the tests to camel-itest
........
Added:
camel/branches/camel-2.9.x/tests/camel-itest/src/test/java/org/apache/camel/itest/validator/
- copied from r1344597, camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/validator/
camel/branches/camel-2.9.x/tests/camel-itest/src/test/java/org/apache/camel/itest/validator/ValidatorSchemaImportTest.java
- copied unchanged from r1344597, camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/validator/ValidatorSchemaImportTest.java
camel/branches/camel-2.9.x/tests/camel-itest/src/test/lib/
- copied from r1344597, camel/trunk/tests/camel-itest/src/test/lib/
camel/branches/camel-2.9.x/tests/camel-itest/src/test/lib/camel-validator-test-resources.jar
- copied unchanged from r1344597, camel/trunk/tests/camel-itest/src/test/lib/camel-validator-test-resources.jar
Removed:
camel/branches/camel-2.9.x/camel-core/src/test/resources/org/apache/camel/component/validator/dotslash/child.xsd
camel/branches/camel-2.9.x/camel-core/src/test/resources/org/apache/camel/component/validator/dotslash/parent.xsd
camel/branches/camel-2.9.x/camel-core/src/test/resources/org/apache/camel/component/validator/doubleslash/child.xsd
camel/branches/camel-2.9.x/camel-core/src/test/resources/org/apache/camel/component/validator/doubleslash/parent.xsd
camel/branches/camel-2.9.x/camel-core/src/test/resources/org/apache/camel/component/validator/relativeparent/child/child.xsd
camel/branches/camel-2.9.x/camel-core/src/test/resources/org/apache/camel/component/validator/relativeparent/parent.xsd
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
camel/branches/camel-2.9.x/tests/camel-itest/pom.xml
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1344595,1344597
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java?rev=1344611&r1=1344610&r2=1344611&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java (original)
+++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java Thu May 31 09:16:29 2012
@@ -906,13 +906,13 @@ public final class ObjectHelper {
*/
private static String resolveUriPath(String name) {
String answer = name;
- if(answer.indexOf("//") > -1) {
+ if (answer.indexOf("//") > -1) {
answer = answer.replaceAll("//", "/");
}
- if(answer.indexOf("../") > -1) {
+ if (answer.indexOf("../") > -1) {
answer = answer.replaceAll("[A-Za-z0-9]*/\\.\\./", "");
}
- if(answer.indexOf("./") > -1) {
+ if (answer.indexOf("./") > -1) {
answer = answer.replaceAll("\\./", "");
}
return answer;
Modified: camel/branches/camel-2.9.x/tests/camel-itest/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tests/camel-itest/pom.xml?rev=1344611&r1=1344610&r2=1344611&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/tests/camel-itest/pom.xml (original)
+++ camel/branches/camel-2.9.x/tests/camel-itest/pom.xml Thu May 31 09:16:29 2012
@@ -289,6 +289,15 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
+
+ <!-- for validator tests -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-validator-test-resources</artifactId>
+ <version>${project.version}</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/src/test/lib/camel-validator-test-resources.jar</systemPath>
+ </dependency>
<!-- atomikos XA TX manager -->
<dependency>