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/18 17:05:21 UTC
svn commit: r1410912 - in /camel/branches/camel-2.10.x: ./
components/camel-cache/src/main/java/org/apache/camel/component/cache/
components/camel-cache/src/test/java/org/apache/camel/component/
components/camel-cache/src/test/java/org/apache/camel/com...
Author: davsclaus
Date: Sun Nov 18 16:05:19 2012
New Revision: 1410912
URL: http://svn.apache.org/viewvc?rev=1410912&view=rev
Log:
Revert that camel-cache commit as this requires EHCache 2.6.x.
Removed:
camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/BaseCacheTest.java
camel/branches/camel-2.10.x/components/camel-cache/src/test/resources/test-ehcache.xml
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-cache/src/main/java/org/apache/camel/component/cache/FileCacheManagerFactory.java
camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConfigurationTest.java
camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConsumerFIFOTest.java
camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConsumerTest.java
camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheManagerFactoryRefTest.java
camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheProducerTest.java
camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheRegistryRefTest.java
camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheRoutesManagementTest.java
camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/FileCacheManagerFactoyRefTest.java
camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedBodyReplacerTest.java
camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedTokenReplacerTest.java
camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedXPathElementReplacerTest.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Reverse-merged /camel/trunk:r1410902
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.10.x/components/camel-cache/src/main/java/org/apache/camel/component/cache/FileCacheManagerFactory.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cache/src/main/java/org/apache/camel/component/cache/FileCacheManagerFactory.java?rev=1410912&r1=1410911&r2=1410912&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-cache/src/main/java/org/apache/camel/component/cache/FileCacheManagerFactory.java (original)
+++ camel/branches/camel-2.10.x/components/camel-cache/src/main/java/org/apache/camel/component/cache/FileCacheManagerFactory.java Sun Nov 18 16:05:19 2012
@@ -38,7 +38,7 @@ public class FileCacheManagerFactory ext
try {
return CacheManager.create(new FileInputStream(fileName));
} catch (Exception exception) {
- throw new RuntimeCamelException("Error creating CacheManager from file: " + fileName, exception);
+ throw new RuntimeCamelException(exception);
}
}
Modified: camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConfigurationTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConfigurationTest.java?rev=1410912&r1=1410911&r2=1410912&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConfigurationTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConfigurationTest.java Sun Nov 18 16:05:19 2012
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.cache;
+
import org.apache.camel.CamelContext;
import org.apache.camel.impl.DefaultCamelContext;
import org.junit.Assert;
Modified: camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConsumerFIFOTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConsumerFIFOTest.java?rev=1410912&r1=1410911&r2=1410912&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConsumerFIFOTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConsumerFIFOTest.java Sun Nov 18 16:05:19 2012
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.camel.component.cache;
import org.apache.camel.Exchange;
Modified: camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConsumerTest.java?rev=1410912&r1=1410911&r2=1410912&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConsumerTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConsumerTest.java Sun Nov 18 16:05:19 2012
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.camel.component.cache;
import java.util.ArrayList;
@@ -26,13 +27,13 @@ import org.apache.camel.Processor;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.BaseCacheTest;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class CacheConsumerTest extends BaseCacheTest {
+public class CacheConsumerTest extends CamelTestSupport {
protected static final transient Logger LOG = LoggerFactory.getLogger(CacheConsumerTest.class);
@EndpointInject(uri = "mock:result")
Modified: camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheManagerFactoryRefTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheManagerFactoryRefTest.java?rev=1410912&r1=1410911&r2=1410912&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheManagerFactoryRefTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheManagerFactoryRefTest.java Sun Nov 18 16:05:19 2012
@@ -77,7 +77,7 @@ public class CacheManagerFactoryRefTest
public static class TestingCacheManagerFactory extends CacheManagerFactory {
@Override
protected CacheManager createCacheManagerInstance() {
- return CacheManager.create(getClass().getResourceAsStream("/test-ehcache.xml"));
+ return CacheManager.create(getClass().getResourceAsStream("/ehcache.xml"));
}
}
}
Modified: camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheProducerTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheProducerTest.java?rev=1410912&r1=1410911&r2=1410912&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheProducerTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheProducerTest.java Sun Nov 18 16:05:19 2012
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.camel.component.cache;
import java.io.FileInputStream;
@@ -29,15 +30,15 @@ import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.BaseCacheTest;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.camel.util.IOHelper;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class CacheProducerTest extends BaseCacheTest {
+public class CacheProducerTest extends CamelTestSupport {
private static final Poetry POETRY;
private static final String FILEPATH_UPDATEDTEST_TXT = "./src/test/resources/updatedtest.txt";
Modified: camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheRegistryRefTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheRegistryRefTest.java?rev=1410912&r1=1410911&r2=1410912&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheRegistryRefTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheRegistryRefTest.java Sun Nov 18 16:05:19 2012
@@ -37,11 +37,11 @@ import org.apache.camel.Processor;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.BaseCacheTest;
import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-public class CacheRegistryRefTest extends BaseCacheTest {
+public class CacheRegistryRefTest extends CamelTestSupport {
private static final String CACHE_ENDPOINT_URI = "cache://foo"
+ "?eventListenerRegistry=#eventListenerRegistry&cacheLoaderRegistry=#cacheLoaderRegistry";
Modified: camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheRoutesManagementTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheRoutesManagementTest.java?rev=1410912&r1=1410911&r2=1410912&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheRoutesManagementTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheRoutesManagementTest.java Sun Nov 18 16:05:19 2012
@@ -27,11 +27,11 @@ import org.apache.camel.Processor;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.BaseCacheTest;
import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-public class CacheRoutesManagementTest extends BaseCacheTest {
+public class CacheRoutesManagementTest extends CamelTestSupport {
private static final String CACHE_URI = "cache:foo?cacheManagerFactory=#cacheManagerFactory";
private static final String ROUTE1_ID = "TEST_ROUTE_1";
private static final String ROUTE2_ID = "TEST_ROUTE_2";
Modified: camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/FileCacheManagerFactoyRefTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/FileCacheManagerFactoyRefTest.java?rev=1410912&r1=1410911&r2=1410912&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/FileCacheManagerFactoyRefTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/FileCacheManagerFactoyRefTest.java Sun Nov 18 16:05:19 2012
@@ -23,7 +23,7 @@ public class FileCacheManagerFactoyRefTe
@Override
protected JndiRegistry createRegistry() throws Exception {
JndiRegistry jndi = new JndiRegistry(createJndiContext());
- testingCacheManagerFactory = new FileCacheManagerFactory("src/test/resources/test-ehcache.xml");
+ testingCacheManagerFactory = new FileCacheManagerFactory("src/main/resources/ehcache.xml");
jndi.bind("testCacheManagerFactory", testingCacheManagerFactory);
return jndi;
}
Modified: camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedBodyReplacerTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedBodyReplacerTest.java?rev=1410912&r1=1410911&r2=1410912&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedBodyReplacerTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedBodyReplacerTest.java Sun Nov 18 16:05:19 2012
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.camel.processor.cache;
import java.util.ArrayList;
@@ -26,7 +27,6 @@ import org.apache.camel.Processor;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.BaseCacheTest;
import org.apache.camel.component.cache.CacheConstants;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -34,7 +34,7 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class CacheBasedBodyReplacerTest extends BaseCacheTest {
+public class CacheBasedBodyReplacerTest extends CamelTestSupport {
private static final transient Logger LOG = LoggerFactory.getLogger(CacheBasedBodyReplacerTest.class);
@EndpointInject(uri = "mock:result")
Modified: camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedTokenReplacerTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedTokenReplacerTest.java?rev=1410912&r1=1410911&r2=1410912&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedTokenReplacerTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedTokenReplacerTest.java Sun Nov 18 16:05:19 2012
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.camel.processor.cache;
import java.util.ArrayList;
@@ -26,7 +27,6 @@ import org.apache.camel.Processor;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.BaseCacheTest;
import org.apache.camel.component.cache.CacheConstants;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -34,7 +34,7 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class CacheBasedTokenReplacerTest extends BaseCacheTest {
+public class CacheBasedTokenReplacerTest extends CamelTestSupport {
private static final transient Logger LOG = LoggerFactory.getLogger(CacheBasedTokenReplacerTest.class);
@EndpointInject(uri = "mock:result")
Modified: camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedXPathElementReplacerTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedXPathElementReplacerTest.java?rev=1410912&r1=1410911&r2=1410912&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedXPathElementReplacerTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedXPathElementReplacerTest.java Sun Nov 18 16:05:19 2012
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.camel.processor.cache;
import java.util.ArrayList;
@@ -26,7 +27,6 @@ import org.apache.camel.Processor;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.BaseCacheTest;
import org.apache.camel.component.cache.CacheConstants;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -34,7 +34,7 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class CacheBasedXPathElementReplacerTest extends BaseCacheTest {
+public class CacheBasedXPathElementReplacerTest extends CamelTestSupport {
private static final transient Logger LOG = LoggerFactory.getLogger(CacheBasedXPathElementReplacerTest.class);
@EndpointInject(uri = "mock:result")