You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/10/16 14:51:26 UTC
camel git commit: CAMEL-9229: Wrong folder name for jacksonxml test
resources
Repository: camel
Updated Branches:
refs/heads/master 30b38266e -> 51f6253de
CAMEL-9229: Wrong folder name for jacksonxml test resources
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/51f6253d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/51f6253d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/51f6253d
Branch: refs/heads/master
Commit: 51f6253de652d0561006d9ce621afe20c8af3d3a
Parents: 30b3826
Author: Antoine Toulme <an...@lunar-ocean.com>
Authored: Fri Oct 16 00:57:53 2015 -0700
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Oct 16 14:53:48 2015 +0200
----------------------------------------------------------------------
.../SpringJacksonEnableFeatureTest.java | 2 +-
.../SpringJacksonJsonDataFormatTest.java | 2 +-
.../SpringJacksonMarshalUnmarshalListTest.java | 2 +-
.../jackson/SpringJacksonEnableFeatureTest.xml | 39 ----------
.../jackson/SpringJacksonJsonDataFormatTest.xml | 80 --------------------
.../SpringJacksonMarshalUnmarshalListTest.xml | 43 -----------
.../SpringJacksonEnableFeatureTest.xml | 39 ++++++++++
.../SpringJacksonJsonDataFormatTest.xml | 80 ++++++++++++++++++++
.../SpringJacksonMarshalUnmarshalListTest.xml | 43 +++++++++++
9 files changed, 165 insertions(+), 165 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/51f6253d/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonEnableFeatureTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonEnableFeatureTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonEnableFeatureTest.java
index c61ce7f..24584e4 100644
--- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonEnableFeatureTest.java
+++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonEnableFeatureTest.java
@@ -38,7 +38,7 @@ public class SpringJacksonEnableFeatureTest extends CamelSpringTestSupport {
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/component/jackson/SpringJacksonEnableFeatureTest.xml");
+ return new ClassPathXmlApplicationContext("org/apache/camel/component/jacksonxml/SpringJacksonEnableFeatureTest.xml");
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/51f6253d/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonJsonDataFormatTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonJsonDataFormatTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonJsonDataFormatTest.java
index 5b4bb8a..f11c5ea 100644
--- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonJsonDataFormatTest.java
+++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonJsonDataFormatTest.java
@@ -108,7 +108,7 @@ public class SpringJacksonJsonDataFormatTest extends CamelSpringTestSupport {
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/component/jackson/SpringJacksonJsonDataFormatTest.xml");
+ return new ClassPathXmlApplicationContext("org/apache/camel/component/jacksonxml/SpringJacksonJsonDataFormatTest.xml");
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/51f6253d/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonMarshalUnmarshalListTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonMarshalUnmarshalListTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonMarshalUnmarshalListTest.java
index e620dca..6a0a1ab 100644
--- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonMarshalUnmarshalListTest.java
+++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonMarshalUnmarshalListTest.java
@@ -71,7 +71,7 @@ public class SpringJacksonMarshalUnmarshalListTest extends CamelSpringTestSuppor
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/component/jackson/SpringJacksonMarshalUnmarshalListTest.xml");
+ return new ClassPathXmlApplicationContext("org/apache/camel/component/jacksonxml/SpringJacksonMarshalUnmarshalListTest.xml");
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/51f6253d/components/camel-jacksonxml/src/test/resources/org/apache/camel/component/jackson/SpringJacksonEnableFeatureTest.xml
----------------------------------------------------------------------
diff --git a/components/camel-jacksonxml/src/test/resources/org/apache/camel/component/jackson/SpringJacksonEnableFeatureTest.xml b/components/camel-jacksonxml/src/test/resources/org/apache/camel/component/jackson/SpringJacksonEnableFeatureTest.xml
deleted file mode 100644
index ff8cab8..0000000
--- a/components/camel-jacksonxml/src/test/resources/org/apache/camel/component/jackson/SpringJacksonEnableFeatureTest.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
- ">
-
- <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
-
- <dataFormats>
- <jacksonxml id="jack" unmarshalTypeName="org.apache.camel.component.jacksonxml.TestPojo"
- enableFeatures="WRAP_ROOT_VALUE"/>
- </dataFormats>
-
- <route>
- <from uri="direct:in"/>
- <marshal ref="jack"/>
- </route>
-
- </camelContext>
-
-</beans>
http://git-wip-us.apache.org/repos/asf/camel/blob/51f6253d/components/camel-jacksonxml/src/test/resources/org/apache/camel/component/jackson/SpringJacksonJsonDataFormatTest.xml
----------------------------------------------------------------------
diff --git a/components/camel-jacksonxml/src/test/resources/org/apache/camel/component/jackson/SpringJacksonJsonDataFormatTest.xml b/components/camel-jacksonxml/src/test/resources/org/apache/camel/component/jackson/SpringJacksonJsonDataFormatTest.xml
deleted file mode 100644
index 3d38860..0000000
--- a/components/camel-jacksonxml/src/test/resources/org/apache/camel/component/jackson/SpringJacksonJsonDataFormatTest.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
- ">
-
- <!-- START SNIPPET: e1 -->
- <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
-
- <!-- we define the json jackson data formats to be used -->
- <dataFormats>
- <!-- this uses the default unmarshal type that is a Map based -->
- <jacksonxml id="jack" />
- <jacksonxml id="pretty" prettyPrint="true"/>
- <!-- and this one uses our own TestPojo class as unmarshal type -->
- <jacksonxml id="pojo" unmarshalTypeName="org.apache.camel.component.jacksonxml.TestPojo"/>
- <!-- in addition to our own TestPojoView class we make use of the jsonView attribute here as filter -->
- <jacksonxml id="view" unmarshalTypeName="org.apache.camel.component.jacksonxml.TestPojoView" jsonView="org.apache.camel.component.jackson.Views$Age"/>
- </dataFormats>
-
- <route>
- <from uri="direct:in"/>
- <marshal ref="jack"/>
- </route>
-
- <route>
- <from uri="direct:inPretty"/>
- <marshal ref="pretty"/>
- </route>
-
- <route>
- <from uri="direct:back"/>
- <unmarshal ref="jack"/>
- <to uri="mock:reverse"/>
- </route>
-
- <route>
- <from uri="direct:inPojo"/>
- <marshal ref="pojo"/>
- </route>
-
- <route>
- <from uri="direct:backPojo"/>
- <unmarshal ref="pojo"/>
- <to uri="mock:reversePojo"/>
- </route>
-
- <route>
- <from uri="direct:inAgeView"/>
- <marshal ref="view"/>
- </route>
-
- <route>
- <from uri="direct:backAgeView"/>
- <unmarshal ref="view"/>
- <to uri="mock:reverseAgeView"/>
- </route>
-
- </camelContext>
- <!-- END SNIPPET: e1 -->
-
-</beans>
http://git-wip-us.apache.org/repos/asf/camel/blob/51f6253d/components/camel-jacksonxml/src/test/resources/org/apache/camel/component/jackson/SpringJacksonMarshalUnmarshalListTest.xml
----------------------------------------------------------------------
diff --git a/components/camel-jacksonxml/src/test/resources/org/apache/camel/component/jackson/SpringJacksonMarshalUnmarshalListTest.xml b/components/camel-jacksonxml/src/test/resources/org/apache/camel/component/jackson/SpringJacksonMarshalUnmarshalListTest.xml
deleted file mode 100644
index ee54e28..0000000
--- a/components/camel-jacksonxml/src/test/resources/org/apache/camel/component/jackson/SpringJacksonMarshalUnmarshalListTest.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
- ">
-
- <!-- START SNIPPET: e1 -->
- <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
-
- <!-- we define the json jackson data formats to be used -->
- <dataFormats>
- <!-- and this one uses our own TestPojo class as unmarshal type -->
- <jacksonxml id="pojo" useList="true" unmarshalTypeName="org.apache.camel.component.jacksonxml.TestPojo"/>
- </dataFormats>
-
- <route>
- <from uri="direct:backPojo"/>
- <unmarshal ref="pojo"/>
- <to uri="mock:reversePojo"/>
- </route>
-
- </camelContext>
- <!-- END SNIPPET: e1 -->
-
-</beans>
http://git-wip-us.apache.org/repos/asf/camel/blob/51f6253d/components/camel-jacksonxml/src/test/resources/org/apache/camel/component/jacksonxml/SpringJacksonEnableFeatureTest.xml
----------------------------------------------------------------------
diff --git a/components/camel-jacksonxml/src/test/resources/org/apache/camel/component/jacksonxml/SpringJacksonEnableFeatureTest.xml b/components/camel-jacksonxml/src/test/resources/org/apache/camel/component/jacksonxml/SpringJacksonEnableFeatureTest.xml
new file mode 100644
index 0000000..ff8cab8
--- /dev/null
+++ b/components/camel-jacksonxml/src/test/resources/org/apache/camel/component/jacksonxml/SpringJacksonEnableFeatureTest.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
+ ">
+
+ <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
+
+ <dataFormats>
+ <jacksonxml id="jack" unmarshalTypeName="org.apache.camel.component.jacksonxml.TestPojo"
+ enableFeatures="WRAP_ROOT_VALUE"/>
+ </dataFormats>
+
+ <route>
+ <from uri="direct:in"/>
+ <marshal ref="jack"/>
+ </route>
+
+ </camelContext>
+
+</beans>
http://git-wip-us.apache.org/repos/asf/camel/blob/51f6253d/components/camel-jacksonxml/src/test/resources/org/apache/camel/component/jacksonxml/SpringJacksonJsonDataFormatTest.xml
----------------------------------------------------------------------
diff --git a/components/camel-jacksonxml/src/test/resources/org/apache/camel/component/jacksonxml/SpringJacksonJsonDataFormatTest.xml b/components/camel-jacksonxml/src/test/resources/org/apache/camel/component/jacksonxml/SpringJacksonJsonDataFormatTest.xml
new file mode 100644
index 0000000..3d38860
--- /dev/null
+++ b/components/camel-jacksonxml/src/test/resources/org/apache/camel/component/jacksonxml/SpringJacksonJsonDataFormatTest.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
+ ">
+
+ <!-- START SNIPPET: e1 -->
+ <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
+
+ <!-- we define the json jackson data formats to be used -->
+ <dataFormats>
+ <!-- this uses the default unmarshal type that is a Map based -->
+ <jacksonxml id="jack" />
+ <jacksonxml id="pretty" prettyPrint="true"/>
+ <!-- and this one uses our own TestPojo class as unmarshal type -->
+ <jacksonxml id="pojo" unmarshalTypeName="org.apache.camel.component.jacksonxml.TestPojo"/>
+ <!-- in addition to our own TestPojoView class we make use of the jsonView attribute here as filter -->
+ <jacksonxml id="view" unmarshalTypeName="org.apache.camel.component.jacksonxml.TestPojoView" jsonView="org.apache.camel.component.jackson.Views$Age"/>
+ </dataFormats>
+
+ <route>
+ <from uri="direct:in"/>
+ <marshal ref="jack"/>
+ </route>
+
+ <route>
+ <from uri="direct:inPretty"/>
+ <marshal ref="pretty"/>
+ </route>
+
+ <route>
+ <from uri="direct:back"/>
+ <unmarshal ref="jack"/>
+ <to uri="mock:reverse"/>
+ </route>
+
+ <route>
+ <from uri="direct:inPojo"/>
+ <marshal ref="pojo"/>
+ </route>
+
+ <route>
+ <from uri="direct:backPojo"/>
+ <unmarshal ref="pojo"/>
+ <to uri="mock:reversePojo"/>
+ </route>
+
+ <route>
+ <from uri="direct:inAgeView"/>
+ <marshal ref="view"/>
+ </route>
+
+ <route>
+ <from uri="direct:backAgeView"/>
+ <unmarshal ref="view"/>
+ <to uri="mock:reverseAgeView"/>
+ </route>
+
+ </camelContext>
+ <!-- END SNIPPET: e1 -->
+
+</beans>
http://git-wip-us.apache.org/repos/asf/camel/blob/51f6253d/components/camel-jacksonxml/src/test/resources/org/apache/camel/component/jacksonxml/SpringJacksonMarshalUnmarshalListTest.xml
----------------------------------------------------------------------
diff --git a/components/camel-jacksonxml/src/test/resources/org/apache/camel/component/jacksonxml/SpringJacksonMarshalUnmarshalListTest.xml b/components/camel-jacksonxml/src/test/resources/org/apache/camel/component/jacksonxml/SpringJacksonMarshalUnmarshalListTest.xml
new file mode 100644
index 0000000..ee54e28
--- /dev/null
+++ b/components/camel-jacksonxml/src/test/resources/org/apache/camel/component/jacksonxml/SpringJacksonMarshalUnmarshalListTest.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
+ ">
+
+ <!-- START SNIPPET: e1 -->
+ <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
+
+ <!-- we define the json jackson data formats to be used -->
+ <dataFormats>
+ <!-- and this one uses our own TestPojo class as unmarshal type -->
+ <jacksonxml id="pojo" useList="true" unmarshalTypeName="org.apache.camel.component.jacksonxml.TestPojo"/>
+ </dataFormats>
+
+ <route>
+ <from uri="direct:backPojo"/>
+ <unmarshal ref="pojo"/>
+ <to uri="mock:reversePojo"/>
+ </route>
+
+ </camelContext>
+ <!-- END SNIPPET: e1 -->
+
+</beans>