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 2016/03/27 13:26:32 UTC
[4/5] camel git commit: CAMEL-9766: camel-itest-karaf to get working
on karaf 4
CAMEL-9766: camel-itest-karaf to get working on karaf 4
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9e7714a7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9e7714a7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9e7714a7
Branch: refs/heads/master
Commit: 9e7714a7484f92b7e69e06a3d1d3325dcfb08a28
Parents: 88f0140
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Mar 27 12:07:40 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Mar 27 12:07:40 2016 +0200
----------------------------------------------------------------------
tests/camel-itest-karaf/pom.xml | 17 +-
.../camel/itest/karaf/AbstractFeatureTest.java | 162 ++++++++-----------
.../apache/camel/itest/karaf/CamelAhcTest.java | 11 +-
.../camel/itest/karaf/CamelAhcWsTest.java | 7 -
.../apache/camel/itest/karaf/CamelAmqpTest.java | 7 -
.../apache/camel/itest/karaf/CamelApnsTest.java | 7 -
.../karaf/CamelAtmosphereWebsocketTest.java | 8 +-
.../apache/camel/itest/karaf/CamelAtomTest.java | 7 -
.../apache/camel/itest/karaf/CamelAvroTest.java | 13 --
.../apache/camel/itest/karaf/CamelAwsTest.java | 23 +--
.../apache/camel/itest/karaf/CamelBamTest.java | 9 +-
.../camel/itest/karaf/CamelBarcodeTest.java | 14 --
.../camel/itest/karaf/CamelBase64Test.java | 13 --
.../itest/karaf/CamelBeanValidatorTest.java | 7 -
.../camel/itest/karaf/CamelBeanioTest.java | 13 --
.../camel/itest/karaf/CamelBeanstalkTest.java | 7 -
.../camel/itest/karaf/CamelBindyTest.java | 15 --
.../apache/camel/itest/karaf/CamelBoonTest.java | 13 --
.../apache/camel/itest/karaf/CamelBoxTest.java | 7 -
.../camel/itest/karaf/CamelBraintreeTest.java | 7 -
.../camel/itest/karaf/CamelCacheTest.java | 7 -
.../camel/itest/karaf/CamelCassandraqlTest.java | 7 -
.../camel/itest/karaf/CamelCastorTest.java | 13 --
.../camel/itest/karaf/CamelChunkTest.java | 6 -
.../camel/itest/karaf/CamelCmSmsTest.java | 7 +-
.../apache/camel/itest/karaf/CamelCmisTest.java | 7 +-
.../camel/itest/karaf/CamelCometdTest.java | 7 -
.../camel/itest/karaf/CamelContextTest.java | 7 -
.../camel/itest/karaf/CamelCouchDBTest.java | 7 -
.../camel/itest/karaf/CamelCryptoTest.java | 13 --
.../apache/camel/itest/karaf/CamelCsvTest.java | 14 --
.../apache/camel/itest/karaf/CamelCxfTest.java | 13 +-
.../camel/itest/karaf/CamelDisruptorTest.java | 13 +-
.../apache/camel/itest/karaf/CamelDnsTest.java | 7 -
.../camel/itest/karaf/CamelDockerTest.java | 7 -
.../camel/itest/karaf/CamelDozerTest.java | 7 -
.../camel/itest/karaf/CamelDropboxTest.java | 11 +-
.../itest/karaf/CamelElasticsearchTest.java | 9 +-
.../camel/itest/karaf/CamelElsqlTest.java | 9 +-
.../apache/camel/itest/karaf/CamelEtcdTest.java | 7 -
.../camel/itest/karaf/CamelEventadminTest.java | 9 +-
.../apache/camel/itest/karaf/CamelExecTest.java | 9 +-
.../camel/itest/karaf/CamelFacebookTest.java | 7 -
.../camel/itest/karaf/CamelFlatpackTest.java | 13 --
.../apache/camel/itest/karaf/CamelFopTest.java | 7 -
.../camel/itest/karaf/CamelFreemarkerTest.java | 7 -
.../apache/camel/itest/karaf/CamelFtpTest.java | 11 +-
.../camel/itest/karaf/CamelGangliaTest.java | 7 -
.../camel/itest/karaf/CamelGeocoderTest.java | 7 -
.../apache/camel/itest/karaf/CamelGitTest.java | 7 -
.../camel/itest/karaf/CamelGithubTest.java | 7 -
.../itest/karaf/CamelGoogleCalendarTest.java | 7 -
.../camel/itest/karaf/CamelGoogleDriveTest.java | 7 -
.../camel/itest/karaf/CamelGoogleMailTest.java | 7 -
.../camel/itest/karaf/CamelGroovyTest.java | 7 -
.../apache/camel/itest/karaf/CamelGsonTest.java | 16 --
.../itest/karaf/CamelGuavaEventBusTest.java | 7 -
.../camel/itest/karaf/CamelGuiceTest.java | 9 +-
.../camel/itest/karaf/CamelHazelcastTest.java | 7 -
.../camel/itest/karaf/CamelHbaseTest.java | 7 -
.../camel/itest/karaf/CamelHdfs2Test.java | 7 -
.../apache/camel/itest/karaf/CamelHdfsTest.java | 7 -
.../camel/itest/karaf/CamelHessianTest.java | 13 --
.../camel/itest/karaf/CamelHipchatTest.java | 7 -
.../apache/camel/itest/karaf/CamelHl7Test.java | 13 --
.../camel/itest/karaf/CamelHttp4Test.java | 7 -
.../apache/camel/itest/karaf/CamelHttpTest.java | 7 -
.../camel/itest/karaf/CamelIbatisTest.java | 7 -
.../apache/camel/itest/karaf/CamelIcalTest.java | 13 --
.../camel/itest/karaf/CamelIgniteTest.java | 7 -
.../camel/itest/karaf/CamelInfinispanTest.java | 8 +-
.../apache/camel/itest/karaf/CamelIrcTest.java | 7 -
.../camel/itest/karaf/CamelJCacheTest.java | 6 -
.../camel/itest/karaf/CamelJacksonTest.java | 13 --
.../camel/itest/karaf/CamelJacksonxmlTest.java | 12 --
.../camel/itest/karaf/CamelJasyptTest.java | 8 +-
.../apache/camel/itest/karaf/CamelJaxbTest.java | 12 --
.../apache/camel/itest/karaf/CamelJbpmTest.java | 6 -
.../camel/itest/karaf/CamelJcloudsTest.java | 6 -
.../apache/camel/itest/karaf/CamelJcrTest.java | 6 -
.../itest/karaf/CamelJdbcAggregatorTest.java | 41 -----
.../apache/camel/itest/karaf/CamelJdbcTest.java | 6 -
.../camel/itest/karaf/CamelJetty8Test.java | 41 -----
.../camel/itest/karaf/CamelJetty9Test.java | 40 -----
.../camel/itest/karaf/CamelJettyTest.java | 6 -
.../camel/itest/karaf/CamelJgroupsTest.java | 6 -
.../apache/camel/itest/karaf/CamelJibxTest.java | 12 --
.../apache/camel/itest/karaf/CamelJingTest.java | 6 -
.../apache/camel/itest/karaf/CamelJmsTest.java | 6 -
.../apache/camel/itest/karaf/CamelJmxTest.java | 6 -
.../apache/camel/itest/karaf/CamelJoltTest.java | 6 -
.../camel/itest/karaf/CamelJosqlTest.java | 8 +-
.../apache/camel/itest/karaf/CamelJpaTest.java | 6 -
.../camel/itest/karaf/CamelJsonpathTest.java | 6 -
.../camel/itest/karaf/CamelJt400Test.java | 6 -
.../apache/camel/itest/karaf/CamelJuelTest.java | 8 +-
.../camel/itest/karaf/CamelJxpathTest.java | 6 -
.../camel/itest/karaf/CamelKafkaTest.java | 6 -
.../camel/itest/karaf/CamelKratiTest.java | 6 -
.../camel/itest/karaf/CamelKubernetesTest.java | 6 -
.../apache/camel/itest/karaf/CamelLdapTest.java | 6 -
.../camel/itest/karaf/CamelLinkedinTest.java | 8 +-
.../camel/itest/karaf/CamelLuceneTest.java | 6 -
.../apache/camel/itest/karaf/CamelLzfTest.java | 12 --
.../apache/camel/itest/karaf/CamelMailTest.java | 10 +-
.../camel/itest/karaf/CamelMetricsTest.java | 6 -
.../camel/itest/karaf/CamelMina2Test.java | 6 -
.../apache/camel/itest/karaf/CamelMinaTest.java | 6 -
.../apache/camel/itest/karaf/CamelMllpTest.java | 6 -
.../camel/itest/karaf/CamelMongodbTest.java | 6 -
.../apache/camel/itest/karaf/CamelMqttTest.java | 6 -
.../apache/camel/itest/karaf/CamelMsvTest.java | 6 -
.../camel/itest/karaf/CamelMustacheTest.java | 6 -
.../apache/camel/itest/karaf/CamelMvelTest.java | 6 -
.../camel/itest/karaf/CamelMyBatisTest.java | 6 -
.../apache/camel/itest/karaf/CamelNatsTest.java | 6 -
.../camel/itest/karaf/CamelNetty4HttpTest.java | 6 -
.../camel/itest/karaf/CamelNetty4Test.java | 6 -
.../camel/itest/karaf/CamelNettyHttpTest.java | 6 -
.../camel/itest/karaf/CamelNettyTest.java | 6 -
.../apache/camel/itest/karaf/CamelOgnlTest.java | 6 -
.../camel/itest/karaf/CamelOlingo2Test.java | 8 +-
.../camel/itest/karaf/CamelOpenshiftTest.java | 6 -
.../camel/itest/karaf/CamelOptaplannerTest.java | 6 -
.../apache/camel/itest/karaf/CamelPahoTest.java | 6 -
.../camel/itest/karaf/CamelPaxloggingTest.java | 6 -
.../apache/camel/itest/karaf/CamelPdfTest.java | 6 -
.../camel/itest/karaf/CamelPgeventTest.java | 6 -
.../camel/itest/karaf/CamelPrinterTest.java | 8 +-
.../camel/itest/karaf/CamelProtobufTest.java | 12 --
.../camel/itest/karaf/CamelQuartz2Test.java | 6 -
.../camel/itest/karaf/CamelQuartzTest.java | 6 -
.../camel/itest/karaf/CamelQuickFixTest.java | 6 -
.../camel/itest/karaf/CamelRabbitmqTest.java | 7 -
.../camel/itest/karaf/CamelRestletTest.java | 6 -
.../apache/camel/itest/karaf/CamelRmiTest.java | 6 -
.../camel/itest/karaf/CamelRouteboxTest.java | 6 -
.../apache/camel/itest/karaf/CamelRssTest.java | 6 -
.../apache/camel/itest/karaf/CamelRxTest.java | 8 +-
.../camel/itest/karaf/CamelSalesforceTest.java | 6 -
.../itest/karaf/CamelSapNetweaverTest.java | 6 -
.../camel/itest/karaf/CamelSaxonTest.java | 10 +-
.../camel/itest/karaf/CamelScalaTest.java | 9 +-
.../camel/itest/karaf/CamelSchematronTest.java | 6 -
.../camel/itest/karaf/CamelScriptTest.java | 10 +-
.../camel/itest/karaf/CamelServicenowTest.java | 6 -
.../camel/itest/karaf/CamelServletTest.java | 6 -
.../apache/camel/itest/karaf/CamelSipTest.java | 6 -
.../apache/camel/itest/karaf/CamelSjmsTest.java | 6 -
.../camel/itest/karaf/CamelSlackTest.java | 6 -
.../apache/camel/itest/karaf/CamelSmppTest.java | 6 -
.../camel/itest/karaf/CamelSnakeyamlTest.java | 11 +-
.../apache/camel/itest/karaf/CamelSnmpTest.java | 6 -
.../apache/camel/itest/karaf/CamelSoapTest.java | 13 --
.../apache/camel/itest/karaf/CamelSolrTest.java | 6 -
.../camel/itest/karaf/CamelSplunkTest.java | 6 -
.../camel/itest/karaf/CamelSpringBatchTest.java | 6 -
.../itest/karaf/CamelSpringJavaconfigTest.java | 9 +-
.../camel/itest/karaf/CamelSpringLdapTest.java | 7 -
.../camel/itest/karaf/CamelSpringRedisTest.java | 6 -
.../itest/karaf/CamelSpringWebServiceTest.java | 6 -
.../apache/camel/itest/karaf/CamelSqlTest.java | 6 -
.../apache/camel/itest/karaf/CamelSshTest.java | 6 -
.../apache/camel/itest/karaf/CamelStAXTest.java | 6 -
.../camel/itest/karaf/CamelStompTest.java | 6 -
.../camel/itest/karaf/CamelStreamTest.java | 6 -
.../itest/karaf/CamelStringTemplateTest.java | 6 -
.../camel/itest/karaf/CamelSwaggerJavaTest.java | 8 +-
.../camel/itest/karaf/CamelSwaggerTest.java | 8 +-
.../camel/itest/karaf/CamelSyslogTest.java | 12 --
.../camel/itest/karaf/CamelTagsoupTest.java | 12 --
.../camel/itest/karaf/CamelTarfileTest.java | 12 --
.../camel/itest/karaf/CamelTestSpringTest.java | 8 +-
.../apache/camel/itest/karaf/CamelTestTest.java | 8 +-
.../camel/itest/karaf/CamelTwitterTest.java | 6 -
.../camel/itest/karaf/CamelUndertowTest.java | 7 +-
.../camel/itest/karaf/CamelUrlrewriteTest.java | 8 +-
.../camel/itest/karaf/CamelVelocityTest.java | 6 -
.../camel/itest/karaf/CamelVertxTest.java | 12 +-
.../camel/itest/karaf/CamelWeatherTest.java | 6 -
.../camel/itest/karaf/CamelWebsocketTest.java | 6 -
.../camel/itest/karaf/CamelXmlbeansTest.java | 8 +-
.../camel/itest/karaf/CamelXmljsonTest.java | 12 --
.../camel/itest/karaf/CamelXmlrpcTest.java | 6 -
.../camel/itest/karaf/CamelXmlsecurityTest.java | 12 --
.../apache/camel/itest/karaf/CamelXmppTest.java | 6 -
.../camel/itest/karaf/CamelXstreamTest.java | 21 +--
.../apache/camel/itest/karaf/CamelYamlTest.java | 17 +-
.../camel/itest/karaf/CamelYammerTest.java | 6 -
.../camel/itest/karaf/CamelZipfileTest.java | 12 --
.../camel/itest/karaf/CamelZookeeperTest.java | 6 -
191 files changed, 137 insertions(+), 1658 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/pom.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/pom.xml b/tests/camel-itest-karaf/pom.xml
index e7ee566..47f1c60 100644
--- a/tests/camel-itest-karaf/pom.xml
+++ b/tests/camel-itest-karaf/pom.xml
@@ -30,6 +30,10 @@
<name>Camel :: Integration Tests :: Karaf</name>
<description>Performs Karaf compliance integration tests</description>
+ <properties>
+ <karf-test-version>${karaf4-version}</karf-test-version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
@@ -54,7 +58,7 @@
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>apache-karaf</artifactId>
- <version>${karaf-version}</version>
+ <version>${karf-test-version}</version>
<type>tar.gz</type>
<scope>test</scope>
<exclusions>
@@ -231,18 +235,15 @@
</plugins>
</build>
</profile>
+
+ <!-- test with older karaf 3.x -->
<profile>
<id>karaf3</id>
<properties>
- <karaf-version>${karaf3-version}</karaf-version>
- </properties>
- </profile>
- <profile>
- <id>karaf4</id>
- <properties>
- <karaf-version>${karaf4-version}</karaf-version>
+ <karf-test-version>${karaf3-version}</karf-test-version>
</properties>
</profile>
+
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
index 29faff6..609c479 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
@@ -26,25 +26,23 @@ import java.util.Collection;
import java.util.Dictionary;
import java.util.EnumSet;
import java.util.Enumeration;
-import java.util.List;
import java.util.Properties;
import javax.inject.Inject;
import org.apache.camel.CamelContext;
import org.apache.camel.Component;
-import org.apache.camel.blueprint.BlueprintCamelContext;
-import org.apache.camel.impl.DefaultRouteContext;
-import org.apache.camel.model.DataFormatDefinition;
+import org.apache.camel.spi.DataFormat;
+import org.apache.camel.spi.Language;
import org.apache.karaf.features.FeaturesService;
import org.junit.After;
import org.junit.Before;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.CoreOptions;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.ProbeBuilder;
import org.ops4j.pax.exam.TestProbeBuilder;
import org.ops4j.pax.exam.karaf.options.KarafDistributionOption;
import org.ops4j.pax.exam.karaf.options.LogLevelOption;
-import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
import org.ops4j.pax.exam.options.UrlReference;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
@@ -93,6 +91,16 @@ public abstract class AbstractFeatureTest {
LOG.info("tearDown()");
}
+ protected void installCamelFeature(String mainFeature) throws Exception {
+ if (!mainFeature.startsWith("camel-")) {
+ mainFeature = "camel-" + mainFeature;
+ }
+ LOG.info("Install main feature: {}", mainFeature);
+ // do not refresh bundles causing out bundle context to be invalid
+ // TODO: see if we can find a way maybe to install camel.xml as bundle/feature instead of part of unit test (see src/test/resources/OSGI-INF/blueprint)
+ featuresService.installFeature(mainFeature, EnumSet.of(FeaturesService.Option.NoAutoRefreshBundles));
+ }
+
protected void testComponent(String component) throws Exception {
testComponent("camel-" + component, component);
}
@@ -100,10 +108,7 @@ public abstract class AbstractFeatureTest {
protected void testComponent(String mainFeature, String component) throws Exception {
LOG.info("Looking up CamelContext(myCamel) in OSGi Service Registry");
- LOG.info("Install main feature: {}", mainFeature);
- // do not refresh bundles causing out bundle context to be invalid
- // TODO: see if we can find a way maybe to install camel.xml as bundle/feature instead of part of unit test (see src/test/resources/OSGI-INF/blueprint)
- featuresService.installFeature(mainFeature, EnumSet.of(FeaturesService.Option.NoAutoRefreshBundles));
+ installCamelFeature(mainFeature);
CamelContext camelContext = getOsgiService(bundleContext, CamelContext.class, "(camel.context.name=myCamel)", 20000);
assertNotNull("Cannot find CamelContext with name myCamel", camelContext);
@@ -115,59 +120,42 @@ public abstract class AbstractFeatureTest {
LOG.info("Found Camel component: {} instance: {} with className: {}", component, comp, comp.getClass());
}
- protected void testComponent() throws Exception {
- testComponent(extractName(getClass()));
+ protected void testDataFormat(String dataFormat) throws Exception {
+ testDataFormat("camel-" + dataFormat, dataFormat);
}
- protected void testDataFormat(String format) throws Exception {
- long max = System.currentTimeMillis() + 10000;
- while (true) {
- try {
- DataFormatDefinition dataFormatDefinition = createDataformatDefinition(format);
- assertNotNull(dataFormatDefinition);
- assertNotNull(dataFormatDefinition.getDataFormat(new DefaultRouteContext(createCamelContext())));
- return;
- } catch (Throwable t) {
- if (System.currentTimeMillis() < max) {
- Thread.sleep(1000);
- } else {
- throw t;
- }
- }
- }
- }
+ protected void testDataFormat(String mainFeature, String dataFormat) throws Exception {
+ LOG.info("Looking up CamelContext(myCamel) in OSGi Service Registry");
- protected DataFormatDefinition createDataformatDefinition(String format) {
- return null;
- }
+ installCamelFeature(mainFeature);
- protected void testLanguage(String lang) throws Exception {
- long max = System.currentTimeMillis() + 10000;
- while (true) {
- try {
- assertNotNull(createCamelContext().resolveLanguage(lang));
- return;
- } catch (Throwable t) {
- if (System.currentTimeMillis() < max) {
- Thread.sleep(1000);
- } else {
- throw t;
- }
- }
- }
+ CamelContext camelContext = getOsgiService(bundleContext, CamelContext.class, "(camel.context.name=myCamel)", 20000);
+ assertNotNull("Cannot find CamelContext with name myCamel", camelContext);
+
+ LOG.info("Getting Camel dataformat: {}", dataFormat);
+ DataFormat df = camelContext.resolveDataFormat(dataFormat);
+ assertNotNull("Cannot get dataformat with name: " + dataFormat, df);
+
+ LOG.info("Found Camel dataformat: {} instance: {} with className: {}", dataFormat, df, df.getClass());
}
- @Deprecated
- protected CamelContext createCamelContext() throws Exception {
- LOG.info("Creating CamelContext using BundleContext: {} and BlueprintContainer: {}", bundleContext, blueprintContainer);
- setThreadContextClassLoader();
- BlueprintCamelContext context = new BlueprintCamelContext(bundleContext, blueprintContainer);
- return context;
+ protected void testLanguage(String language) throws Exception {
+ testLanguage("camel-" + language, language);
}
- protected void setThreadContextClassLoader() {
- // set the thread context classloader current bundle classloader
- Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
+ protected void testLanguage(String mainFeature, String language) throws Exception {
+ LOG.info("Looking up CamelContext(myCamel) in OSGi Service Registry");
+
+ installCamelFeature(mainFeature);
+
+ CamelContext camelContext = getOsgiService(bundleContext, CamelContext.class, "(camel.context.name=myCamel)", 20000);
+ assertNotNull("Cannot find CamelContext with name myCamel", camelContext);
+
+ LOG.info("Getting Camel language: {}", language);
+ Language lan = camelContext.resolveLanguage(language);
+ assertNotNull("Cannot get language with name: " + language, lan);
+
+ LOG.info("Found Camel language: {} instance: {} with className: {}", language, lan, lan.getClass());
}
public static String extractName(Class<?> clazz) {
@@ -191,7 +179,7 @@ public abstract class AbstractFeatureTest {
artifactId("apache-camel").
versionAsInProject().type("xml/features");
}
-
+
private static void switchPlatformEncodingToUTF8() {
try {
System.setProperty("file.encoding", "UTF-8");
@@ -202,7 +190,7 @@ public abstract class AbstractFeatureTest {
throw new RuntimeException(e);
}
}
-
+
private static String getKarafVersion() {
InputStream ins = AbstractFeatureTest.class.getResourceAsStream("/META-INF/maven/dependencies.properties");
Properties p = new Properties();
@@ -217,64 +205,46 @@ public abstract class AbstractFeatureTest {
}
if (karafVersion == null) {
// setup the default version of it
- karafVersion = "2.4.4";
+ karafVersion = "4.0.4";
}
return karafVersion;
}
- public static MavenArtifactProvisionOption getJUnitBundle() {
- MavenArtifactProvisionOption mavenOption = mavenBundle().groupId("org.apache.servicemix.bundles")
- .artifactId("org.apache.servicemix.bundles.junit");
- mavenOption.versionAsInProject().start(true).startLevel(10);
- return mavenOption;
- }
- public static Option[] configure(String mainFeature, String... extraFeatures) {
+ @Configuration
+ public static Option[] configure() {
switchPlatformEncodingToUTF8();
String karafVersion = getKarafVersion();
LOG.info("*** Apache Karaf version is " + karafVersion + " ***");
- List<String> list = new ArrayList<String>();
- list.add("camel-core");
- list.add("camel-blueprint");
- list.add("camel-spring");
- // we install main feature later
- for (String extra : extraFeatures) {
- list.add("camel-" + extra);
- }
- String[] features = list.toArray(new String[list.size()]);
-
- Option[] options = new Option[] {
- // for remote debugging
- //org.ops4j.pax.exam.CoreOptions.vmOption("-Xdebug"),
- //org.ops4j.pax.exam.CoreOptions.vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5008"),
+ Option[] options = new Option[]{
+ // for remote debugging
+ //org.ops4j.pax.exam.CoreOptions.vmOption("-Xdebug"),
+ //org.ops4j.pax.exam.CoreOptions.vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5008"),
- // we need INFO logging otherwise we cannot see what happens
- new LogLevelOption(LogLevelOption.LogLevel.INFO),
+ // we need INFO logging otherwise we cannot see what happens
+ new LogLevelOption(LogLevelOption.LogLevel.INFO),
- KarafDistributionOption.karafDistributionConfiguration()
- .frameworkUrl(maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("tar.gz").versionAsInProject())
- .karafVersion(karafVersion)
- .name("Apache Karaf")
- .useDeployFolder(false).unpackDirectory(new File("target/paxexam/unpack/")),
+ KarafDistributionOption.karafDistributionConfiguration()
+ .frameworkUrl(maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("tar.gz").versionAsInProject())
+ .karafVersion(karafVersion)
+ .name("Apache Karaf")
+ .useDeployFolder(false).unpackDirectory(new File("target/paxexam/unpack/")),
- // keep the folder so we can look inside when something fails
- KarafDistributionOption.keepRuntimeFolder(),
+ // keep the folder so we can look inside when something fails
+ KarafDistributionOption.keepRuntimeFolder(),
- vmOption("-Dfile.encoding=UTF-8"),
+ vmOption("-Dfile.encoding=UTF-8"),
- CoreOptions.junitBundles(),
+ // install junit
+ CoreOptions.junitBundles(),
- // install the features
- KarafDistributionOption.features(getCamelKarafFeatureUrl(), features)
+ // install camel
+ KarafDistributionOption.features(getCamelKarafFeatureUrl(), "camel")
};
return options;
}
- protected Option[] configureComponent() {
- return configure(extractName(getClass()));
- }
-
@SuppressWarnings("unchecked")
public static <T> T getOsgiService(BundleContext bundleContext, Class<T> type, String filter, long timeout) {
ServiceTracker tracker;
@@ -338,7 +308,7 @@ public abstract class AbstractFeatureTest {
* Provides an iterable collection of references, even if the original array is <code>null</code>.
*/
private static Collection<ServiceReference> asCollection(ServiceReference[] references) {
- return references == null ? new ArrayList<ServiceReference>(0) : Arrays.asList(references);
+ return references == null ? new ArrayList<ServiceReference>(0) : Arrays.asList(references);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAhcTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAhcTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAhcTest.java
index f888979..ccd0aa4 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAhcTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAhcTest.java
@@ -18,21 +18,16 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
public class CamelAhcTest extends AbstractFeatureTest {
+ public static final String COMPONENT = extractName(CamelAhcTest.class);
+
@Test
public void test() throws Exception {
- testComponent();
- }
-
- @Configuration
- public Option[] configure() {
- return configureComponent();
+ testComponent(COMPONENT);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAhcWsTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAhcWsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAhcWsTest.java
index 5ec1ef1..212cef7 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAhcWsTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAhcWsTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -31,9 +29,4 @@ public class CamelAhcWsTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
- @Configuration
- public Option[] configure() {
- return configure(COMPONENT);
- }
-
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAmqpTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAmqpTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAmqpTest.java
index 99cf5ac..c7ba548 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAmqpTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAmqpTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -32,9 +30,4 @@ public class CamelAmqpTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelApnsTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelApnsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelApnsTest.java
index a743e1f..04cdf43 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelApnsTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelApnsTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -32,9 +30,4 @@ public class CamelApnsTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAtmosphereWebsocketTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAtmosphereWebsocketTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAtmosphereWebsocketTest.java
index 9a85372..3745453 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAtmosphereWebsocketTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAtmosphereWebsocketTest.java
@@ -18,12 +18,11 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
public class CamelAtmosphereWebsocketTest extends AbstractFeatureTest {
+
public static final String COMPONENT = extractName(CamelAtmosphereWebsocketTest.class);
@Test
@@ -31,9 +30,4 @@ public class CamelAtmosphereWebsocketTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
- @Configuration
- public Option[] configure() {
- return configure(COMPONENT);
- }
-
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAtomTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAtomTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAtomTest.java
index cd5cb1d..9051fea 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAtomTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAtomTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -32,9 +30,4 @@ public class CamelAtomTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAvroTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAvroTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAvroTest.java
index b5a0ebb..cd66266 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAvroTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAvroTest.java
@@ -16,31 +16,18 @@
*/
package org.apache.camel.itest.karaf;
-import org.apache.camel.model.DataFormatDefinition;
-import org.apache.camel.model.dataformat.AvroDataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
public class CamelAvroTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelAvroTest.class);
-
- protected DataFormatDefinition createDataformatDefinition(String format) {
- return new AvroDataFormat();
- }
@Test
public void test() throws Exception {
testDataFormat(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAwsTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAwsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAwsTest.java
index 119bd95..5db6ef5 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAwsTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAwsTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -29,19 +27,14 @@ public class CamelAwsTest extends AbstractFeatureTest {
@Test
public void test() throws Exception {
- testComponent("aws-cw");
- testComponent("aws-ddb");
- testComponent("aws-s3");
- testComponent("aws-sdb");
- testComponent("aws-ses");
- testComponent("aws-sns");
- testComponent("aws-sqs");
- testComponent("aws-swf");
- }
-
- @Configuration
- public static Option[] configure() {
- return configure("aws");
+ testComponent(COMPONENT, "aws-cw");
+ testComponent(COMPONENT, "aws-ddb");
+ testComponent(COMPONENT, "aws-s3");
+ testComponent(COMPONENT, "aws-sdb");
+ testComponent(COMPONENT, "aws-ses");
+ testComponent(COMPONENT, "aws-sns");
+ testComponent(COMPONENT, "aws-sqs");
+ testComponent(COMPONENT, "aws-swf");
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBamTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBamTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBamTest.java
index 49cc025..c934858 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBamTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBamTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -29,12 +27,7 @@ public class CamelBamTest extends AbstractFeatureTest {
@Test
public void test() throws Exception {
- // TODO: how to actually test ?
- }
-
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
+ installCamelFeature(COMPONENT);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBarcodeTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBarcodeTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBarcodeTest.java
index e98e006..5dbea96 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBarcodeTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBarcodeTest.java
@@ -16,32 +16,18 @@
*/
package org.apache.camel.itest.karaf;
-import org.apache.camel.model.DataFormatDefinition;
-import org.apache.camel.model.dataformat.BarcodeDataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
public class CamelBarcodeTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelBarcodeTest.class);
-
- protected DataFormatDefinition createDataformatDefinition(String format) {
- BarcodeDataFormat dataformate = new BarcodeDataFormat();
- return dataformate;
- }
@Test
public void test() throws Exception {
testDataFormat(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBase64Test.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBase64Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBase64Test.java
index 3ba0fdf..239318a 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBase64Test.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBase64Test.java
@@ -16,31 +16,18 @@
*/
package org.apache.camel.itest.karaf;
-import org.apache.camel.model.DataFormatDefinition;
-import org.apache.camel.model.dataformat.Base64DataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
public class CamelBase64Test extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelBase64Test.class);
-
- protected DataFormatDefinition createDataformatDefinition(String format) {
- return new Base64DataFormat();
- }
@Test
public void test() throws Exception {
testDataFormat(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanValidatorTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanValidatorTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanValidatorTest.java
index b3a5352..5159295 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanValidatorTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanValidatorTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -32,9 +30,4 @@ public class CamelBeanValidatorTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanioTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanioTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanioTest.java
index 73ced33..6975352 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanioTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanioTest.java
@@ -16,31 +16,18 @@
*/
package org.apache.camel.itest.karaf;
-import org.apache.camel.model.DataFormatDefinition;
-import org.apache.camel.model.dataformat.BeanioDataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
public class CamelBeanioTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelBeanioTest.class);
-
- protected DataFormatDefinition createDataformatDefinition(String format) {
- return new BeanioDataFormat();
- }
@Test
public void test() throws Exception {
testDataFormat(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanstalkTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanstalkTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanstalkTest.java
index 7a79ba5..69e851d 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanstalkTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanstalkTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -32,9 +30,4 @@ public class CamelBeanstalkTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBindyTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBindyTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBindyTest.java
index 28cdc36..cb47be2 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBindyTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBindyTest.java
@@ -16,33 +16,18 @@
*/
package org.apache.camel.itest.karaf;
-import org.apache.camel.model.DataFormatDefinition;
-import org.apache.camel.model.dataformat.BindyDataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
public class CamelBindyTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelBindyTest.class);
-
- protected DataFormatDefinition createDataformatDefinition(String format) {
- BindyDataFormat dataformate = new BindyDataFormat();
- dataformate.setClassType(String.class);
- return dataformate;
- }
@Test
public void test() throws Exception {
testDataFormat(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBoonTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBoonTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBoonTest.java
index 5b5901b..f24f8fe 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBoonTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBoonTest.java
@@ -16,12 +16,8 @@
*/
package org.apache.camel.itest.karaf;
-import org.apache.camel.model.DataFormatDefinition;
-import org.apache.camel.model.dataformat.BoonDataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -29,18 +25,9 @@ public class CamelBoonTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelBoonTest.class);
- protected DataFormatDefinition createDataformatDefinition(String format) {
- return new BoonDataFormat();
- }
-
@Test
public void test() throws Exception {
testDataFormat(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBoxTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBoxTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBoxTest.java
index c88e2bc..ac0f797 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBoxTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBoxTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -32,9 +30,4 @@ public class CamelBoxTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBraintreeTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBraintreeTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBraintreeTest.java
index 7261725..c58fad5 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBraintreeTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBraintreeTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -32,9 +30,4 @@ public class CamelBraintreeTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCacheTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCacheTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCacheTest.java
index 1cb2d9b..fcabe45 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCacheTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCacheTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -32,9 +30,4 @@ public class CamelCacheTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCassandraqlTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCassandraqlTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCassandraqlTest.java
index 5412188..d54da7b 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCassandraqlTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCassandraqlTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -32,9 +30,4 @@ public class CamelCassandraqlTest extends AbstractFeatureTest {
testComponent(COMPONENT, "cql");
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCastorTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCastorTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCastorTest.java
index 87807e0..f383d40 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCastorTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCastorTest.java
@@ -16,31 +16,18 @@
*/
package org.apache.camel.itest.karaf;
-import org.apache.camel.model.DataFormatDefinition;
-import org.apache.camel.model.dataformat.CastorDataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
public class CamelCastorTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelCastorTest.class);
-
- protected DataFormatDefinition createDataformatDefinition(String format) {
- return new CastorDataFormat();
- }
@Test
public void test() throws Exception {
testDataFormat(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelChunkTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelChunkTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelChunkTest.java
index 827181e..86d2ee6 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelChunkTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelChunkTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -32,9 +30,5 @@ public class CamelChunkTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmSmsTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmSmsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmSmsTest.java
index 74d699e..0e29c11 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmSmsTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmSmsTest.java
@@ -18,12 +18,11 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
public class CamelCmSmsTest extends AbstractFeatureTest {
+
public static final String COMPONENT = extractName(CamelCmSmsTest.class);
@Test
@@ -31,9 +30,5 @@ public class CamelCmSmsTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmisTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmisTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmisTest.java
index 8db85e2..a2fe2ec 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmisTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmisTest.java
@@ -18,12 +18,11 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
public class CamelCmisTest extends AbstractFeatureTest {
+
public static final String COMPONENT = extractName(CamelCmisTest.class);
@Test
@@ -31,9 +30,5 @@ public class CamelCmisTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCometdTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCometdTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCometdTest.java
index dc8cb70..d3ec3f1 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCometdTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCometdTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -32,9 +30,4 @@ public class CamelCometdTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelContextTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelContextTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelContextTest.java
index 3790334..b01efd7 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelContextTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelContextTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -32,9 +30,4 @@ public class CamelContextTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCouchDBTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCouchDBTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCouchDBTest.java
index 7e2c126..e8d039e 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCouchDBTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCouchDBTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -32,9 +30,4 @@ public class CamelCouchDBTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCryptoTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCryptoTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCryptoTest.java
index 0be6670..021d404 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCryptoTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCryptoTest.java
@@ -16,12 +16,8 @@
*/
package org.apache.camel.itest.karaf;
-import org.apache.camel.model.DataFormatDefinition;
-import org.apache.camel.model.dataformat.CryptoDataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -29,18 +25,9 @@ public class CamelCryptoTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelCryptoTest.class);
- protected DataFormatDefinition createDataformatDefinition(String format) {
- return new CryptoDataFormat();
- }
-
@Test
public void test() throws Exception {
testDataFormat(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCsvTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCsvTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCsvTest.java
index c389eba..15b9723 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCsvTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCsvTest.java
@@ -16,12 +16,8 @@
*/
package org.apache.camel.itest.karaf;
-import org.apache.camel.model.DataFormatDefinition;
-import org.apache.camel.model.dataformat.CsvDataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -29,19 +25,9 @@ public class CamelCsvTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelCsvTest.class);
- protected DataFormatDefinition createDataformatDefinition(String format) {
- return new CsvDataFormat();
- }
-
-
@Test
public void test() throws Exception {
testDataFormat(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java
index 6c55b9f..284de4a 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -29,14 +27,9 @@ public class CamelCxfTest extends AbstractFeatureTest {
@Test
public void test() throws Exception {
- testComponent(COMPONENT);
- testComponent("cxfrs");
- testComponent("cxfbean");
- }
-
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT, "cxf-jaxb");
+ testComponent(COMPONENT, "cxf");
+ testComponent(COMPONENT, "cxfrs");
+ testComponent(COMPONENT, "cxfbean");
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDisruptorTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDisruptorTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDisruptorTest.java
index 1dcd0b0..423098d 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDisruptorTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDisruptorTest.java
@@ -18,22 +18,17 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
public class CamelDisruptorTest extends AbstractFeatureTest {
+ public static final String COMPONENT = extractName(CamelDisruptorTest.class);
+
@Test
public void test() throws Exception {
- testComponent("disruptor");
- testComponent("disruptor-vm");
- }
-
- @Configuration
- public static Option[] configure() {
- return configure("disruptor");
+ testComponent(COMPONENT, "disruptor");
+ testComponent(COMPONENT, "disruptor-vm");
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDnsTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDnsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDnsTest.java
index 4e68a2d..5534c46 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDnsTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDnsTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -32,9 +30,4 @@ public class CamelDnsTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDockerTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDockerTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDockerTest.java
index 5e269d4..445ec61 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDockerTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDockerTest.java
@@ -19,8 +19,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -34,9 +32,4 @@ public class CamelDockerTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDozerTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDozerTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDozerTest.java
index c6aeed7..f6d5cf1 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDozerTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDozerTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -32,9 +30,4 @@ public class CamelDozerTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDropboxTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDropboxTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDropboxTest.java
index 1c5e9d3..d0dd452 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDropboxTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDropboxTest.java
@@ -18,21 +18,16 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
public class CamelDropboxTest extends AbstractFeatureTest {
+ public static final String COMPONENT = extractName(CamelDropboxTest.class);
+
@Test
public void test() throws Exception {
- testComponent();
- }
-
- @Configuration
- public Option[] configure() {
- return configureComponent();
+ testComponent(COMPONENT);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElasticsearchTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElasticsearchTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElasticsearchTest.java
index cfc4d29..6d5aaf2 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElasticsearchTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElasticsearchTest.java
@@ -18,13 +18,11 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
public class CamelElasticsearchTest extends AbstractFeatureTest {
-
+
public static final String COMPONENT = extractName(CamelElasticsearchTest.class);
@Test
@@ -32,9 +30,4 @@ public class CamelElasticsearchTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElsqlTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElsqlTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElsqlTest.java
index 78eb7b2..e77722d 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElsqlTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElsqlTest.java
@@ -18,13 +18,11 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
public class CamelElsqlTest extends AbstractFeatureTest {
-
+
public static final String COMPONENT = extractName(CamelElsqlTest.class);
@Test
@@ -32,9 +30,4 @@ public class CamelElsqlTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelEtcdTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelEtcdTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelEtcdTest.java
index 50cdc81..62968ee 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelEtcdTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelEtcdTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -32,9 +30,4 @@ public class CamelEtcdTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelEventadminTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelEventadminTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelEventadminTest.java
index 285491a..6f81fd4 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelEventadminTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelEventadminTest.java
@@ -18,13 +18,11 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
public class CamelEventadminTest extends AbstractFeatureTest {
-
+
public static final String COMPONENT = extractName(CamelEventadminTest.class);
@Test
@@ -32,9 +30,4 @@ public class CamelEventadminTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelExecTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelExecTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelExecTest.java
index 0711891..731b105 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelExecTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelExecTest.java
@@ -18,13 +18,11 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
public class CamelExecTest extends AbstractFeatureTest {
-
+
public static final String COMPONENT = extractName(CamelExecTest.class);
@Test
@@ -32,9 +30,4 @@ public class CamelExecTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFacebookTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFacebookTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFacebookTest.java
index a7d2540..a598d90 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFacebookTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFacebookTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -32,10 +30,5 @@ public class CamelFacebookTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFlatpackTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFlatpackTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFlatpackTest.java
index 236ec0c..b38af23 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFlatpackTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFlatpackTest.java
@@ -16,12 +16,8 @@
*/
package org.apache.camel.itest.karaf;
-import org.apache.camel.model.DataFormatDefinition;
-import org.apache.camel.model.dataformat.FlatpackDataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -29,18 +25,9 @@ public class CamelFlatpackTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelFlatpackTest.class);
- protected DataFormatDefinition createDataformatDefinition(String format) {
- return new FlatpackDataFormat();
- }
-
@Test
public void test() throws Exception {
testDataFormat(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFopTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFopTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFopTest.java
index e613c68..cb93dfa 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFopTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFopTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -32,9 +30,4 @@ public class CamelFopTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFreemarkerTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFreemarkerTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFreemarkerTest.java
index edceb4d..e610b18 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFreemarkerTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFreemarkerTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -32,9 +30,4 @@ public class CamelFreemarkerTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFtpTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFtpTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFtpTest.java
index d28efda..be0717c 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFtpTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFtpTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -29,13 +27,8 @@ public class CamelFtpTest extends AbstractFeatureTest {
@Test
public void test() throws Exception {
- testComponent(COMPONENT);
- testComponent("sftp");
- }
-
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
+ testComponent(COMPONENT, "ftp");
+ testComponent(COMPONENT, "sftp");
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGangliaTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGangliaTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGangliaTest.java
index 5c3df1e..67602ed 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGangliaTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGangliaTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -32,9 +30,4 @@ public class CamelGangliaTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGeocoderTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGeocoderTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGeocoderTest.java
index ff4e6af..ef79d88 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGeocoderTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGeocoderTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -32,9 +30,4 @@ public class CamelGeocoderTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGitTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGitTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGitTest.java
index b2fee06..2357085 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGitTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGitTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -32,9 +30,4 @@ public class CamelGitTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9e7714a7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGithubTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGithubTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGithubTest.java
index 15ffbb4..3e71039 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGithubTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGithubTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.karaf;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
@@ -32,9 +30,4 @@ public class CamelGithubTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
}