Skip to content

CAMEL-7195 Removing default ehcache.xml configuration #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asfgit merged 2 commits into from
Feb 13, 2014
Merged

CAMEL-7195 Removing default ehcache.xml configuration #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80402cb
CAMEL-7195 Removing default ehcache.xml configuration
grgrzybek Feb 12, 2014
1366827
CAMEL-7195 logging the Ehcache config used
grgrzybek Feb 13, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
public class CacheComponent extends DefaultComponent {
private CacheConfiguration configuration;
private CacheManagerFactory cacheManagerFactory;
private String configurationFile = "classpath:ehcache.xml";
private String configurationFile;

public CacheComponent() {
configuration = new CacheConfiguration();
Expand Down Expand Up @@ -99,7 +99,7 @@ protected void doStart() throws Exception {
if (configurationFile != null) {
is = ResourceHelper.resolveMandatoryResourceAsInputStream(getCamelContext().getClassResolver(), configurationFile);
}
cacheManagerFactory = new DefaultCacheManagerFactory(is);
cacheManagerFactory = new DefaultCacheManagerFactory(is, configurationFile);
}
ServiceHelper.startService(cacheManagerFactory);
}
Expand Down
17 changes: 14 additions & 3 deletions ...amel-cache/src/main/java/org/apache/camel/component/cache/DefaultCacheManagerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,36 @@
import java.io.InputStream;

import net.sf.ehcache.CacheManager;

import org.apache.camel.impl.DefaultComponent;
import org.apache.camel.util.IOHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public class DefaultCacheManagerFactory extends CacheManagerFactory {
private static final Logger LOG = LoggerFactory.getLogger(DefaultCacheManagerFactory.class);

private InputStream is;

private String configurationFile;

public DefaultCacheManagerFactory() {
this(null);
this(null, null);
}

public DefaultCacheManagerFactory(InputStream is) {
public DefaultCacheManagerFactory(InputStream is, String configurationFile) {
this.is = is;
this.configurationFile = configurationFile;
}

@Override
protected CacheManager createCacheManagerInstance() {
if (is == null) {
is = getClass().getResourceAsStream("/ehcache.xml");
// it will still look for "/ehcache.xml" before defaulting to "/ehcache-failsafe.xml"
LOG.info("Creating CacheManager using Ehcache defaults");
return EHCacheUtil.createCacheManager();
}
LOG.info("Creating CacheManager using camel-cache configuration: {}", configurationFile);
return EHCacheUtil.createCacheManager(is);
}

Expand Down
Loading