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 2012/11/12 11:11:16 UTC
svn commit: r1408237 - in /camel/trunk/tests:
camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/
camel-itest-karaf/src/test/resources/org/apache/camel/itest/karaf/
camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/
camel-itest-osgi/...
Author: davsclaus
Date: Mon Nov 12 10:11:15 2012
New Revision: 1408237
URL: http://svn.apache.org/viewvc?rev=1408237&view=rev
Log:
Added custom.properties to osgi tests
Added:
camel/trunk/tests/camel-itest-karaf/src/test/resources/org/apache/camel/itest/karaf/custom.properties (with props)
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/custom.properties (with props)
Modified:
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
Modified: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java?rev=1408237&r1=1408236&r2=1408237&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java (original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java Mon Nov 12 10:11:15 2012
@@ -161,6 +161,7 @@ public abstract class AbstractFeatureTes
KarafDistributionOption.keepRuntimeFolder(),
// override the config.properties (to fix pax-exam bug)
replaceConfigurationFile("etc/config.properties", new File("src/test/resources/org/apache/camel/itest/karaf/config.properties")),
+ replaceConfigurationFile("etc/custom.properties", new File("src/test/resources/org/apache/camel/itest/karaf/custom.properties")),
// install the cxf jaxb spec as the karaf doesn't provide it by default
scanFeatures(getCamelKarafFeatureUrl(), "cxf-jaxb", "camel-core", "camel-spring", "camel-" + feature)};
Added: camel/trunk/tests/camel-itest-karaf/src/test/resources/org/apache/camel/itest/karaf/custom.properties
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/resources/org/apache/camel/itest/karaf/custom.properties?rev=1408237&view=auto
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/resources/org/apache/camel/itest/karaf/custom.properties (added)
+++ camel/trunk/tests/camel-itest-karaf/src/test/resources/org/apache/camel/itest/karaf/custom.properties Mon Nov 12 10:11:15 2012
@@ -0,0 +1,30 @@
+################################################################################
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+
+#
+# All the values specified here will override the default values given
+# in config.properties.
+#
+
+karaf.systemBundlesStartLevel=50
+
+#
+# You can place any customized configuration here.
+#
+
Propchange: camel/trunk/tests/camel-itest-karaf/src/test/resources/org/apache/camel/itest/karaf/custom.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/tests/camel-itest-karaf/src/test/resources/org/apache/camel/itest/karaf/custom.properties
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/tests/camel-itest-karaf/src/test/resources/org/apache/camel/itest/karaf/custom.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java?rev=1408237&r1=1408236&r2=1408237&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java Mon Nov 12 10:11:15 2012
@@ -138,6 +138,7 @@ public class OSGiIntegrationTestSupport
KarafDistributionOption.keepRuntimeFolder(),
// override the config.properties (to fix pax-exam bug)
replaceConfigurationFile("etc/config.properties", new File("src/test/resources/org/apache/camel/itest/karaf/config.properties")),
+ replaceConfigurationFile("etc/custom.properties", new File("src/test/resources/org/apache/camel/itest/karaf/custom.properties")),
// install the cxf jaxb spec as the karaf doesn't provide it by default
scanFeatures(getCamelKarafFeatureUrl(), "cxf-jaxb", "camel-core", "camel-spring", "camel-test")};
Added: camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/custom.properties
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/custom.properties?rev=1408237&view=auto
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/custom.properties (added)
+++ camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/custom.properties Mon Nov 12 10:11:15 2012
@@ -0,0 +1,30 @@
+################################################################################
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+
+#
+# All the values specified here will override the default values given
+# in config.properties.
+#
+
+karaf.systemBundlesStartLevel=50
+
+#
+# You can place any customized configuration here.
+#
+
Propchange: camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/custom.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/custom.properties
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/custom.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain