Author: ningjiang
Date: Wed Dec 8 06:53:20 2010
New Revision: 1043323
URL: http://svn.apache.org/viewvc?rev=1043323&view=rev
Log:
CAMEL-3228 Upgraded dozer to 5.3.1 which still does not support OSGi
Modified:
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/dozer/DozerTest.java
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1043323&r1=1043322&r2=1043323&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Dec 8 06:53:20 2010
@@ -54,7 +54,7 @@
<cxf-version>2.3.0</cxf-version>
<cxf-xjc-utils-version>2.3.0</cxf-xjc-utils-version>
<derby-version>10.4.2.0</derby-version>
- <dozer-version>5.3.0</dozer-version>
+ <dozer-version>5.3.1</dozer-version>
<easymock-version>2.5.2</easymock-version>
<ehcache-bundle-version>1.6.2_1-SNAPSHOT</ehcache-bundle-version>
<flatpack-version>3.2.0_1</flatpack-version>
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1043323&r1=1043322&r2=1043323&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Wed Dec 8 06:53:20 2010
@@ -54,7 +54,7 @@
<commons-management-version>1.0</commons-management-version>
<commons-pool-bundle-version>1.5.4_1</commons-pool-bundle-version>
<dom4j-bundle-version>1.6.1_2</dom4j-bundle-version>
- <dozer-bundle-version>5.3.0</dozer-bundle-version>
+ <dozer-bundle-version>5.3.1</dozer-bundle-version>
<el-api-1.0-version>1.0.1</el-api-1.0-version>
<fastinfoset-version>1.2.7_2</fastinfoset-version>
<features.file>features.xml</features.file>
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/dozer/DozerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/dozer/DozerTest.java?rev=1043323&r1=1043322&r2=1043323&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/dozer/DozerTest.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/dozer/DozerTest.java
Wed Dec 8 06:53:20 2010
@@ -38,7 +38,7 @@ import static org.ops4j.pax.exam.contain
* @version $Revision$
*/
@RunWith(JUnit4TestRunner.class)
-...@ignore("Dozer does not work in OSGi")
+...@ignore("DozerBeanMapper can't load the configure from OSGi in Dozer 5.3.1")
public class DozerTest extends OSGiIntegrationSpringTestSupport {
@Override
@@ -72,12 +72,13 @@ public class DozerTest extends OSGiInteg
@Configuration
public static Option[] configure() {
Option[] options = options(
-
// install the spring dm profile
profile("spring.dm").version("1.2.0"),
// this is how you set the default log level when using pax
logging (logProfile)
org.ops4j.pax.exam.CoreOptions.systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
+ // need to install some karaf features
+ scanFeatures(getKarafFeatureUrl(), "http"),
// using the features to install the camel components
scanFeatures(getCamelKarafFeatureUrl(),
"camel-core", "camel-spring", "camel-test",
"camel-dozer"),
