Author: tmortagne
Date: 2007-11-28 15:01:22 +0100 (Wed, 28 Nov 2007)
New Revision: 6109
Modified:
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XApp/XWikiApplicationXapp
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XApp/XWikiApplicationXwikiapplicationclass
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppClasses/XWikiApplicationClass
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/DeleteAppCode
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ExportAppCode
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ImportAppCode
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ReloadAppCode
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppManager/CreateApplication
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppManager/WebHome
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppResources/Translations
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppSheets/XWikiApplicationClassSheet
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppTemplates/XWikiApplicationClassTemplate
Log:
XAAM-31: XAppTemplates.XWikiApplicationClassTemplate page print exception.
Modified:
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XApp/XWikiApplicationXapp
===================================================================
---
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XApp/XWikiApplicationXapp
2007-11-28 13:23:04 UTC (rev 6108)
+++
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XApp/XWikiApplicationXapp
2007-11-28 14:01:22 UTC (rev 6109)
@@ -13,13 +13,14 @@
<contentAuthor></contentAuthor>
<creationDate>1192218584000</creationDate>
<date>1192218584000</date>
-<contentUpdateDate>1192719385000</contentUpdateDate>
+<contentUpdateDate>1196173411000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
<comment></comment>
+<minorEdit>false</minorEdit>
<object>
<class>
<name>XAppClasses.XWikiApplicationClass</name>
Modified:
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XApp/XWikiApplicationXwikiapplicationclass
===================================================================
---
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XApp/XWikiApplicationXwikiapplicationclass
2007-11-28 13:23:04 UTC (rev 6108)
+++
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XApp/XWikiApplicationXwikiapplicationclass
2007-11-28 14:01:22 UTC (rev 6109)
@@ -13,13 +13,14 @@
<contentAuthor></contentAuthor>
<creationDate>1192211384000</creationDate>
<date>1192211384000</date>
-<contentUpdateDate>1192211384000</contentUpdateDate>
+<contentUpdateDate>1196173411000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
<comment></comment>
+<minorEdit>false</minorEdit>
<object>
<class>
<name>XAppClasses.XWikiApplicationClass</name>
Modified:
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppClasses/XWikiApplicationClass
===================================================================
---
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppClasses/XWikiApplicationClass
2007-11-28 13:23:04 UTC (rev 6108)
+++
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppClasses/XWikiApplicationClass
2007-11-28 14:01:22 UTC (rev 6109)
@@ -13,13 +13,14 @@
<contentAuthor></contentAuthor>
<creationDate>1192211384000</creationDate>
<date>1192211384000</date>
-<contentUpdateDate>1192211384000</contentUpdateDate>
+<contentUpdateDate>1196173411000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
<comment></comment>
+<minorEdit>false</minorEdit>
<class>
<name>XAppClasses.XWikiApplicationClass</name>
<customClass></customClass>
Modified:
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/DeleteAppCode
===================================================================
---
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/DeleteAppCode
2007-11-28 13:23:04 UTC (rev 6108)
+++
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/DeleteAppCode
2007-11-28 14:01:22 UTC (rev 6109)
@@ -13,13 +13,14 @@
<contentAuthor></contentAuthor>
<creationDate>1192218584000</creationDate>
<date>1192218584000</date>
-<contentUpdateDate>1192719385000</contentUpdateDate>
+<contentUpdateDate>1196173411000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
<comment></comment>
+<minorEdit>false</minorEdit>
<object>
<class>
<name>XWiki.TagClass</name>
Modified:
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ExportAppCode
===================================================================
---
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ExportAppCode
2007-11-28 13:23:04 UTC (rev 6108)
+++
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ExportAppCode
2007-11-28 14:01:22 UTC (rev 6109)
@@ -13,13 +13,14 @@
<contentAuthor></contentAuthor>
<creationDate>1192218584000</creationDate>
<date>1192218584000</date>
-<contentUpdateDate>1192719385000</contentUpdateDate>
+<contentUpdateDate>1196173411000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
<comment></comment>
+<minorEdit>false</minorEdit>
<object>
<class>
<name>XWiki.TagClass</name>
Modified:
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ImportAppCode
===================================================================
---
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ImportAppCode
2007-11-28 13:23:04 UTC (rev 6108)
+++
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ImportAppCode
2007-11-28 14:01:22 UTC (rev 6109)
@@ -13,13 +13,14 @@
<contentAuthor></contentAuthor>
<creationDate>1192218584000</creationDate>
<date>1192218584000</date>
-<contentUpdateDate>1192719385000</contentUpdateDate>
+<contentUpdateDate>1196173411000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
<comment></comment>
+<minorEdit>false</minorEdit>
<object>
<class>
<name>XWiki.TagClass</name>
Modified:
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ReloadAppCode
===================================================================
---
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ReloadAppCode
2007-11-28 13:23:04 UTC (rev 6108)
+++
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ReloadAppCode
2007-11-28 14:01:22 UTC (rev 6109)
@@ -13,13 +13,14 @@
<contentAuthor></contentAuthor>
<creationDate>1192218584000</creationDate>
<date>1192218584000</date>
-<contentUpdateDate>1192719385000</contentUpdateDate>
+<contentUpdateDate>1196173411000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
<comment></comment>
+<minorEdit>false</minorEdit>
<object>
<class>
<name>XWiki.TagClass</name>
Modified:
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppManager/CreateApplication
===================================================================
---
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppManager/CreateApplication
2007-11-28 13:23:04 UTC (rev 6108)
+++
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppManager/CreateApplication
2007-11-28 14:01:22 UTC (rev 6109)
@@ -13,13 +13,14 @@
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1192218584000</creationDate>
<date>1192550117000</date>
-<contentUpdateDate>1192719385000</contentUpdateDate>
+<contentUpdateDate>1196173411000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
<comment></comment>
+<minorEdit>false</minorEdit>
<object>
<class>
<name>XWiki.TagClass</name>
Modified:
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppManager/WebHome
===================================================================
---
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppManager/WebHome
2007-11-28 13:23:04 UTC (rev 6108)
+++
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppManager/WebHome
2007-11-28 14:01:22 UTC (rev 6109)
@@ -13,13 +13,14 @@
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1192218584000</creationDate>
<date>1194879690000</date>
-<contentUpdateDate>1194879690000</contentUpdateDate>
-<version>1.4</version>
+<contentUpdateDate>1196173411000</contentUpdateDate>
+<version>1.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
<comment></comment>
+<minorEdit>false</minorEdit>
<object>
<class>
<name>XWiki.TagClass</name>
@@ -53,58 +54,58 @@
<tags/>
</property>
</object>
-<content>#set($Appmanager = $xwiki.applicationmanager)
-#set($Exception = $Appmanager.DefaultException)
-
-#set($action = $request.getParameter("action"))
-#set($confirm = $request.getParameter("confirm"))
-
-#set($appname = $request.getParameter("appname"))
-#set($packagename = $request.getParameter("packagename"))
-#set($recurse = $request.getParameter("recurse"))
-#set($withversion = $request.getParameter("withversion"))
-
-#############################################################################
-
-#if($action)
- #if($action == "delete")
- #includeInContext("XAppCode.DeleteAppCode")
- #elseif($action == "export")
- #includeInContext("XAppCode.ExportAppCode")
- #elseif($action == "import")
- #includeInContext("XAppCode.ImportAppCode")
- #elseif($action == "reload")
- #includeInContext("XAppCode.ReloadAppCode")
- #end
-#end
-
-#############################################################################
-
-1 $msg.get("xapp.appmanager")
-
-#set($listApp = $Appmanager.getApplicationDocumentList())
-
-$msg.get("xapp.totalnumberofapp") : $listApp.size()
-
-[$msg.get("xapp.createapplication")>CreateApplication]
-
-#if($listApp.size() > 0)
- {table}
- $msg.get("xapp.appname") | $msg.get("version") |
$msg.get("xapp.description") | $msg.get("more")
- #foreach($app in $listApp)
- [$app.appname>$app.getFullName()] | $app.appversion |
$app.description |
[$msg.get("delete")>?action=delete&appname=$app.appname]
[$msg.get("xapp.action.exportrecurse")>?action=export&appname=$app.appname]
[$msg.get("xapp.action.reloadapp")>?action=reload&appname=$app.appname]
<a href="$app.getURL("inline")">$msg.get("edit")</a>
- #end
- {table}
-#end
-
-#############################################################################
-
-#if($context.hasAdminRights())
- 1.1 $msg.get("xapp.availablefilestoimport")
-
- #set($listpackage=$doc.getAttachmentList())
- #foreach ($package in $listpackage)
- -
[$package.getFilename()>?action=import&packagename=$package.getFilename()]
- #end
+<content>#set($Appmanager = $xwiki.applicationmanager)
+#set($Exception = $Appmanager.DefaultException)
+
+#set($action = $request.getParameter("action"))
+#set($confirm = $request.getParameter("confirm"))
+
+#set($appname = $request.getParameter("appname"))
+#set($packagename = $request.getParameter("packagename"))
+#set($recurse = $request.getParameter("recurse"))
+#set($withversion = $request.getParameter("withversion"))
+
+#############################################################################
+
+#if($action)
+ #if($action == "delete")
+ #includeInContext("XAppCode.DeleteAppCode")
+ #elseif($action == "export")
+ #includeInContext("XAppCode.ExportAppCode")
+ #elseif($action == "import")
+ #includeInContext("XAppCode.ImportAppCode")
+ #elseif($action == "reload")
+ #includeInContext("XAppCode.ReloadAppCode")
+ #end
+#end
+
+#############################################################################
+
+1 $msg.get("xapp.appmanager")
+
+#set($listApp = $Appmanager.getApplicationDocumentList())
+
+$msg.get("xapp.totalnumberofapp") : $listApp.size()
+
+[$msg.get("xapp.createapplication")>CreateApplication]
+
+#if($listApp.size() > 0)
+ {table}
+ $msg.get("xapp.appname") | $msg.get("version") |
$msg.get("xapp.description") | $msg.get("more")
+ #foreach($app in $listApp)
+ [$app.appname>$app.getFullName()] | $app.appversion |
$app.description |
[$msg.get("delete")>?action=delete&appname=$app.appname]
[$msg.get("xapp.action.exportrecurse")>?action=export&appname=$app.appname]
[$msg.get("xapp.action.reloadapp")>?action=reload&appname=$app.appname]
<a href="$app.getURL("inline")">$msg.get("edit")</a>
+ #end
+ {table}
+#end
+
+#############################################################################
+
+#if($context.hasAdminRights())
+ 1.1 $msg.get("xapp.availablefilestoimport")
+
+ #set($listpackage=$doc.getAttachmentList())
+ #foreach ($package in $listpackage)
+ -
[$package.getFilename()>?action=import&packagename=$package.getFilename()]
+ #end
#end</content>
</xwikidoc>
Modified:
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppResources/Translations
===================================================================
---
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppResources/Translations
2007-11-28 13:23:04 UTC (rev 6108)
+++
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppResources/Translations
2007-11-28 14:01:22 UTC (rev 6109)
@@ -13,13 +13,14 @@
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1192218584000</creationDate>
<date>1192550103000</date>
-<contentUpdateDate>1192719385000</contentUpdateDate>
+<contentUpdateDate>1196173411000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
<comment></comment>
+<minorEdit>false</minorEdit>
<object>
<class>
<name>XWiki.TagClass</name>
Modified:
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppSheets/XWikiApplicationClassSheet
===================================================================
---
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppSheets/XWikiApplicationClassSheet
2007-11-28 13:23:04 UTC (rev 6108)
+++
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppSheets/XWikiApplicationClassSheet
2007-11-28 14:01:22 UTC (rev 6109)
@@ -12,14 +12,15 @@
<customClass></customClass>
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1192211384000</creationDate>
-<date>1192540787000</date>
-<contentUpdateDate>1192540787000</contentUpdateDate>
-<version>1.2</version>
+<date>1196257658000</date>
+<contentUpdateDate>1196257658000</contentUpdateDate>
+<version>5.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
<comment></comment>
+<minorEdit>false</minorEdit>
<object>
<class>
<name>XWiki.TagClass</name>
@@ -57,49 +58,59 @@
#set($Exception = $Appmanager.DefaultException)
#set($object = $doc.getObject("XAppClasses.XWikiApplicationClass"))
-#set($class = $object.xWikiClass)
-#set($app = $Appmanager.getApplicationDocument($doc.getValue("appname",
$object)))
+#if($object)
+ #set($class = $object.xWikiClass)
+ #set($appname = $doc.getValue("appname", $object))
+#end
+
#############################################################################
-1 Application \"$app.appName\"
+#if($appname && $appname.length() > 0)
-<dl>
- #foreach($prop in $class.properties)
- <dt> ${prop.prettyName} </dt>
- #if($context.action == "view" && $prop.name == "documents")
- <dd>
- #foreach($docfullname in $app.getDocumentsNames(false, false))
- [$docfullname>$docfullname]
- #end
- </dd>
- #elseif($context.action == "view" && $prop.name == "docstoinclude")
- <dd>
- #foreach($docfullname in $app.getDocsNameToInclude(false))
- [$docfullname>$docfullname]
- #end
- </dd>
- #elseif($context.action == "view" && $prop.name == "docstolink")
- <dd>
- #foreach($docfullname in $app.getDocsNameToLink(false))
- [$docfullname>$docfullname]
- #end
- </dd>
- #elseif($context.action == "view" && $prop.name ==
"translationdocs")
- <dd>
- #foreach($docfullname in $app.getTranslationDocs())
- [$docfullname>$docfullname]
- #end
- </dd>
- #elseif($context.action == "view" && $prop.name == "applications")
- <dd>
- #foreach($appname in $app.getApplications())
- [$appname>$Appmanager.getApplicationDocument($appname).fullName]
- #end
- </dd>
- #else
- <dd>$doc.display($prop.getName())</dd>
+ #set($app = $Appmanager.getApplicationDocument($doc.getValue("appname",
$object)))
+
+ 1 Application \"$app.appName\"
+
+ <dl>
+ #foreach($prop in $class.properties)
+ <dt> ${prop.prettyName} </dt>
+ #if($context.action == "view" && $prop.name == "documents")
+ <dd>
+ #foreach($docfullname in $app.getDocumentsNames(false, false))
+ [$docfullname>$docfullname]
+ #end
+ </dd>
+ #elseif($context.action == "view" && $prop.name ==
"docstoinclude")
+ <dd>
+ #foreach($docfullname in $app.getDocsNameToInclude(false))
+ [$docfullname>$docfullname]
+ #end
+ </dd>
+ #elseif($context.action == "view" && $prop.name == "docstolink")
+ <dd>
+ #foreach($docfullname in $app.getDocsNameToLink(false))
+ [$docfullname>$docfullname]
+ #end
+ </dd>
+ #elseif($context.action == "view" && $prop.name ==
"translationdocs")
+ <dd>
+ #foreach($docfullname in $app.getTranslationDocs())
+ [$docfullname>$docfullname]
+ #end
+ </dd>
+ #elseif($context.action == "view" && $prop.name ==
"applications")
+ <dd>
+ #foreach($appname in $app.getApplications())
+ [$appname>$Appmanager.getApplicationDocument($appname).fullName]
+ #end
+ </dd>
+ #else
+ <dd>$doc.display($prop.getName())</dd>
+ #end
#end
- #end
-</dl>
-</content></xwikidoc>
\ No newline at end of file
+ </dl>
+#else
+ 1 Document \"$doc.name\"
+#end</content>
+</xwikidoc>
Modified:
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppTemplates/XWikiApplicationClassTemplate
===================================================================
---
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppTemplates/XWikiApplicationClassTemplate
2007-11-28 13:23:04 UTC (rev 6108)
+++
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppTemplates/XWikiApplicationClassTemplate
2007-11-28 14:01:22 UTC (rev 6109)
@@ -13,13 +13,14 @@
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1192211384000</creationDate>
<date>1192215659000</date>
-<contentUpdateDate>1192215659000</contentUpdateDate>
-<version>1.3</version>
+<contentUpdateDate>1196173412000</contentUpdateDate>
+<version>1.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
<comment></comment>
+<minorEdit>false</minorEdit>
<object>
<class>
<name>XAppClasses.XWikiApplicationClass</name>
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications