Delete all the old karaf osgi tests that do not work. We should use the new camel-test-karaf module as base for testing.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6b77d012 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6b77d012 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6b77d012 Branch: refs/heads/master Commit: 6b77d0126ff14a6fcf0cbde47214b05f061e2d69 Parents: bdf10d5 Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Apr 18 12:06:57 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Apr 18 13:39:42 2016 +0200 ---------------------------------------------------------------------- apache-camel/pom.xml | 4 + .../src/main/descriptors/common-bin.xml | 1 + parent/pom.xml | 5 + tests/camel-itest-osgi/pom.xml | 605 +---- .../protobuf/generated/AddressBookProtos.java | 2559 ------------------ .../osgi/OSGiIntegrationSpringTestSupport.java | 42 - .../itest/osgi/OSGiIntegrationTestSupport.java | 216 -- .../apache/camel/itest/osgi/ahc/AhcTest.java | 77 - .../itest/osgi/aws/AmazonS3ClientMock.java | 423 --- .../itest/osgi/aws/AmazonSDBClientMock.java | 142 - .../itest/osgi/aws/AmazonSESClientMock.java | 45 - .../itest/osgi/aws/AmazonSNSClientMock.java | 136 - .../itest/osgi/aws/AmazonSQSClientMock.java | 100 - .../itest/osgi/aws/AwsS3IntegrationTest.java | 102 - .../apache/camel/itest/osgi/aws/AwsS3Test.java | 101 - .../itest/osgi/aws/AwsSdbIntegrationTest.java | 175 -- .../apache/camel/itest/osgi/aws/AwsSdbTest.java | 297 -- .../itest/osgi/aws/AwsSesIntegrationTest.java | 61 - .../apache/camel/itest/osgi/aws/AwsSesTest.java | 58 - .../itest/osgi/aws/AwsSnsIntegrationTest.java | 63 - .../apache/camel/itest/osgi/aws/AwsSnsTest.java | 60 - .../itest/osgi/aws/AwsSqsIntegrationTest.java | 88 - .../apache/camel/itest/osgi/aws/AwsSqsTest.java | 89 - .../camel/itest/osgi/aws/AwsTestSupport.java | 40 - .../camel/itest/osgi/base64/Base64Test.java | 190 -- .../osgi/bean/validator/BeanValidatorTest.java | 69 - .../camel/itest/osgi/bean/validator/Car.java | 29 - .../osgi/bean/validator/CarWithAnnotations.java | 53 - .../bean/validator/CarWithoutAnnotations.java | 46 - .../osgi/bean/validator/OptionalChecks.java | 21 - .../osgi/beanio/BeanIODataFormatSimpleTest.java | 127 - .../camel/itest/osgi/beanio/Employee.java | 104 - .../osgi/bindy/BindyDataFormatCsvTest.java | 125 - .../BindySpringDataFormatCsvJavaRouteTest.java | 112 - .../bindy/BindySpringDataFormatCsvTest.java | 112 - .../apache/camel/itest/osgi/bindy/Employee.java | 113 - .../apache/camel/itest/osgi/bindy/MyRoutes.java | 34 - .../osgi/blueprint/AbstractIntegrationTest.java | 164 -- .../BlueprintExplicitPropertiesRouteTest.java | 85 - ...lueprintPropertiesCustomPrefixRouteTest.java | 84 - .../BlueprintPropertiesJasyptRouteTest.java | 86 - .../blueprint/BlueprintPropertiesRouteTest.java | 85 - .../osgi/blueprint/BlueprintTracerRefTest.java | 55 - .../osgi/blueprint/BlueprintTracerTest.java | 100 - .../osgi/blueprint/CamelBlueprint2Test.java | 122 - .../osgi/blueprint/CamelBlueprint3Test.java | 111 - .../osgi/blueprint/CamelBlueprint4Test.java | 141 - .../osgi/blueprint/CamelBlueprint5Test.java | 79 - .../osgi/blueprint/CamelBlueprint6Test.java | 75 - .../osgi/blueprint/CamelBlueprint7Test.java | 76 - .../osgi/blueprint/CamelBlueprint8Test.java | 118 - ...melBlueprintManagedNamePatternFixedTest.java | 81 - .../osgi/blueprint/CamelBlueprintTcclTest.java | 118 - .../osgi/blueprint/CamelBlueprintTest.java | 155 -- .../CamelMultiVersionBlueprintTest.java | 86 - .../itest/osgi/blueprint/JsseUtilTester.java | 36 - .../camel/itest/osgi/blueprint/MyErrorBean.java | 35 - .../camel/itest/osgi/blueprint/MyException.java | 32 - .../itest/osgi/blueprint/MySerialBean.java | 45 - .../blueprint/OSGiBlueprintHelloWorldTest.java | 88 - .../OSGiBlueprintQuarz2SchedulerTest.java | 88 - .../blueprint/OSGiBlueprintTestSupport.java | 64 - .../osgi/blueprint/TestInterceptStrategy.java | 29 - .../itest/osgi/blueprint/TestProducer.java | 30 - .../itest/osgi/blueprint/TestProxySender.java | 32 - .../itest/osgi/blueprint/TestRouteBuilder.java | 30 - .../osgi/cache/CacheManagerFactoryRefTest.java | 115 - .../osgi/cache/CacheRoutesManagementTest.java | 131 - .../camel/itest/osgi/cache/CacheTest.java | 73 - .../itest/osgi/core/OsgiFactoryFinderTest.java | 42 - .../osgi/core/TypeConverterLoaderTest.java | 41 - .../itest/osgi/core/bean/BeanRouteTest.java | 56 - .../camel/itest/osgi/core/bean/FooService.java | 26 - .../camel/itest/osgi/core/bean/MyFooBean.java | 33 - .../itest/osgi/core/browse/BrowseRouteTest.java | 55 - .../itest/osgi/core/clazz/ClassRouteTest.java | 47 - .../osgi/core/dataformat/MySerialBean.java | 45 - .../dataformat/SerializationDataFormatTest.java | 59 - .../osgi/core/dataset/DataSetRouteTest.java | 59 - .../itest/osgi/core/direct/DirectTest.java | 48 - .../itest/osgi/core/file/FileComponentTest.java | 47 - .../osgi/core/file/FileRouteDelayTest.java | 66 - .../itest/osgi/core/file/FileRouteTest.java | 55 - .../osgi/core/language/LanguageRouteTest.java | 48 - .../itest/osgi/core/language/SimpleTest.java | 47 - .../camel/itest/osgi/core/log/LogRouteTest.java | 58 - ...ogRouteWithLoggersPresentInRegistryTest.java | 98 - .../log/LogRouteWithNonDefaultLoggerTest.java | 95 - .../OSGiIntegrationManagedCamelContextTest.java | 97 - .../itest/osgi/core/mock/MockXPathTest.java | 54 - .../osgi/core/packages/MyRouteBuilder.java | 30 - .../osgi/core/packages/OSGiPackageScanTest.java | 44 - .../core/properties/PropertiesRouteTest.java | 51 - .../osgi/core/ref/RefFileEndpointTest.java | 64 - .../camel/itest/osgi/core/seda/SedaTest.java | 50 - .../itest/osgi/core/timer/TimerFiredTest.java | 52 - .../osgi/core/validator/ValidatorRouteTest.java | 71 - .../apache/camel/itest/osgi/core/vm/VmTest.java | 60 - .../osgi/core/xslt/XsltBlueprintRouteTest.java | 93 - .../itest/osgi/core/xslt/XsltRouteTest.java | 57 - .../itest/osgi/cxf/CxfBeanSpringRouteTest.java | 84 - .../itest/osgi/cxf/CxfProxyExampleTest.java | 97 - .../apache/camel/itest/osgi/cxf/EnrichBean.java | 33 - .../itest/osgi/cxf/RealWebServiceBean.java | 50 - .../osgi/cxf/ReportIncidentEndpointService.java | 34 - .../blueprint/CxfBeanBlueprintRouterTest.java | 105 - .../cxf/blueprint/CxfBlueprintRouterTest.java | 121 - .../cxf/blueprint/CxfRsBlueprintRouterTest.java | 212 -- .../itest/osgi/cxf/jaxrs/testbean/Customer.java | 45 - .../cxf/jaxrs/testbean/CustomerService.java | 151 -- .../jaxrs/testbean/CustomerServiceResource.java | 48 - .../itest/osgi/cxf/jaxrs/testbean/Order.java | 71 - .../itest/osgi/cxf/jaxrs/testbean/Product.java | 45 - .../itest/osgi/disruptor/DisruptorTest.java | 70 - .../osgi/disruptor/vm/DisruptorVmTest.java | 85 - .../camel/itest/osgi/dozer/DozerTest.java | 76 - .../camel/itest/osgi/dozer/model/Address.java | 43 - .../camel/itest/osgi/dozer/model/Customer.java | 61 - .../itest/osgi/dozer/service/Customer.java | 61 - .../apache/camel/itest/osgi/exec/ExecTest.java | 61 - .../osgi/freemarker/FreemarkerFileTest.java | 54 - .../itest/osgi/freemarker/FreemarkerTest.java | 72 - .../camel/itest/osgi/ftp/FtpConsumeTest.java | 55 - .../camel/itest/osgi/ftp/FtpServerBean.java | 102 - .../apache/camel/itest/osgi/ftp/FtpTest.java | 67 - .../camel/itest/osgi/groovy/GroovyTest.java | 69 - .../osgi/hawtdb/HawtDBAggregateRouteTest.java | 100 - .../itest/osgi/hazelcast/HazelcastTest.java | 127 - .../itest/osgi/hazelcast/SimpleObject.java | 74 - .../itest/osgi/hdfs/HdfsBlueprintRouteTest.java | 81 - .../camel/itest/osgi/hdfs/HdfsRouteTest.java | 88 - .../camel/itest/osgi/hl7/HL7DataFormatTest.java | 91 - .../camel/itest/osgi/hl7/HL7MLLPCodec2Test.java | 79 - .../camel/itest/osgi/hl7/HL7MLLPCodecTest.java | 73 - .../apache/camel/itest/osgi/http/HttpTest.java | 75 - .../itest/osgi/http/HttpTypeConverterTest.java | 198 -- .../camel/itest/osgi/http4/Http4Test.java | 76 - .../camel/itest/osgi/jasypt/JasyptTest.java | 72 - .../itest/osgi/jaxb/JaxbDataFormatTest.java | 76 - .../jaxb/JaxbFallbackConverterSpringTest.java | 63 - .../osgi/jaxb/JaxbFallbackConverterTest.java | 66 - .../camel/itest/osgi/jaxb/ObjectFactory.java | 68 - .../camel/itest/osgi/jaxb/PersonType.java | 87 - .../jclouds/BlobStoreBlueprintRouteTest.java | 101 - .../itest/osgi/jclouds/BlobStoreRouteTest.java | 91 - .../jetty/JettyClassloaderCheckProcessor.java | 31 - .../camel/itest/osgi/jetty/JettyProcessor.java | 33 - .../OSGiJettyCamelContextsClassloaderTest.java | 109 - .../jetty/OSGiMulitJettyCamelContextsTest.java | 90 - .../apache/camel/itest/osgi/jms/JmsTest.java | 73 - .../itest/osgi/jpa/JpaBlueprintRouteTest.java | 82 - .../camel/itest/osgi/jpa/JpaRouteTest.java | 144 - .../camel/itest/osgi/jpa/MyProcessor.java | 35 - .../apache/camel/itest/osgi/jpa/SendEmail.java | 67 - .../apache/camel/itest/osgi/jsch/ScpTest.java | 60 - .../osgi/krati/KratiBlueprintRouteTest.java | 75 - .../camel/itest/osgi/krati/KratiRouteTest.java | 76 - .../camel/itest/osgi/krati/SomeObject.java | 48 - .../osgi/leveldb/LevelDBAggregateRouteTest.java | 102 - .../camel/itest/osgi/mail/MailRouteTest.java | 146 - .../apache/camel/itest/osgi/mina/MinaTest.java | 62 - .../apache/camel/itest/osgi/mvel/MvelTest.java | 61 - .../camel/itest/osgi/mybatis/Account.java | 65 - .../camel/itest/osgi/mybatis/MyBatisTest.java | 116 - .../camel/itest/osgi/netty/NettyTest.java | 62 - .../itest/osgi/protobuf/ProtobufRouteTest.java | 116 - .../itest/osgi/quartz/QuartzCronRouteTest.java | 62 - .../camel/itest/osgi/restlet/RestletTest.java | 72 - .../CheckDomainAvailabilityRestResponse.java | 42 - .../example/CheckDomainAvailabilityResult.java | 42 - .../restlet/example/CheckDomainRequest.java | 59 - .../osgi/restlet/example/DomainService.java | 58 - .../camel/itest/osgi/restlet/example/Order.java | 73 - .../itest/osgi/restlet/example/Product.java | 41 - .../example/RestletDomainServiceTest.java | 75 - .../itest/osgi/rss/RssPollingConsumerTest.java | 85 - .../itest/osgi/saxon/SaxonXsltRouteTest.java | 70 - .../osgi/saxon/SaxonXsltTerminateRouteTest.java | 103 - .../itest/osgi/script/GroovyScriptOsgiTest.java | 70 - .../camel/itest/osgi/script/RubyOsgiTest.java | 65 - .../osgi/servlet/ServletComponentTest.java | 65 - .../itest/osgi/servlet/ServletProcessor.java | 33 - .../itest/osgi/servlet/ServletServicesTest.java | 65 - .../osgi/servlet/support/ServletActivator.java | 91 - .../osgi/shiro/ShiroAuthenticationTest.java | 133 - .../osgi/spring/bean/SpringBeanRouteTest.java | 42 - .../itest/osgi/spring/event/EventRouteTest.java | 64 - .../camel/itest/osgi/sql/DatabaseManager.java | 44 - .../camel/itest/osgi/sql/SqlBlueprintRoute.java | 155 -- .../camel/itest/osgi/sql/SqlRouteTest.java | 152 -- .../camel/itest/osgi/stream/StreamTest.java | 60 - .../camel/itest/osgi/syslog/SyslogTest.java | 106 - .../itest/osgi/util/jsse/JsseUtilTest.java | 88 - .../osgi/velocity/VelocityBlueprintTest.java | 86 - .../itest/osgi/velocity/VelocityFileTest.java | 54 - .../camel/itest/osgi/velocity/VelocityTest.java | 73 - .../osgi/xmljson/XmlJsonBlueprintRouteTest.java | 86 - .../itest/osgi/xmljson/XmlJsonRouteBuilder.java | 33 - .../camel/itest/osgi/xstream/SampleObject.java | 70 - .../osgi/xstream/XstreamBlueprintRouteTest.java | 88 - .../itest/osgi/xstream/XstreamRouteBuilder.java | 31 - .../itest/osgi/zookeeper/ZookeeperOSGiTest.java | 183 -- .../zookeeper/ZookeeperOSGiTestSupport.java | 351 --- .../test/resources/commons-logging.properties | 19 - .../src/test/resources/constraints-car.xml | 39 - .../src/test/resources/core-default.xml | 1293 --------- .../src/test/resources/hdfs-default.xml | 1607 ----------- .../apache/camel/itest/osgi/CamelContext.xml | 33 - .../camel/itest/osgi/aws/CamelContext.xml | 69 - .../itest/osgi/aws/CamelIntegrationContext.xml | 59 - .../apache/camel/itest/osgi/beanio/mappings.xml | 30 - .../BindySpringDataFormatCsvJavaRouteTest.xml | 38 - .../osgi/bindy/BindySpringDataFormatCsvTest.xml | 48 - .../camel/itest/osgi/blueprint/blueprint-1.xml | 27 - .../camel/itest/osgi/blueprint/blueprint-10.xml | 26 - .../camel/itest/osgi/blueprint/blueprint-11.xml | 45 - .../camel/itest/osgi/blueprint/blueprint-12.xml | 38 - .../camel/itest/osgi/blueprint/blueprint-13.xml | 35 - .../camel/itest/osgi/blueprint/blueprint-14.xml | 31 - .../camel/itest/osgi/blueprint/blueprint-15.xml | 29 - .../camel/itest/osgi/blueprint/blueprint-16.xml | 50 - .../camel/itest/osgi/blueprint/blueprint-17.xml | 46 - .../camel/itest/osgi/blueprint/blueprint-18.xml | 46 - .../camel/itest/osgi/blueprint/blueprint-19.xml | 29 - .../camel/itest/osgi/blueprint/blueprint-2.xml | 27 - .../camel/itest/osgi/blueprint/blueprint-20.xml | 27 - .../camel/itest/osgi/blueprint/blueprint-21.xml | 36 - .../camel/itest/osgi/blueprint/blueprint-23.xml | 43 - .../camel/itest/osgi/blueprint/blueprint-24.xml | 36 - .../camel/itest/osgi/blueprint/blueprint-25.xml | 36 - .../camel/itest/osgi/blueprint/blueprint-26.xml | 52 - .../camel/itest/osgi/blueprint/blueprint-27.xml | 51 - .../camel/itest/osgi/blueprint/blueprint-28.xml | 28 - .../camel/itest/osgi/blueprint/blueprint-29.xml | 35 - .../camel/itest/osgi/blueprint/blueprint-3.xml | 30 - .../camel/itest/osgi/blueprint/blueprint-30.xml | 36 - .../camel/itest/osgi/blueprint/blueprint-4.xml | 24 - .../camel/itest/osgi/blueprint/blueprint-5.xml | 26 - .../camel/itest/osgi/blueprint/blueprint-6.xml | 29 - .../camel/itest/osgi/blueprint/blueprint-7.xml | 29 - .../camel/itest/osgi/blueprint/blueprint-8.xml | 29 - .../camel/itest/osgi/blueprint/blueprint-9.xml | 26 - .../itest/osgi/blueprint/blueprint-fixed.xml | 30 - .../itest/osgi/blueprint/blueprint-tccl.xml | 28 - .../itest/osgi/blueprint/cheese.properties | 20 - .../camel/itest/osgi/blueprint/example.vm | 17 - .../camel/itest/osgi/blueprint/example.xsl | 26 - .../itest/osgi/blueprint/fileRouteBlueprint.xml | 28 - .../osgi/blueprint/myproperties.properties | 23 - .../camel/itest/osgi/cache/ehcache_test.xml | 69 - .../itest/osgi/core/management/CamelContext.xml | 33 - .../itest/osgi/core/packages/CamelContext.xml | 34 - .../core/properties/myproperties.properties | 20 - .../camel/itest/osgi/core/validator/schema.xsd | 34 - .../osgi/core/xslt/XsltBlueprintRouter.xml | 28 - .../camel/itest/osgi/core/xslt/example.xsl | 26 - .../camel/itest/osgi/core/xslt/terminate.xsl | 34 - .../camel/itest/osgi/core/xslt/transform.xsl | 39 - .../camel/itest/osgi/cxf/CxfBeanRouter.xml | 37 - .../cxf/blueprint/CxfBeanBlueprintRouter.xml | 37 - .../osgi/cxf/blueprint/CxfBlueprintRouter.xml | 48 - .../osgi/cxf/blueprint/CxfRsBlueprintRouter.xml | 55 - .../camel/itest/osgi/cxf/camel-config.xml | 72 - .../camel/itest/osgi/dozer/CamelContext.xml | 48 - .../camel/itest/osgi/dozer/dozer-mapping.xml | 32 - .../camel/itest/osgi/freemarker/example.ftl | 19 - .../camel/itest/osgi/ftp/CamelContext.xml | 36 - .../camel/itest/osgi/ftp/FtpConsumeTest.xml | 33 - .../itest/osgi/hdfs/blueprintCamelContext.xml | 61 - .../camel/itest/osgi/hl7/CamelContext.xml | 40 - .../camel/itest/osgi/hl7/CamelContext2.xml | 43 - .../itest/osgi/jasypt/myproperties.properties | 22 - .../camel/itest/osgi/jaxb/CamelContext.xml | 34 - .../osgi/jclouds/blueprintBlobStoreService.xml | 38 - .../osgi/jclouds/blueprintCamelContext.xml | 37 - .../osgi/jclouds/springJcloudsRouteContext.xml | 63 - .../camel/itest/osgi/jetty/CamelContext1.xml | 37 - .../camel/itest/osgi/jetty/CamelContext2.xml | 37 - .../osgi/jetty/Classloader-CamelContext1.xml | 40 - .../osgi/jetty/Classloader-CamelContext2.xml | 40 - .../camel/itest/osgi/jms/CamelContext.xml | 41 - .../itest/osgi/jpa/blueprintCamelContext.xml | 38 - .../itest/osgi/jpa/springJpaRouteContext.xml | 44 - .../camel/itest/osgi/jsch/CamelContext.xml | 32 - .../itest/osgi/krati/blueprintCamelContext.xml | 42 - .../osgi/krati/springKratiRouteContext.xml | 47 - .../apache/camel/itest/osgi/mybatis/Account.xml | 100 - .../camel/itest/osgi/mybatis/SqlMapConfig.xml | 50 - .../osgi/restlet/example/camel-context.xml | 46 - .../camel/itest/osgi/restlet/example/jaxb.index | 21 - .../org/apache/camel/itest/osgi/rss/rss20.xml | 424 --- .../CamelServletWithServletServiceContext.xml | 51 - .../servlet/ServletComponentTest-context.xml | 38 - .../osgi/servlet/ServletServiceContext.xml | 50 - .../camel/itest/osgi/shiro/securityconfig.ini | 36 - .../itest/osgi/spring/bean/CamelContext.xml | 36 - .../itest/osgi/spring/event/CamelContext.xml | 33 - .../itest/osgi/sql/blueprintSqlCamelContext.xml | 48 - .../itest/osgi/sql/springSqlRouteContext.xml | 51 - .../osgi/util/jsse/JsseUtilTest-context.xml | 47 - .../camel/itest/osgi/util/jsse/localhost.ks | Bin 1265 -> 0 bytes .../osgi/velocity/VelocityBlueprintRouter.xml | 27 - .../apache/camel/itest/osgi/velocity/example.vm | 18 - .../apache/camel/itest/osgi/velocity/header.vm | 17 - .../xmljson/xmlJsonBlueprintCamelContext.xml | 29 - .../osgi/xstream/blueprintCamelContext.xml | 26 - .../src/test/resources/report_incident.wsdl | 92 - .../src/test/resources/users.properties | 12 - 308 files changed, 13 insertions(+), 26520 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/6b77d012/apache-camel/pom.xml ---------------------------------------------------------------------- diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml index d825e44..8e13c4f 100644 --- a/apache-camel/pom.xml +++ b/apache-camel/pom.xml @@ -872,6 +872,10 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-test-karaf</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> <artifactId>camel-test-spring</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/6b77d012/apache-camel/src/main/descriptors/common-bin.xml ---------------------------------------------------------------------- diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml index 23fee8a..4677951 100644 --- a/apache-camel/src/main/descriptors/common-bin.xml +++ b/apache-camel/src/main/descriptors/common-bin.xml @@ -228,6 +228,7 @@ <include>org.apache.camel:camel-test</include> <include>org.apache.camel:camel-test-blueprint</include> <include>org.apache.camel:camel-test-cdi</include> + <include>org.apache.camel:camel-test-test-karaf</include> <include>org.apache.camel:camel-test-spring</include> <include>org.apache.camel:camel-testng</include> <include>org.apache.camel:camel-twitter</include> http://git-wip-us.apache.org/repos/asf/camel/blob/6b77d012/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index b3402f8..bc1fc0b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1716,6 +1716,11 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-test-karaf</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> <artifactId>camel-test-spring</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/6b77d012/tests/camel-itest-osgi/pom.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/pom.xml b/tests/camel-itest-osgi/pom.xml index b099214..58499cf 100644 --- a/tests/camel-itest-osgi/pom.xml +++ b/tests/camel-itest-osgi/pom.xml @@ -15,7 +15,8 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> @@ -32,612 +33,12 @@ <!-- let's list the dependencies in a sorted order --> <dependencies> - <!-- activemq --> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-all</artifactId> - <version>${activemq-version}</version> - <scope>test</scope> - </dependency> - - <!-- blueprint --> - <dependency> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>org.apache.aries.blueprint.api</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>org.apache.aries.blueprint.core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>org.apache.aries.blueprint.cm</artifactId> - <scope>test</scope> - </dependency> - - <!-- camel --> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-aws</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-base64</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-beanio</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-bean-validator</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-bindy</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-blueprint</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-cache</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-cxf</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-disruptor</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-hawtdb</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-hazelcast</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-hdfs2</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-hl7</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-jasypt</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-jaxb</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-jclouds</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-jpa</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-jsch</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-krati</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-leveldb</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-mail</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-mvel</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-mybatis</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-netty</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-protobuf</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-quartz2</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-rss</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-ruby</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-script</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-servlet</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-shiro</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-sql</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-syslog</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-xmljson</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-zookeeper</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel.karaf</groupId> - <artifactId>apache-camel</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel.tests</groupId> - <artifactId>org.apache.camel.tests.mock-javamail_1.7</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jvnet.mock-javamail</groupId> - <artifactId>mock-javamail</artifactId> - <version>${mock-javamail-version}</version> - <exclusions> - <exclusion> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </exclusion> - </exclusions> - <scope>test</scope> - </dependency> - - <!-- cxf --> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-extension-providers</artifactId> - <version>${cxf-version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-transports-http-jetty</artifactId> - <version>${cxf-version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-ws-security</artifactId> - <version>${cxf-version}</version> - <scope>test</scope> - </dependency> - - <!-- felix --> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.configadmin</artifactId> - <exclusions> - <exclusion> - <groupId>org.apache.felix</groupId> - <artifactId>javax.servlet</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.felix</groupId> - <artifactId>org.osgi.foundation</artifactId> - </exclusion> - </exclusions> - <scope>test</scope> - </dependency> - - <!-- karaf --> - <dependency> - <groupId>org.apache.karaf</groupId> - <artifactId>apache-karaf</artifactId> - <version>${karaf-version}</version> - <type>tar.gz</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.framework</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.karaf</groupId> - <artifactId>org.apache.karaf.client</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.karaf.shell</groupId> - <artifactId>org.apache.karaf.shell.dev</artifactId> - </exclusion> - - <!-- required for karaf 2.x --> - <exclusion> - <groupId>org.eclipse</groupId> - <artifactId>osgi</artifactId> - </exclusion> - - <!-- required for karaf 3.x --> - <exclusion> - <groupId>org.eclipse</groupId> - <artifactId>org.eclipse.osgi</artifactId> - </exclusion> - </exclusions> - </dependency> - - <!-- osgi --> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - <scope>test</scope> - </dependency> - - <!-- pax-exam --> - <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-container-karaf</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-invoker-junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-junit4</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-link-mvn</artifactId> - <scope>test</scope> - </dependency> - - <!-- spring --> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context-support</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework.osgi</groupId> - <artifactId>spring-osgi-core</artifactId> - <exclusions> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>org.springframework.aop</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>org.springframework.beans</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>org.springframework.context</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>org.springframework.core</artifactId> - </exclusion> - </exclusions> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework.osgi</groupId> - <artifactId>spring-osgi-mock</artifactId> - <scope>test</scope> - </dependency> - - <!-- logging --> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - - <!-- others --> - <dependency> - <groupId>ca.uhn.hapi</groupId> - <artifactId>hapi-structures-v24</artifactId> - <version>${hapi-version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.ftpserver</groupId> - <artifactId>ftplet-api</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.ftpserver</groupId> - <artifactId>ftpserver-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>${httpclient4-version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa-persistence-jdbc</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.servicemix.bundles</groupId> - <artifactId>org.apache.servicemix.bundles.junit</artifactId> - <version>${junit-bundle-version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.jettison</groupId> - <artifactId>jettison</artifactId> + <artifactId>camel-test-karaf</artifactId> <scope>test</scope> </dependency> </dependencies> - <build> - <pluginManagement> - <plugins> - <!-- Eclipse m2e Lifecycle Management --> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>${lifecycle-mapping-version}</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.apache.servicemix.tooling</groupId> - <artifactId>depends-maven-plugin</artifactId> - <versionRange>${depends-maven-plugin-version}</versionRange> - <goals> - <goal>generate-depends-file</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa-maven-plugin</artifactId> - <versionRange>[1.0.0,)</versionRange> - <goals> - <goal>test-enhance</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> - <plugins> - <!-- generate dependencies versions --> - <plugin> - <groupId>org.apache.servicemix.tooling</groupId> - <artifactId>depends-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-depends-file</id> - <goals> - <goal>generate-depends-file</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkCount>1</forkCount> - <reuseForks>false</reuseForks> - <excludes> - <exclude>**/FIXMETest.*</exclude> - <exclude>**/FtpConsumeTest.*</exclude> - <exclude>**/BlobStoreRouteTest.*</exclude> <!-- CAMEL-6134 --> - <exclude>**/BlobStoreBlueprintRouteTest.*</exclude> <!-- CAMEL-6134 --> - </excludes> - <systemPropertyVariables> - <karafVersion>${karaf-version}</karafVersion> - </systemPropertyVariables> - </configuration> - </plugin> - - <!-- CXF wsdl2java generator, will plugin to the compile goal --> - <plugin> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-codegen-plugin</artifactId> - <executions> - <execution> - <id>generate-sources</id> - <phase>generate-sources</phase> - <configuration> - <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot> - <wsdlOptions> - <wsdlOption> - <frontEnd>jaxws21</frontEnd> - <wsdl>${basedir}/src/test/resources/report_incident.wsdl</wsdl> - </wsdlOption> - </wsdlOptions> - </configuration> - <goals> - <goal>wsdl2java</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa-maven-plugin</artifactId> - <version>${openjpa-version}</version> - <configuration> - <persistenceXmlFile>${project.basedir}/src/test/resources/META-INF/persistence.xml</persistenceXmlFile> - <includes>org/apache/camel/itest/osgi/jpa/SendEmail.class</includes> - <addDefaultConstructor>true</addDefaultConstructor> - <enforcePropertyRestrictions>true</enforcePropertyRestrictions> - </configuration> - <executions> - <execution> - <id>test enhancer</id> - <phase>process-test-classes</phase> - <goals> - <goal>test-enhance</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa</artifactId> - <version>${openjpa-version}</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>ci-build-profile</id> - <activation> - <property> - <name>maven.repo.local</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> - <!-- when the local repo location has been specified, we need to pass - on this information to PAX mvn url --> - <argLine>-Dorg.ops4j.pax.url.mvn.localRepository=${maven.repo.local}</argLine> - <includes> - <include>**/*Test.*</include> - </includes> - <excludes> - <!--There are some conflicts of the JAXB OSGi bundle and Hudson System - jar so I comment out these JAXB related tests --> - <exclude>**/OSGiIntegrationSpringTest.*</exclude> - <exclude>**/JaxbFallbackConverterTest.*</exclude> - <exclude>**/FtpConsumeTest.*</exclude> - <exclude>**/CxfRsBlueprintRouterTest.*</exclude> - <exclude>**/BlobStoreRouteTest.*</exclude> <!-- CAMEL-6134 --> - <exclude>**/BlobStoreBlueprintRouteTest.*</exclude> <!-- CAMEL-6134 --> - </excludes> - <systemPropertyVariables> - <karafVersion>${karaf-version}</karafVersion> - </systemPropertyVariables> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>karaf3</id> - <properties> - <karaf-version>${karaf3-version}</karaf-version> - </properties> - </profile> - </profiles> - </project>
