[Yanel-commits] rev 25123 - public/yanel/trunk/src/contributions/resources/resource-creator/src/java/org/wyona/yanel/impl/resources

[michi at wyona.com]

Author: michi
Date: 2007-06-13 23:53:51 +0200 (Wed, 13 Jun 2007)
New Revision: 25123

Modified:
   public/yanel/trunk/src/contributions/resources/resource-creator/src/java/org/wyona/yanel/impl/resources/ResourceCreatorResource.java
Log:
display of path fixed

Modified: public/yanel/trunk/src/contributions/resources/resource-creator/src/java/org/wyona/yanel/impl/resources/ResourceCreatorResource.java
===================================================================
--- public/yanel/trunk/src/contributions/resources/resource-creator/src/java/org/wyona/yanel/impl/resources/ResourceCreatorResource.java	2007-06-13 21:42:06 UTC (rev 25122)
+++ public/yanel/trunk/src/contributions/resources/resource-creator/src/java/org/wyona/yanel/impl/resources/ResourceCreatorResource.java	2007-06-13 21:53:51 UTC (rev 25123)
@@ -166,8 +166,9 @@
     private void getSaveScreen(StringBuffer sb) {
         sb.append("<h4>Create new page (step 3)</h4>");
 
+        Path pathOfNewResource = null;
         try {
-            create();
+            pathOfNewResource = create();
         } catch(Exception e) {
             log.error(e.getMessage(), e);
             sb.append("<p>Exception: "+e.getMessage()+"</p>");
@@ -190,7 +191,7 @@
         }
 
         String createName = request.getParameter("create-name");
-        sb.append("<p>New resource can be accessed at: <a href=\""+createName+"\">"+createName+"</a></p>");
+        sb.append("<p>New resource can be accessed at: <a href=\""+createName+"\">" + pathOfNewResource + "</a></p>");
     }
 
     /**
@@ -329,8 +330,9 @@
     
     /**
      * Creates new resource
+     * @return Path of new resource
      */
-    private void create() throws Exception {
+    private Path create() throws Exception {
         org.wyona.yanel.core.map.Realm realm = getRealm();
         Path pathOfResourceCreator = new Path(getPath());
 
@@ -359,17 +361,18 @@
         if (newResource != null) {
             if (ResourceAttributeHelper.hasAttributeImplemented(newResource, "Creatable", "2")) {
                 ((CreatableV2) newResource).create(request);
-                createConfiguration(newResource);
+                createResourceConfiguration(newResource);
             } else {
                 throw new Exception("creation NOT successfull!");
             }
         }
+        return pathOfNewResource;
     }
 
     /**
      * Create resource configuration (yanel-rc)
      */
-    private void createConfiguration(Resource newResource) throws Exception {
+    private void createResourceConfiguration(Resource newResource) throws Exception {
         StringBuffer rcContent = new StringBuffer("<?xml version=\"1.0\"?>\n\n");
         rcContent.append("<yanel:resource-config xmlns:yanel=\"http://www.wyona.org/yanel/rti/1.0\">\n");
         rcContent.append("<yanel:rti name=\"" + newResource.getRTD().getResourceTypeLocalName() + "\" namespace=\"" + newResource.getRTD().getResourceTypeNamespace() + "\"/>\n\n");
@@ -398,17 +401,6 @@
         log.error("DEBUG: " + newRCPath);
         org.wyona.yanel.core.util.YarepUtil.addNodes(rcRepo, newRCPath.toString(), org.wyona.yarep.core.NodeType.RESOURCE);
 
-/*
-        if (!rcRepo.existsNode(newRCPath.toString())) {
-            // TODO: create node recursively ...
-            org.wyona.yarep.core.Node newNode = rcRepo.getNode(newRCPath.getParent().toString()).addNode(newRCPath.getName(), org.wyona.yarep.core.NodeType.RESOURCE);
-	    log.warn("Node has been created: " + newRCPath);
-        } else {
-	    log.error("Node already exists: " + newRCPath);
-            // TODO: Abort ...!
-        }
-*/
-
         java.io.Writer writer = new java.io.OutputStreamWriter(rcRepo.getNode(newRCPath.toString()).getOutputStream());
         writer.write(rcContent.toString());
         writer.close();