Author: tmortagne
Date: 2008-01-19 23:11:31 +0100 (Sat, 19 Jan 2008)
New Revision: 6974
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/XAppManager/WebHome
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-48: Add "pretty name" field to application descriptor class
XAAM-49: Application descriptor is not fully configured.
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
2008-01-19 22:00:26 UTC (rev 6973)
+++
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XApp/XWikiApplicationXapp
2008-01-19 22:11:31 UTC (rev 6974)
@@ -10,11 +10,11 @@
<creator></creator>
<author>XWiki.Admin</author>
<customClass></customClass>
-<contentAuthor></contentAuthor>
+<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1192218584000</creationDate>
-<date>1192218584000</date>
-<contentUpdateDate>1199724180000</contentUpdateDate>
-<version>1.1</version>
+<date>1200779340000</date>
+<contentUpdateDate>1200779340000</contentUpdateDate>
+<version>6.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
@@ -72,6 +72,14 @@
<validationRegExp></validationRegExp>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</appname>
+<appprettyname>
+<name>appprettyname</name>
+<number>12</number>
+<prettyName>Application Pretty Name</prettyName>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+</appprettyname>
<appversion>
<customDisplay></customDisplay>
<name>appversion</name>
@@ -217,7 +225,7 @@
<number>0</number>
<className>XAppClasses.XWikiApplicationClass</className>
<property>
-<appauthors></appauthors>
+<appauthors>XWiki development team</appauthors>
</property>
<property>
<applications>
@@ -228,6 +236,9 @@
<appname>xapp</appname>
</property>
<property>
+<appprettyname>Application Manager</appprettyname>
+</property>
+<property>
<appversion>1.0</appversion>
</property>
<property>
@@ -236,10 +247,12 @@
</dependencies>
</property>
<property>
-<description></description>
+<description>Application to manage applications.</description>
</property>
<property>
-<docstoinclude/>
+<docstoinclude>
+<value>[%]</value>
+</docstoinclude>
</property>
<property>
<docstolink/>
@@ -252,7 +265,7 @@
</documents>
</property>
<property>
-<license></license>
+<license>LGPL</license>
</property>
<property>
<translationdocs>
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
2008-01-19 22:00:26 UTC (rev 6973)
+++
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XApp/XWikiApplicationXwikiapplicationclass
2008-01-19 22:11:31 UTC (rev 6974)
@@ -10,11 +10,11 @@
<creator></creator>
<author>XWiki.Admin</author>
<customClass></customClass>
-<contentAuthor></contentAuthor>
+<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1192211384000</creationDate>
-<date>1192211384000</date>
-<contentUpdateDate>1199724180000</contentUpdateDate>
-<version>1.1</version>
+<date>1200779336000</date>
+<contentUpdateDate>1200779336000</contentUpdateDate>
+<version>7.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
@@ -72,6 +72,14 @@
<validationRegExp></validationRegExp>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</appname>
+<appprettyname>
+<name>appprettyname</name>
+<number>12</number>
+<prettyName>Application Pretty Name</prettyName>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+</appprettyname>
<appversion>
<customDisplay></customDisplay>
<name>appversion</name>
@@ -217,7 +225,7 @@
<number>0</number>
<className>XAppClasses.XWikiApplicationClass</className>
<property>
-<appauthors></appauthors>
+<appauthors>XWiki development team</appauthors>
</property>
<property>
<applications/>
@@ -226,6 +234,9 @@
<appname>XWikiApplicationClass</appname>
</property>
<property>
+<appprettyname>XWikiApplication class</appprettyname>
+</property>
+<property>
<appversion>1.0</appversion>
</property>
<property>
@@ -234,10 +245,12 @@
</dependencies>
</property>
<property>
-<description></description>
+<description>XWikiApplication class, template and sheet.</description>
</property>
<property>
-<docstoinclude/>
+<docstoinclude>
+<value>[%]</value>
+</docstoinclude>
</property>
<property>
<docstolink/>
@@ -250,7 +263,7 @@
</documents>
</property>
<property>
-<license></license>
+<license>LGPL</license>
</property>
<property>
<translationdocs/>
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
2008-01-19 22:00:26 UTC (rev 6973)
+++
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppClasses/XWikiApplicationClass
2008-01-19 22:11:31 UTC (rev 6974)
@@ -12,9 +12,9 @@
<customClass></customClass>
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1192211384000</creationDate>
-<date>1197470383000</date>
-<contentUpdateDate>1199724180000</contentUpdateDate>
-<version>1.1</version>
+<date>1200775298000</date>
+<contentUpdateDate>1200775298000</contentUpdateDate>
+<version>2.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
@@ -71,6 +71,14 @@
<validationRegExp></validationRegExp>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</appname>
+<appprettyname>
+<name>appprettyname</name>
+<number>12</number>
+<prettyName>Application Pretty Name</prettyName>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+</appprettyname>
<appversion>
<customDisplay></customDisplay>
<name>appversion</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
2008-01-19 22:00:26 UTC (rev 6973)
+++
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppManager/WebHome
2008-01-19 22:11:31 UTC (rev 6974)
@@ -12,9 +12,9 @@
<customClass></customClass>
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1192218584000</creationDate>
-<date>1197471094000</date>
-<contentUpdateDate>1199724181000</contentUpdateDate>
-<version>1.1</version>
+<date>1200778515000</date>
+<contentUpdateDate>1200778515000</contentUpdateDate>
+<version>5.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
@@ -54,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 | <a href="$doc.getURL("view",
"action=delete&amp;appname=$app.appname")">$msg.get("delete")</a>
<a href="$doc.getURL("view",
"action=export&amp;appname=$app.appname")">$msg.get("xapp.action.exportrecurse")</a>
<a href="$doc.getURL("view",
"action=reload&amp;appname=$app.appname")">$msg.get("xapp.action.reloadapp")</a>
<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&amp;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)
+ [#if($app.appprettyname && $app.appprettyname.trim() !=
"")$app.appprettyname
($app.appname)#else$app.appname#end>$app.getFullName()] | $app.appversion |
$app.description | <a href="$doc.getURL("view",
"action=delete&amp;appname=$app.appname")">$msg.get("delete")</a>
<a href="$doc.getURL("view",
"action=export&amp;appname=$app.appname")">$msg.get("xapp.action.exportrecurse")</a>
<a href="$doc.getURL("view",
"action=reload&amp;appname=$app.appname")">$msg.get("xapp.action.reloadapp")</a>
<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&amp;packagename=$package.getFilename()]
+ #end
#end</content>
</xwikidoc>
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
2008-01-19 22:00:26 UTC (rev 6973)
+++
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppSheets/XWikiApplicationClassSheet
2008-01-19 22:11:31 UTC (rev 6974)
@@ -12,9 +12,9 @@
<customClass></customClass>
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1192211384000</creationDate>
-<date>1196257658000</date>
-<contentUpdateDate>1199724180000</contentUpdateDate>
-<version>1.1</version>
+<date>1200778537000</date>
+<contentUpdateDate>1200778537000</contentUpdateDate>
+<version>5.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
@@ -54,63 +54,65 @@
<tags/>
</property>
</object>
-<content>#set($Appmanager = $xwiki.applicationmanager)
-#set($Exception = $Appmanager.DefaultException)
-
-#set($object = $doc.getObject("XAppClasses.XWikiApplicationClass"))
-
-#if($object)
- #set($class = $object.xWikiClass)
- #set($appname = $doc.getValue("appname", $object))
-#end
-
-#############################################################################
-
-#if($appname && $appname.length() > 0)
-
- #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
- </dl>
-#else
- 1 Document \"$doc.name\"
+<content>#set($Appmanager = $xwiki.applicationmanager)
+#set($Exception = $Appmanager.DefaultException)
+##
+#set($object = $doc.getObject("XAppClasses.XWikiApplicationClass"))
+##
+#if($object)
+ #set($class = $object.xWikiClass)
+ #set($appname = $doc.getValue("appname", $object))
+#end
+##
+#############################################################################
+##
+#if($appname && $appname.length() > 0)
+ ##
+ #set($app = $Appmanager.getApplicationDocument($doc.getValue("appname",
$object)))
+ ##
+ #if($context.action == "view")
+ 1 Application \"#if($app.appprettyname &&
$app.appprettyname.trim() != "")$app.appprettyname#else$app.appname#end\"
+ #end
+ ##
+ <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
+ </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
2008-01-19 22:00:26 UTC (rev 6973)
+++
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppTemplates/XWikiApplicationClassTemplate
2008-01-19 22:11:31 UTC (rev 6974)
@@ -72,6 +72,14 @@
<validationRegExp></validationRegExp>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</appname>
+<appprettyname>
+<name>appprettyname</name>
+<number>12</number>
+<prettyName>Application Pretty Name</prettyName>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+</appprettyname>
<appversion>
<customDisplay></customDisplay>
<name>appversion</name>
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications