Changeset 3735 in main

Timestamp:

04/21/12 00:31:47 (10 years ago)

Author:

Garth Braithwaite

Message:

java - added objects to get an XML document model map via the document service. Added the ability to lookup a file based on the resource path lookup/find.

Location:

trunk/src/main

Files:

• java/org/ibisph/systemid/ClassPathSystemID.java (modified) (1 diff)
• java/org/ibisph/systemid/ResourceSystemID.java (modified) (2 diffs)
• java/org/ibisph/systemid/modelmap/SystemIDFromHTTPRequestParameter.java (modified) (3 diffs)
• java/org/ibisph/xml/modelmap/DocumentFromHTTPRequestEndOfPathInfo.java (added)
• java/org/ibisph/xml/modelmap/DocumentFromHTTPRequestParameter.java (added)
• java/org/ibisph/xml/modelmap/DocumentFromHTTPRequestPathInfo.java (added)
• java/org/ibisph/xml/service/FileStoredDocument.java (modified) (5 diffs)
• webapps/ibisph-admin/WEB-INF/lib/ibisph-2.1.jar (modified) (previous)
• webapps/ibisph-view/WEB-INF/lib/ibisph-2.1.jar (modified) (previous)

trunk/src/main/java/org/ibisph/systemid/ClassPathSystemID.java

@@ -14 +14 @@
    * @throws java.io.FileNotFoundException
    */
-  public ClassPathSystemID(String urlOrPathAndFilename) throws java.net.MalformedURLException, java.io.IOException { 
+  public ClassPathSystemID(String urlOrPathAndFilename) {
     java.net.URL url = Thread.currentThread().getContextClassLoader().getResource(urlOrPathAndFilename);
     if(null != url) this.systemID = url.toExternalForm();

trunk/src/main/java/org/ibisph/systemid/ResourceSystemID.java

@@ -19 +19 @@
    * @throws java.io.FileNotFoundException
    */
-  public ResourceSystemID(String pathAndFilename) throws Exception {
+  public ResourceSystemID(String pathAndFilename) {
 
     // another way is to use the servlet context like:
@@ -28 +28 @@
   } //----------------------- End of Constructor ----------------------------
  
-  public ResourceSystemID(String contextPath, String subPathAndFilename) throws Exception {
+  public ResourceSystemID(String contextPath, String subPathAndFilename) {
     this(org.ibisph.util.IOPath.concat(contextPath, subPathAndFilename));
   } //----------------------- End of Constructor ----------------------------

trunk/src/main/java/org/ibisph/systemid/modelmap/SystemIDFromHTTPRequestParameter.java

@@ -8 +8 @@
 import org.ibisph.systemid.VerifiedURLSystemID;
 import org.ibisph.util.IOPath;
+import org.ibisph.util.StrLib;
 
 /**
@@ -34 +35 @@
     SystemID xmlSystemID = null;
     String xmlName = request.getParameter("xmlURL");
-    if(xmlName != null) {
+    if(StrLib.isSomething(xmlName)) {
       xmlSystemID = new VerifiedURLSystemID(xmlName);
     }
@@ -40 +41 @@
     else {
       xmlName = request.getParameter("xmlFile");
-      if(xmlName == null) xmlName = request.getParameter("xml");
+      if(!StrLib.isSomething(xmlName)) xmlName = request.getParameter("xml");
       try {
         xmlSystemID = new VerifiedFileSystemID(xmlName);

trunk/src/main/java/org/ibisph/xml/service/FileStoredDocument.java

@@ -13 +13 @@
 import org.ibisph.util.FileLib;
 import org.ibisph.util.IOPath;
+import org.ibisph.util.StrLib;
 
 /**
@@ -48 +49 @@
   } //-------------------------- End of Method ------------------------------
   public org.dom4j.Document get(String xmlPathAndFilename) throws DocumentException {
-    return( get(new File(xmlPathAndFilename)) );
+    String s = getVerifiedPathAndFilename(xmlPathAndFilename);
+    File file = new File(s);
+    return(get(file));
   } //-------------------------- End of Method ------------------------------
 
@@ -64 +67 @@
   public boolean load(File xmlFile, org.dom4j.Document document) throws DocumentException {
     SAXReader xmlReader = new SAXReader();
-    if((xmlFile != null) && xmlFile.exists()) {
+    if((null != xmlFile) && xmlFile.exists()) {
       document.setDocument( xmlReader.read(xmlFile) );
       return(true);
@@ -122 +125 @@
     String xmlPathAndFilename
   ) throws IOException, UnsupportedEncodingException {
-    save(document, xmlPathAndFilename, outputFormat);
+    save(
+      document, 
+      getVerifiedPathAndFilename(xmlPathAndFilename), 
+      this.outputFormat
+    );
   } //-------------------------- End of Method ------------------------------
 
@@ -143 +150 @@
 
 
-  public boolean delete(String documentPathAndName) {
-    return(FileLib.delete(documentPathAndName));
+  public boolean delete(String xmlPathAndFilename) {
+    return(FileLib.delete(xmlPathAndFilename));
   } //-------------------------- End of Method ------------------------------
 
 
-  public boolean exists(String documentPathAndName) {
-    File file = new File(documentPathAndName);
-    boolean exists = file.exists();
-    return(exists);
+  public boolean exists(String xmlPathAndFilename) {
+    return(StrLib.isSomething(getVerifiedPathAndFilename(xmlPathAndFilename)));
   } //-------------------------- End of Method ------------------------------
 
+
+  /**
+   * Helper that localizes getting/searching the path and resource path for 
+   * the given file.  First checks path passed in.  If file exists then that
+   * is verified so return.  Else check the classloader's path.  Else check
+   * the thread's class path.  In the case of the two latter checks a URL/
+   * system id type string is returned
+   * @param pathAndFilename path and filename to be verified.
+   * @return verified path and filename.  If supplied value does not exist 
+   *   then the classpath is checked.
+   * @throws Exception
+   */
+  protected String getVerifiedPathAndFilename(String pathAndFilename) {
+    File file = new File(pathAndFilename);
+    if(file.exists()) return(pathAndFilename);
+
+    java.net.URL url = Thread.currentThread().getContextClassLoader().getResource(pathAndFilename);
+    if(null != url) return(url.toExternalForm());
+
+    url = this.getClass().getClassLoader().getResource(pathAndFilename);
+    if(null != url) return(url.toExternalForm());
+
+    return(null);
+  } //-------------------------- End of Method ------------------------------
+    
 } //============================ END OF CLASS =================================