Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -raffc66817dcbf5a677c7742c13fb93a9b35ae97a -rb39efd5c6520b4b01b290758076acaf8923b8c7d
Binary files differ
Index: lams_common/src/java/org/lamsfoundation/lams/util/svg/SVGGenerator.java
===================================================================
diff -u -r048c00aa63422e9a131bec13e982d6671369beb2 -rb39efd5c6520b4b01b290758076acaf8923b8c7d
--- lams_common/src/java/org/lamsfoundation/lams/util/svg/SVGGenerator.java	(.../SVGGenerator.java)	(revision 048c00aa63422e9a131bec13e982d6671369beb2)
+++ lams_common/src/java/org/lamsfoundation/lams/util/svg/SVGGenerator.java	(.../SVGGenerator.java)	(revision b39efd5c6520b4b01b290758076acaf8923b8c7d)
@@ -120,14 +120,23 @@
 	    break;
 	    
 	case OUTPUT_FORMAT_PNG:
-	    //modify image references to be pointed to local images (LDEV-2603)
-	    NodeList imageNodes = doc.getElementsByTagNameNS(SVG_NAMESPACE, "image");
-	    final String FULL_PATH_TO_LAMS_CENTRAL_SVG_IMAGES = "file://" + Configuration.get(ConfigurationKeys.LAMS_EAR_DIR).replaceAll("\\\\", "/") + "/lams-central.war/images/svg/";
-	    for (int i = 0; i < imageNodes.getLength(); i++) {
-		Element imageNode = (Element) imageNodes.item(i);
-		String imageFileName = imageNode.getAttributeNS(SVG_NAMESPACE_XLINK, "href");
-		imageFileName = imageFileName.replaceFirst(PATH_TO_LAMSCOMMUNITY_SVG_IMAGES, FULL_PATH_TO_LAMS_CENTRAL_SVG_IMAGES);
-		imageNode.setAttributeNS(SVG_NAMESPACE_XLINK, "xlink:href", imageFileName);
+	    NodeList imageNodes = null;
+	    String FULL_PATH_TO_LAMS_CENTRAL_SVG_IMAGES = null;
+	    
+	    boolean isLocalImagesUsed = (Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) != null);
+	    // change image references to local ones
+	    if (isLocalImagesUsed) {
+		imageNodes = doc.getElementsByTagNameNS(SVG_NAMESPACE, "image");
+		FULL_PATH_TO_LAMS_CENTRAL_SVG_IMAGES = "file://"
+			+ Configuration.get(ConfigurationKeys.LAMS_EAR_DIR).replaceAll("\\\\", "/")
+			+ "/lams-central.war/images/svg/";
+		for (int i = 0; i < imageNodes.getLength(); i++) {
+		    Element imageNode = (Element) imageNodes.item(i);
+		    String imageFileName = imageNode.getAttributeNS(SVG_NAMESPACE_XLINK, "href");
+		    imageFileName = imageFileName.replaceFirst(PATH_TO_LAMSCOMMUNITY_SVG_IMAGES,
+			    FULL_PATH_TO_LAMS_CENTRAL_SVG_IMAGES);
+		    imageNode.setAttributeNS(SVG_NAMESPACE_XLINK, "xlink:href", imageFileName);
+		}
 	    }
 	    
 	    PNGTranscoder transcoder = new PNGTranscoder();
@@ -141,11 +150,14 @@
 	    outputStream.close();
 	    
 	    //roll back all image references for later use
-	    for (int i = 0; i < imageNodes.getLength(); i++) {
-		Element imageNode = (Element) imageNodes.item(i);
-		String imageFileName = imageNode.getAttributeNS(SVG_NAMESPACE_XLINK, "href");
-		imageFileName = imageFileName.replaceFirst(FULL_PATH_TO_LAMS_CENTRAL_SVG_IMAGES, PATH_TO_LAMSCOMMUNITY_SVG_IMAGES);
-		imageNode.setAttributeNS(SVG_NAMESPACE_XLINK, "xlink:href", imageFileName);
+	    if (isLocalImagesUsed) {
+		for (int i = 0; i < imageNodes.getLength(); i++) {
+		    Element imageNode = (Element) imageNodes.item(i);
+		    String imageFileName = imageNode.getAttributeNS(SVG_NAMESPACE_XLINK, "href");
+		    imageFileName = imageFileName.replaceFirst(FULL_PATH_TO_LAMS_CENTRAL_SVG_IMAGES,
+			    PATH_TO_LAMSCOMMUNITY_SVG_IMAGES);
+		    imageNode.setAttributeNS(SVG_NAMESPACE_XLINK, "xlink:href", imageFileName);
+		}
 	    }
 	    break;
 	    
Index: lams_svggenerator/build.xml
===================================================================
diff -u -rfa6e7d3d572a9541abd90038dc5f3d194e624c1b -rb39efd5c6520b4b01b290758076acaf8923b8c7d
--- lams_svggenerator/build.xml	(.../build.xml)	(revision fa6e7d3d572a9541abd90038dc5f3d194e624c1b)
+++ lams_svggenerator/build.xml	(.../build.xml)	(revision b39efd5c6520b4b01b290758076acaf8923b8c7d)
@@ -63,6 +63,7 @@
 			<zipfileset src="${j2eelibs}/hibernate-core.jar" />
 			<zipfileset src="${j2eelibs}/log4j.jar"/>
 			<zipfileset src="./lib/commons-cli-1.2.jar"/>
+			<fileset file="${conf.dir}/jar/log4j.properties" />
 			
 			<manifest>
 				<attribute name="Main-Class" value="org.lamsfoundation.lams.svg.CommanLineSVGGenerator" />
Index: lams_svggenerator/conf/jar/log4j.properties
===================================================================
diff -u
--- lams_svggenerator/conf/jar/log4j.properties	(revision 0)
+++ lams_svggenerator/conf/jar/log4j.properties	(revision b39efd5c6520b4b01b290758076acaf8923b8c7d)
@@ -0,0 +1,4 @@
+log4j.rootLogger=DEBUG,stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d %5p (%F:%L) - %m%n
\ No newline at end of file