Index: lams_tool_larsrc/.classpath
===================================================================
diff -u -r588fe01186ff8c7c5b215e15f5ac4763137e0284 -r71012b6f2ac523d8faaef475332dbad1338c448d
--- lams_tool_larsrc/.classpath	(.../.classpath)	(revision 588fe01186ff8c7c5b215e15f5ac4763137e0284)
+++ lams_tool_larsrc/.classpath	(.../.classpath)	(revision 71012b6f2ac523d8faaef475332dbad1338c448d)
@@ -5,7 +5,7 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/hibernate/main/hibernate-core-4.3.7.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/hibernate-core">
 		<attributes>
-			<attribute name="javadoc_location" value="http://docs.jboss.org/hibernate/orm/4.3/javadocs/" />
+			<attribute name="javadoc_location" value="http://docs.jboss.org/hibernate/orm/4.3/javadocs/"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/servlet/api/main/jboss-servlet-api_3.1_spec-1.0.0.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/servlet-api">
@@ -26,6 +26,5 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/slf4j/jcl-over-slf4j/main/jcl-over-slf4j-1.7.2.jbossorg-1.jar"/>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jdom/main/jdom-1.1.2.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/jdom"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: lams_tool_larsrc/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -r71012b6f2ac523d8faaef475332dbad1338c448d
--- lams_tool_larsrc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 5e63656a12c02f7476564e278b43ff4ce86ac930)
+++ lams_tool_larsrc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 71012b6f2ac523d8faaef475332dbad1338c448d)
@@ -63,8 +63,6 @@
 error.msg.upload.file.not.found  =Could not find upload file {0}.
 error.msg.zip.file.exception  =Could not handle zip file when uploading file.
 error.msg.file.not.found  =File not found exception occurs when uploading file.
-error.msg.ims.package  =Invalid IMS CP format.
-error.msg.ims.application  =ImscpApplicationException occurs when uploading resource item file.
 error.msg.website.no.initial.file  =Website zip can not find out initial file (index.htm/html or default.htm/html).
 error.msg.io.exception  =IOException occurs when uploading file.
 error.msg.invaid.param.upload  =InvalidParameterException occured while trying to upload File.
Fisheye: Tag 71012b6f2ac523d8faaef475332dbad1338c448d refers to a dead (removed) revision in file `lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ims/OrganizationXMLDef.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ims/SimpleContentPackageConverter.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r71012b6f2ac523d8faaef475332dbad1338c448d
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ims/SimpleContentPackageConverter.java	(.../SimpleContentPackageConverter.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ims/SimpleContentPackageConverter.java	(.../SimpleContentPackageConverter.java)	(revision 71012b6f2ac523d8faaef475332dbad1338c448d)
@@ -24,469 +24,250 @@
 package org.lamsfoundation.lams.tool.rsrc.ims;
 
 import java.io.File;
-import java.io.FileNotFoundException;
+import java.io.FileInputStream;
 import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
 
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
+
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.Namespace;
+import org.lamsfoundation.lams.util.FileUtil;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
 
-import uk.ac.reload.jdom.XMLDocument;
-import uk.ac.reload.jdom.XMLPath;
-import uk.ac.reload.jdom.XMLUtils;
-import uk.ac.reload.moonunit.contentpackaging.CP_Core;
-
 /**
- * SimpleContentPackageConverter contains the code required for
- * parsing the IMS Content Package and converting the info into our
- * own structures. 
+ * SimpleContentPackageConverter contains the code required for parsing the IMS Content Package and converting the info
+ * into our own structures.
  *
- * Note: this class has instance data, so do not use it as a singleton.
- * 
- * @author Fiona Malikoff
+ * @author Fiona Malikoff, Marcin Cieslak
  */
-public class SimpleContentPackageConverter implements IContentPackageConverter {
+public class SimpleContentPackageConverter {
+    private static Logger log = Logger.getLogger(SimpleContentPackageConverter.class);
 
-	private Logger log = Logger.getLogger(SimpleContentPackageConverter.class);
-	
-	// manifestDoc and cpCore are set up in the constructor. They are then used
-	// to generate the rest of the values
-	private XMLDocument manifestDoc = null;
-	private CP_Core cpCore = null;
+    private static DocumentBuilder docBuilder = null;
+    private static final XPathFactory xPathFactory = XPathFactory.newInstance();
+    private final XPath xPath = SimpleContentPackageConverter.xPathFactory.newXPath();
 
-	private String schema=null;
-	private String title=null;
-	private String description=null;
-	private String defaultItem=null;
-	private String organzationXML=null;
-	
-	// cachedResourceList is used to avoid building up the list
-	// every time an item is parsed - otherwise there is a lot
-	// of processing done by the reload code time and time again.
-	private Element[] cachedResourceList = null;
+    private Document manifestDoc = null;
 
-	/** Set up a package converter, using the supplied directory as the package. 
-	 * The package should be parsed automatically and the values readied for calls
-	 * to getSchema(), getTitle(), etc. 
-	 * 
-	 * @param directoryName: directory containing an expanded IMS content package.
-	 * @throws IMSManifestException if there is an error in parsing the manifest file
-	 * due to an error in the file or an unexpected value. 
- 	 * @throws ImscpApplicationException if there is any other error
- 	 */
-	public SimpleContentPackageConverter(String directoryName) 
-			throws IMSManifestException, ImscpApplicationException {
+    private String schema = null;
+    private String title = null;
+    private String description = null;
+    private String defaultItem = null;
+    private String organzationXML = null;
 
-		this.manifestDoc = getDocument(directoryName);
-		this.cpCore = new CP_Core(manifestDoc);
+    static {
+	try {
+	    // a single doc builder is enough
+	    SimpleContentPackageConverter.docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+	} catch (ParserConfigurationException e) {
+	    SimpleContentPackageConverter.log.error("Error while initialising XML document builder", e);
+	}
+    }
 
-		// initialise the property file required for the reload code. Needed to make 
-		// the metadata call work. If we remove the metadata call, then this constructor
-		// may be removed.
-		System.setProperty("editor.properties.file", "uk.ac.reload.editor.properties.rb");
+    public SimpleContentPackageConverter(String directoryName) throws IOException {
+	// first parse the manifest XML file
+	this.manifestDoc = getDocument(directoryName);
 
-		parsePackage();
-	}
-	
-	/** Parse IMS content package expanded out 
-	 * into the supplied directory. Note: the manifest file is expected to be in the
-	 * root of the supplied directory.
-	 * 
-	 * @throws ImscpApplicationException
-	 * @throws IMSManifestException
-	 */
-	private void parsePackage( )	throws IMSManifestException, ImscpApplicationException {
-		
-		String schemaText = getText(manifestDoc, "//metadata/schema");
-		String schemaVersion = getText(manifestDoc, "//metadata/schemaversion");
-   		this.schema = ( schemaText != null ? schemaText : "unknown" ) 
-				+ " " + ( schemaVersion != null ? schemaVersion : "unknown") ;
-		
-		Document orgs = buildOrganisationList();
-		if ( orgs == null ) {
-			String error = "Unable to convert organizations from manifest file to our own structure. Reason unknown - buildOrganisationList returned null";
-			log.error(error);
-			throw new ImscpApplicationException(error);
-		}
-		
-		try {
-			this.organzationXML = XMLUtils.write2XMLString(orgs);
-		} catch ( IOException ioe ) {
-			String error = "Exception thrown converting organization structure (as document) to an XML string."+ioe.getMessage();
-			log.error(error,ioe);
-			throw new ImscpApplicationException(error,ioe);
-		}
+	// get the necessary data from the XML document using XPath
+	String schemaText = getText("/manifest/metadata/schema/text()", manifestDoc);
+	String schemaVersion = getText("/manifest/metadata/schemaversion/text()", manifestDoc);
+	this.schema = (schemaText == null ? "unknown" : schemaText) + " "
+		+ (schemaVersion == null ? "unknown" : schemaVersion);
 
-		XMLPath xmlPath = new XMLPath("//metadata/*:lom/*:general/*:title/*:langstring");
-		this.title = getMetaValue(xmlPath);
-		if ( this.title == null ) {
-			// try the old root name - untested
-			xmlPath = new XMLPath("//metadata/*:record/*:general/*:title/*:langstring");
-			this.title = getMetaValue(xmlPath);
-		}
-		
-		xmlPath = new XMLPath("//metadata/*:lom/*:general/*:description/*:langstring");
-		this.description = getMetaValue(xmlPath);
-		if ( this.description == null ) {
-			// try the old root name - untested
-			xmlPath = new XMLPath("//metadata/*:record/*:general/*:description/*:langstring");
-			this.description = getMetaValue(xmlPath);
-		}
-		
+	Document orgs = null;
+	try {
+	    orgs = buildOrganisationList();
+	} catch (XPathExpressionException e) {
+	    throw new IOException("Error while building organisations list", e);
 	}
+	if (orgs == null) {
+	    throw new IOException("Unable to convert organisations from manifest file to our own structure");
+	}
+	this.organzationXML = FileUtil.writeXMLtoString(orgs);
 
+	this.title = getText("/manifest/metadata/lom/general/title/langstring/text()", manifestDoc);
+	this.description = getText("/manifest/metadata/lom/general/description/langstring/text()", manifestDoc);
+    }
 
-	/**
-	 * Finds a value at the given xmlPath. If only one element, uses that value.
-	 * If more than one element, tries to find an English value.
-	 * @param xmlPath
-	 * @return Value of the element found at xmlPath. 
-	 */
-	private String getMetaValue(XMLPath xmlPath) {
-		Element[] elList = manifestDoc.getElements(xmlPath);
-		String value = null;
-		if ( elList != null ) {
-			if ( elList.length == 0 ) {
-				value="Unknown";
-			} else if ( elList.length == 1 ) {
-				value=elList[0].getTextTrim();
-			} else {
-				value = null;
-				// TODO check if it is really testing for english
-				for ( int i=0; value == null && i < elList.length; i++ ) {
-					// grab the first English one
-					Element el = elList[i];
-					String attrValue = el.getAttributeValue("lang", Namespace.XML_NAMESPACE );
-					if ( attrValue != null && attrValue.startsWith("en") ) {
-						value = el.getTextTrim();
-					}
-				}
-				if ( value == null ) {
-					// can't seem to find an English one, just pick the first
-					value=elList[0].getTextTrim();
-				}
-			}
-		}
-		return value;
+    /* Get the text for first element matching XPath */
+    private String getText(String xPathString, Object context) throws IOException {
+	try {
+	    return xPath.evaluate(xPathString, context);
+	} catch (XPathExpressionException e) {
+	    throw new IOException("Error when parsing XPath expression: " + xPathString, e);
 	}
+    }
 
-	/* Get the text for this element - expect only 1 */
-	private String getText(XMLDocument document, String xmlPathString ) {
-		XMLPath xmlPath = new XMLPath(xmlPathString);
-		Element el = document.getElement(xmlPath);
-		return el != null ? el.getTextTrim() : null;
+    private Document getDocument(String directoryName) throws IOException {
+	File docFile = new File(directoryName, "imsmanifest.xml");
+	Document doc;
+	try {
+	    doc = SimpleContentPackageConverter.docBuilder.parse(new FileInputStream(docFile));
+	} catch (SAXException | IOException e) {
+	    throw new IOException("Error while parsing IMS manifest", e);
 	}
-	
- 	private String debug(XMLDocument document, String param, String xmlPathString ) {
-		XMLPath xmlPath = new XMLPath(xmlPathString);
-		Element[]elList = document.getElements(xmlPath);
-		if ( elList != null ) {
-			log.error(param+" xp: length "+elList.length+" el "+elList);
-			if ( elList.length >= 1 ) {
-				log.error("text is "+elList[0].getTextTrim());
-				return elList[0].getTextTrim();
-			}
-		} else {
-			log.error(param+" xp: el is null");
-		}
-		return null;
-	} 
+	return doc;
+    }
 
-	/**
-	 * @param directoryName
-	 * @return
-	 * @throws JDOMException
-	 * @throws IOException
-	 */
-	private XMLDocument getDocument(String directoryName) throws IMSManifestException {
-		try { 
-			XMLDocument doc = new XMLDocument();
-			doc.loadDocument(new File(directoryName, "imsmanifest.xml"));
-			return doc;
-		} catch (JDOMException je) {
-			String error = "Parsing error occured while loading imsmanifest.xml file. Contents of file may be invalid. "+je.getMessage();
-			log.error(error, je);
-			throw new IMSManifestException(error, je);
-		} catch (FileNotFoundException e) {
-			String error = "Unable to find imsmanifest file in the package."+e.getMessage();
-			log.error(error, e);
-			throw new IMSManifestException(error, e);
-		} catch (IOException ioe) {
-			String error = "IOException occured while loading imsmanifest file. "+ioe.getMessage();
-			log.error(error, ioe);
-			throw new IMSManifestException(error, ioe);
-		}
+    /**
+     * Build an XML document which is a list of organisations/resources.
+     */
+    private Document buildOrganisationList() throws XPathExpressionException, IOException {
+	Element orgsElem = (Element) xPath.evaluate("/manifest/organizations", manifestDoc, XPathConstants.NODE);
+
+	// default org is for finding default item, but all orgs get processed
+	String defaultOrgIdentifier = orgsElem.getAttribute("default");
+	if (StringUtils.isBlank(defaultOrgIdentifier)) {
+	    defaultOrgIdentifier = getText("organization/@identifier", orgsElem);
 	}
+	if (SimpleContentPackageConverter.log.isDebugEnabled()) {
+	    SimpleContentPackageConverter.log.debug("Default organisation identifier is: " + defaultOrgIdentifier);
+	}
 
-	/** Built an XML document which is a list of organisations/resources. 
-	 */ 
-	private Document buildOrganisationList( ) throws IMSManifestException {
-		
-		Namespace nm = cpCore.getRootManifestElement().getNamespace(); 
-		
-		Element rootElement = cpCore.getRootManifestElement();
-		Element orgsElement = rootElement.getChild(CP_Core.ORGANIZATIONS, nm);
-			
-		// set up a list of all the resources
-		
-		// now get all the organizations and set up the new XML document, combining
-		// the organization and the resources.
-		Element defaultOrg = cpCore.getDefaultOrganization(orgsElement);
-		String defaultOrgIdentifier = null;
-		if ( defaultOrg != null )
-			defaultOrgIdentifier = defaultOrg.getAttributeValue("identifier");
+	Document newDoc = SimpleContentPackageConverter.docBuilder.newDocument();
+	Element newRootElement = newDoc.createElement("organizations");
+	setAttribute(newRootElement, "version", "imscp1");
+	newDoc.appendChild(newRootElement);
 
-		log.debug("cpCore default org id: "+defaultOrgIdentifier);
+	NodeList orgs = (NodeList) xPath.evaluate("organization", orgsElem, XPathConstants.NODESET);
+	for (int childIndex = 0; childIndex < orgs.getLength(); childIndex++) {
+	    Element organizationElement = processItem(newDoc, (Element) orgs.item(childIndex), defaultOrgIdentifier,
+		    null);
+	    if (organizationElement != null) {
+		newRootElement.appendChild(organizationElement);
+	    }
+	}
 
-		Element newRootElement = new Element("organizations");
-		setAttribute(newRootElement, "version", "imscp1");
-		Document doc = new Document(newRootElement);
-		
-		Element[] orgs = cpCore.getOrganizationsAllowed(orgsElement);
-		Element initOrganizationElement =null; 
-		for ( int i=0; i<orgs.length; i++) {
-			
-			Element organizationElement = processItem(orgs[i], nm, defaultOrgIdentifier, null);
-			if ( initOrganizationElement == null )
-				initOrganizationElement = organizationElement;
-			
-			newRootElement.addContent(organizationElement);
-		}
-
-		if ( log.isDebugEnabled() ) {
-			try { 
-				log.debug("Organizations are: "+XMLUtils.write2XMLString(doc));
-			} catch ( IOException e ) {
-				log.debug("Unable to convert organizations to XML for log. Organizations are: "+doc);
-			}
-		}
-		
-		return doc;
+	if (SimpleContentPackageConverter.log.isDebugEnabled()) {
+	    SimpleContentPackageConverter.log.debug("Organizations are: " + FileUtil.writeXMLtoString(newDoc));
 	}
-	
-	/** Process the given element. Returns a newly formatted Element if the element
-	 * is a visible item, null otherwise. Will also set the value "defaultItemURL"
-	 * while processing, if it finds the default item.
-	 * 
-	 * First time through, the element will be an organization and parentOrgIdentifier
-	 * will be null. After that, elements are expected to be items and parentOrgIdentifier
-	 * should not be null.
-	 * 
-	 * parentOrgIdentifier is the parent organization of an item. An item is 
-	 * the default item if either:
-	 * (a) the defaultOrgIdentifier is null and it is the first item encountered 
-	 * which has a resource or 
-	 * (b) parentOrgIdentifier==defaultOrgIdentifier and it is the first item encountered 
-	 * which has a resource. 
-	 *
-	 * @param element
-	 * @return New version of element combining organization/item/resource details
-	 */
-	private Element processItem(Element element, Namespace nm, String defaultOrgIdentifier, String parentOrgIdentifier) 
-	 			throws IMSManifestException {
-		
-		String isVisibleString = element.getAttributeValue(CP_Core.ISVISIBLE);
-		if ( isVisible(isVisibleString) )  {
 
-			String id = element.getAttributeValue(CP_Core.IDENTIFIER); 
-			// only process visible items as we are building the list for display to the user
-			Element itref = new Element(OrganizationXMLDef.ITEM);
+	return newDoc;
+    }
 
-			setAttribute(itref, OrganizationXMLDef.IDENTIFIER, id); // mandatory
-			setAttribute(itref, OrganizationXMLDef.PARAMETERS, element.getAttributeValue(CP_Core.PARAMETERS)); // optional
-			setAttribute(itref, OrganizationXMLDef.TITLE, element.getChildText(CP_Core.TITLE, nm)); // optional
-			String resourceURL = getResourceURL(element);
-			if ( resourceURL != null )
-				setAttribute(itref, OrganizationXMLDef.RESOURCE, resourceURL); // optional 
+    /**
+     * Process the given element. Returns a newly formatted Element if the element is a visible item, null otherwise.
+     * Will also set the value "defaultItemURL" while processing, if it finds the default item.
+     * 
+     * First time through, the element will be an organization and parentOrgIdentifier will be null. After that,
+     * elements are expected to be items and parentOrgIdentifier should not be null.
+     * 
+     * parentOrgIdentifier is the parent organization of an item. An item is the default item if either: (a) the
+     * defaultOrgIdentifier is null and it is the first item encountered which has a resource or (b)
+     * parentOrgIdentifier==defaultOrgIdentifier and it is the first item encountered which has a resource.
+     *
+     * @param element
+     * @return New version of element combining organization/item/resource details
+     * @throws XPathExpressionException
+     * @throws IOException
+     */
+    private Element processItem(Document doc, Element element, String defaultOrgIdentifier, String parentOrgIdentifier)
+	    throws XPathExpressionException, IOException {
+	// only process visible items as we are building the list for display to the user
+	if (!isVisible(element.getAttribute("isVisible"))) {
+	    return null;
+	}
+	String id = element.getAttribute("identifier");
+	Element itref = doc.createElement("item");
 
-			if ( resourceURL != null && this.defaultItem == null && 
-				 (defaultOrgIdentifier== null ||  defaultOrgIdentifier.equals(parentOrgIdentifier)) ) {
-				setAttribute(itref, OrganizationXMLDef.DEFAULT, Boolean.TRUE.toString());
-				this.defaultItem = resourceURL;
-			} else {
-				setAttribute(itref, OrganizationXMLDef.DEFAULT, Boolean.FALSE.toString());
-			}
+	setAttribute(itref, "identifier", id); // mandatory
+	setAttribute(itref, "parameters", element.getAttribute("parameters")); // optional
+	setAttribute(itref, "title", getText("title/text()", element)); // optional
+	String idRef = element.getAttribute("identifierref");
+	// find matching resource
+	String resourceURL = getText("/manifest/resources/resource[@identifier='" + idRef + "']/@href", manifestDoc);
+	setAttribute(itref, "resource", resourceURL); // optional 
 
-			List items = element.getChildren(CP_Core.ITEM, nm);
-			Iterator iter = items.iterator();
-			while (iter.hasNext()) {
-				Element itrefChild  = processItem((Element) iter.next(), 
-						nm, 
-						defaultOrgIdentifier,
-						parentOrgIdentifier != null ? parentOrgIdentifier : id);
-				if ( itrefChild != null )
-					itref.addContent(itrefChild);
-			}
-
-			return itref;
-		}
-		return null;
-		
+	if (StringUtils.isNotBlank(resourceURL) && (this.defaultItem == null)
+		&& ((defaultOrgIdentifier == null) || defaultOrgIdentifier.equals(parentOrgIdentifier))) {
+	    setAttribute(itref, "default", Boolean.TRUE.toString());
+	    this.defaultItem = resourceURL;
+	} else {
+	    setAttribute(itref, "default", Boolean.FALSE.toString());
 	}
 
-	/**
-	 * Not sure exactly what format "isVisible" will be in. In the spec, it says 
-	 * Boolean (True|False) yet the imslipv1p0cp.zip package has a value of "1". 
-	 * So this code will accept anything as visible except for false (any case) 
-	 * or 0.
-	 */
-	private boolean isVisible(String value ) {
-		
-		if ( value != null ) {
-			String trimmed = value.trim();
-			if ( trimmed.equalsIgnoreCase("false") || trimmed.equals("0") ) {
-				return false;
-			}
-		}
-		return true;
+	NodeList items = (NodeList) xPath.evaluate("item", element, XPathConstants.NODESET);
+	for (int childIndex = 0; childIndex < items.getLength(); childIndex++) {
+	    Element itrefChild = processItem(doc, (Element) items.item(childIndex), defaultOrgIdentifier,
+		    parentOrgIdentifier != null ? parentOrgIdentifier : id);
+	    if (itrefChild != null) {
+		itref.appendChild(itrefChild);
+	    }
 	}
-											  
-	private void setAttribute(Element element, String attributeName, String value) {
-		if ( element != null && attributeName != null && value != null )
-			element.setAttribute(attributeName, value);
-	}
 
-	/* Get the resource relating to this item. First time called it will
-	 * get a list of allowed resources it will cache the value in 
-	 * cachedResourceList. After that, it will go to the cache. If 
-	 * it doesn't find the resource, then it will regenerate the list
-	 * of resources.
-	 * 
-	 * This is done for performance - it is assumed that most items will 
-	 * have access to the same resources. This may not be true if sub-manifests
-	 * are used, hence the regneration of the array if the resource
-	 * isn't found in the cache.
-	 * 
-	 * Note: assumes all reference ids are unique across the whole of the 
-	 * manifest file.
-	 * 
-	 * @param item Element of type ITEM
-	 * @return relative path of the resource, null if no IDENTIFIERREF found
-	 * @throws IMSManifestException if IDENTIFIERREF is not null but the resource
-	 * could not found.
-	 */
-	private String getResourceURL(Element itemElement) throws IMSManifestException {
+	return itref;
+    }
 
-		if ( cachedResourceList == null ) {
-			cachedResourceList = cpCore.getReferencedElementsAllowed(itemElement);
-			if ( log.isDebugEnabled() )
-				log.debug("Resources are "+cachedResourceList);
-		}
-		
-		String identifierRef = itemElement.getAttributeValue(CP_Core.IDENTIFIERREF);
-		
-		if ( identifierRef == null ) {
-			
-			return null;
-			
-		} else {
-			
-			Element resource = getResource2(identifierRef);
-			
-			if ( resource == null ) {
-				
-				// We failed to find a matching resource so try generating the list again. 
-				// Note: this may case the list to be generated twice first time if the 
-				//resource is missing. Too bad!
-				cachedResourceList = cpCore.getReferencedElementsAllowed(itemElement);
-				if ( log.isDebugEnabled() )
-					log.debug("Resources are "+cachedResourceList);
-	
-				resource = getResource2(identifierRef);
-			}
-	
-			if ( resource != null ) {
-				return cpCore.getRelativeURL(resource);
-			} else {
-				throw new IMSManifestException("Unable to find resource for item element "
-					+itemElement.getAttributeValue(CP_Core.TITLE)+
-					" looking for identifier "
-					+identifierRef);
-			}
-			
-		} 
-	
+    /**
+     * Not sure exactly what format "isVisible" will be in. In the spec, it says Boolean (True|False) yet the
+     * imslipv1p0cp.zip package has a value of "1". So this code will accept anything as visible except for false (any
+     * case) or 0.
+     */
+    private boolean isVisible(String value) {
+	if (value != null) {
+	    String trimmed = value.trim();
+	    if (trimmed.equalsIgnoreCase("false") || trimmed.equals("0")) {
+		return false;
+	    }
 	}
+	return true;
+    }
 
-	/**
-	 * @param identifierRef
-	 * @return
-	 */
-	private Element getResource2(String identifierRef) {
-		for ( int i=0; i< cachedResourceList.length; i++ ) {
-			Element resource = cachedResourceList[i];
-			if ( identifierRef != null && 
-					identifierRef.equals(resource.getAttributeValue(CP_Core.IDENTIFIER)) ) {
-				return resource;
-			}
-		}
-		return null;
+    private void setAttribute(Element element, String attributeName, String value) {
+	if ((element != null) && StringUtils.isNotBlank(attributeName) && StringUtils.isNotBlank(value)) {
+	    element.setAttribute(attributeName, value);
 	}
+    }
 
+    /**
+     * @return Returns the defaultItem.
+     */
+    public String getDefaultItem() {
+	return defaultItem;
+    }
 
+    /**
+     * @return Returns the description.
+     */
+    public String getDescription() {
+	return description;
+    }
 
-	/**
-	 * @return Returns the defaultItem.
-	 */
-	public String getDefaultItem() {
-		return defaultItem;
-	}
-	/**
-	 * @param defaultItem The defaultItem to set.
-	 */
-	public void setDefaultItem(String defaultItem) {
-		this.defaultItem = defaultItem;
-	}
-	/**
-	 * @return Returns the description.
-	 */
-	public String getDescription() {
-		return description;
-	}
-	/**
-	 * @param description The description to set.
-	 */
-	public void setDescription(String description) {
-		this.description = description;
-	}
-	/**
-	 * @return Returns the organzationXML.
-	 */
-	public String getOrganzationXML() {
-		return organzationXML;
-	}
-	/**
-	 * @param organzationXML The organzationXML to set.
-	 */
-	public void setOrganzationXML(String organzationXML) {
-		this.organzationXML = organzationXML;
-	}
-	/**
-	 * @return Returns the schema.
-	 */
-	public String getSchema() {
-		return schema;
-	}
-	/**
-	 * @param schema The schema to set.
-	 */
-	public void setSchema(String schema) {
-		this.schema = schema;
-	}
-	/**
-	 * @return Returns the title.
-	 */
-	public String getTitle() {
-		return title;
-	}
-	/**
-	 * @param title The title to set.
-	 */
-	public void setTitle(String title) {
-		this.title = title;
-	}
-}
+    /**
+     * @return Returns the organzationXML.
+     */
+    public String getOrganzationXML() {
+	return organzationXML;
+    }
+
+    /**
+     * @return Returns the schema.
+     */
+    public String getSchema() {
+	return schema;
+    }
+
+    /**
+     * @return Returns the title.
+     */
+    public String getTitle() {
+	return title;
+    }
+
+    /**
+     * @param title
+     *            The title to set.
+     */
+    public void setTitle(String title) {
+	this.title = title;
+    }
+}
\ No newline at end of file
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
===================================================================
diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -r71012b6f2ac523d8faaef475332dbad1338c448d
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision 5e63656a12c02f7476564e278b43ff4ce86ac930)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision 71012b6f2ac523d8faaef475332dbad1338c448d)
@@ -85,9 +85,6 @@
 import org.lamsfoundation.lams.tool.rsrc.dto.ResourceItemDTO;
 import org.lamsfoundation.lams.tool.rsrc.dto.SessionDTO;
 import org.lamsfoundation.lams.tool.rsrc.dto.VisitLogDTO;
-import org.lamsfoundation.lams.tool.rsrc.ims.IContentPackageConverter;
-import org.lamsfoundation.lams.tool.rsrc.ims.IMSManifestException;
-import org.lamsfoundation.lams.tool.rsrc.ims.ImscpApplicationException;
 import org.lamsfoundation.lams.tool.rsrc.ims.SimpleContentPackageConverter;
 import org.lamsfoundation.lams.tool.rsrc.model.Resource;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceItem;
@@ -661,7 +658,7 @@
 	    // need unzip upload, and parse learning object information from XML file.
 	    if (item.getType() == ResourceConstants.RESOURCE_TYPE_LEARNING_OBJECT) {
 		String packageDirectory = ZipFileUtil.expandZip(is, fileName);
-		IContentPackageConverter cpConverter = new SimpleContentPackageConverter(packageDirectory);
+		SimpleContentPackageConverter cpConverter = new SimpleContentPackageConverter(packageDirectory);
 		String initFile = cpConverter.getDefaultItem();
 		item.setInitialItem(initFile);
 		item.setImsSchema(cpConverter.getSchema());
@@ -684,12 +681,6 @@
 	} catch (IOException e) {
 	    ResourceServiceImpl.log.error(messageService.getMessage("error.msg.io.exception") + ":" + e.toString());
 	    throw new UploadResourceFileException(messageService.getMessage("error.msg.io.exception"));
-	} catch (IMSManifestException e) {
-	    ResourceServiceImpl.log.error(messageService.getMessage("error.msg.ims.package") + ":" + e.toString());
-	    throw new UploadResourceFileException(messageService.getMessage("error.msg.ims.package"));
-	} catch (ImscpApplicationException e) {
-	    ResourceServiceImpl.log.error(messageService.getMessage("error.msg.ims.application") + ":" + e.toString());
-	    throw new UploadResourceFileException(messageService.getMessage("error.msg.ims.application"));
 	}
     }
 
Index: lams_tool_larsrc/web/pages/learningobj/navigatortree.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -r71012b6f2ac523d8faaef475332dbad1338c448d
--- lams_tool_larsrc/web/pages/learningobj/navigatortree.jsp	(.../navigatortree.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_larsrc/web/pages/learningobj/navigatortree.jsp	(.../navigatortree.jsp)	(revision 71012b6f2ac523d8faaef475332dbad1338c448d)
@@ -20,82 +20,81 @@
 --%>
 
 <!DOCTYPE html>
-        
 
+
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
 <lams:head>
 	<html:base />
 	<%@ include file="/common/header.jsp"%>
-	
-	<c:set var="sessionMapID" value="${param.sessionMapID}"/>
-	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
-	<c:set var="cpPackage" value="${sessionMap.cpPackage}"/>
-	 
-	<style type="text/css">
-	<!--
-	table { 
-		 margin-left:0px; 
-		 text-align:left; 
-		 }
-	
-	td { 
-		padding:0px; 
-		font-size:12px;
-	}
-			a, A:link, a:visited, a:active
-				{color: #0000aa; text-decoration: none; font-family: Tahoma, Verdana; font-size: 15px}
-			A:hover
-				{color: #ff0000; text-decoration: none; font-family: Tahoma, Verdana; font-size: 15px}
-	-->
-	</style>
-	<script language="JavaScript" type="text/JavaScript">
-	        <!--
-	      	parent.contentFrame.location = "<c:url value="/download/?uuid=${cpPackage.fileUuid}&preferDownload=false"/>";
-	      	parent.contentFrame.focus();
-	        //-->
-	  </script>
 
-	<!-- for javascript tree -->
-	<script language="JavaScript" type="text/JavaScript">
-	        <!--
-	        <c:set var="downloadUrlPrefix">
-	        	<c:url value="/download/${cpPackage.fileUuid}/${cpPackage.fileVersionId}/"/>
-	        </c:set>
-	        <c:set var="downloadUrlSuffix">
-	        	<c:url value="?preferDownload=false"/>
-	        </c:set>
-			<x:parse xml="${cpPackage.organizationXml}" var="xml"/>
-			<c:import var="xsl" url="xmltree.xsl"/>
-			<x:transform xml="${xml}" xslt="${xsl}">
-  				<x:param name="urlPrefix" value="${downloadUrlPrefix}"/>
-  				<x:param name="urlSuffix" value="${downloadUrlSuffix}"/>
-  			</x:transform>
-  			-->
-  	  </script>
-	<script language="JavaScript" src="<lams:LAMSURL/>includes/javascript/tree.js"></script>
-	<script language="JavaScript" src="<lams:LAMSURL/>includes/javascript/tree_tpl.js"></script>
+	<c:set var="sessionMapID" value="${param.sessionMapID}" />
+	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+	<c:set var="cpPackage" value="${sessionMap.cpPackage}" />
 
+	<style type="text/css">
+		table {
+			margin-left: 0px;
+			text-align: left;
+		}
+		
+		td {
+			padding: 0px;
+			font-size: 12px;
+		}
+		
+		a, A:link, a:visited, a:active {
+			color: #0000aa;
+			text-decoration: none;
+			font-family: Tahoma, Verdana;
+			font-size: 15px
+		}
+		
+		A:hover {
+			color: #ff0000;
+			text-decoration: none;
+			font-family: Tahoma, Verdana;
+			font-size: 15px
+		}
+</style>
+	<script type="text/javascript">
+      	parent.contentFrame.location = "<c:url value="/download/?uuid=${cpPackage.fileUuid}&preferDownload=false"/>";
+      	parent.contentFrame.focus();
+      	
+        <c:set var="downloadUrlPrefix">
+        	<c:url value="/download/${cpPackage.fileUuid}/${cpPackage.fileVersionId}/"/>
+        </c:set>
+        <c:set var="downloadUrlSuffix">
+        	<c:url value="?preferDownload=false"/>
+        </c:set>
+		<x:parse xml="${cpPackage.organizationXml}" var="xml"/>
+		<c:import var="xsl" url="xmltree.xsl"/>
+		<x:transform xml="${xml}" xslt="${xsl}">
+ 				<x:param name="urlPrefix" value="${downloadUrlPrefix}"/>
+ 				<x:param name="urlSuffix" value="${downloadUrlSuffix}"/>
+ 			</x:transform>
+  	  </script>
+	<script type="text/javascript"
+		src="<lams:LAMSURL/>includes/javascript/tree.js"></script>
+	<script type="text/javascript"
+		src="<lams:LAMSURL/>includes/javascript/tree_tpl.js"></script>
 </lams:head>
 <body class="stripes">
 	<c:choose>
 		<c:when test="${empty cpPackage.organizationXml}">
-			<p class="body">
-				The content package details are missing.
-			</p>
+			<p class="body">The content package details are missing.</p>
 		</c:when>
 		<c:otherwise>
 			<h2>
 				<c:out value="${cpPackage.title}" />
 			</h2>
 			<c:out value="${cpPackage.description}" escapeXml="false" />
-			<BR><BR>
-			<script language="JavaScript">
-				<!--//
-					new tree (TREE_ITEMS, TREE_TPL);
-				//-->
+			<BR>
+			<BR>
+			<script type="text/javascript">
+				new tree (TREE_ITEMS, TREE_TPL);
 			</script>
 		</c:otherwise>
 	</c:choose>
 </body>
-</lams:html>
+</lams:html>
\ No newline at end of file