Refactored Bootstrap slightly for clarity

fcrepo4-archive · Jan 23, 2013 · a1cc546 · a1cc546
1 parent 45f922e
commit a1cc546
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/src/main/java/org/fcrepo/ffmodeshapeprototype/Bootstrap.java b/src/main/java/org/fcrepo/ffmodeshapeprototype/Bootstrap.java
@@ -62,8 +62,16 @@ public static Workspace getWorkspace() throws RepositoryException {
 	}
 
 	public static Configuration getFreemarker() throws RepositoryException {
-		if (freemarker == null)
-			initializeEngine();
+		if (freemarker == null) {
+			freemarker = new Configuration();
+			logger.debug("Setting up Freemarker object wrapper");
+			BeansWrapper objWrapper = new BeansWrapper();
+			objWrapper.setExposureLevel(BeansWrapper.EXPOSE_ALL);
+			freemarker.setObjectWrapper(objWrapper);
+			// Specify the data source where the template files come from.
+			freemarker.setClassForTemplateLoading(Bootstrap.class,
+					"/freemarker");
+		}
 		return freemarker;
 	}
 
@@ -116,13 +124,5 @@ private static void initializeEngine() throws RepositoryException {
 		jcrTools.findOrCreateChild(ws.getSession().getRootNode(), "fedora");
 		logger.debug("Deployed Fedora repository.");
 
-		freemarker = new Configuration();
-		logger.debug("Setting up Freemarker object wrapper");
-		BeansWrapper objWrapper = new BeansWrapper();
-		objWrapper.setExposureLevel(BeansWrapper.EXPOSE_ALL);
-		freemarker.setObjectWrapper(objWrapper);
-		// Specify the data source where the template files come from.
-		freemarker.setClassForTemplateLoading(Bootstrap.class, "/freemarker");
-
 	}
 }
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
@@ -10,4 +10,5 @@ log4j.appender.stdout.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
 # Set up the default logging to be INFO level, then override specific units
 log4j.logger.org.infinispan=DEBUG
 log4j.logger.org.modeshape=DEBUG
+log4j.logger.org.apache.camel=DEBUG
 log4j.logger.org.fcrepo=DEBUG