=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseLinkableObject.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseLinkableObject.java	2012-03-27 17:38:48 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseLinkableObject.java	2012-04-08 20:23:29 +0000
@@ -45,7 +45,7 @@
     private transient String link;
 
     @JsonProperty
-    @JacksonXmlProperty( isAttribute = true, namespace = Dxf2Namespace.NAMESPACE )
+    @JacksonXmlProperty( isAttribute = true )
     public String getLink()
     {
         return link;

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/Resource.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/Resource.java	2012-03-27 17:38:48 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/Resource.java	2012-04-08 20:23:29 +0000
@@ -72,7 +72,7 @@
 
     @JsonProperty
     @JsonView( {DetailedView.class} )
-    @JacksonXmlProperty( isAttribute = true, namespace = Dxf2Namespace.NAMESPACE )
+    @JacksonXmlProperty( isAttribute = true )
     public String getName()
     {
         return name;

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/attributeType.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/attributeType.xsl	2012-03-27 17:38:48 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/attributeType.xsl	2012-04-08 20:23:29 +0000
@@ -6,20 +6,20 @@
 
   <xsl:template match="d:attributeType">
     <div class="attributeType">
-      <h2> <xsl:value-of select="@d:name" /> </h2>
+      <h2> <xsl:value-of select="@name" /> </h2>
 
       <table>
         <tr>
           <td>ID</td>
-          <td> <xsl:value-of select="@d:id" /> </td>
+          <td> <xsl:value-of select="@id" /> </td>
         </tr>
         <tr>
           <td>Last Updated</td>
-          <td> <xsl:value-of select="@d:lastUpdated" /> </td>
+          <td> <xsl:value-of select="@lastUpdated" /> </td>
         </tr>
         <tr>
           <td>Code</td>
-          <td> <xsl:value-of select="@d:code" /> </td>
+          <td> <xsl:value-of select="@code" /> </td>
         </tr>
         <tr>
           <td>Mandatory</td>

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/category.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/category.xsl	2012-03-27 17:38:48 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/category.xsl	2012-04-08 20:23:29 +0000
@@ -6,20 +6,20 @@
 
   <xsl:template match="d:category">
     <div class="category">
-      <h2> <xsl:value-of select="@d:name" /> </h2>
+      <h2> <xsl:value-of select="@name" /> </h2>
 
       <table>
         <tr>
           <td>ID</td>
-          <td> <xsl:value-of select="@d:id" /> </td>
+          <td> <xsl:value-of select="@id" /> </td>
         </tr>
         <tr>
           <td>Last Updated</td>
-          <td> <xsl:value-of select="@d:lastUpdated" /> </td>
+          <td> <xsl:value-of select="@lastUpdated" /> </td>
         </tr>
         <tr>
           <td>Code</td>
-          <td> <xsl:value-of select="@d:code" /> </td>
+          <td> <xsl:value-of select="@code" /> </td>
         </tr>
       </table>
 

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/categoryCombo.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/categoryCombo.xsl	2012-03-27 17:38:48 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/categoryCombo.xsl	2012-04-08 20:23:29 +0000
@@ -6,20 +6,20 @@
 
   <xsl:template match="d:categoryCombo">
     <div class="categoryCombo">
-      <h2> <xsl:value-of select="@d:name" /> </h2>
+      <h2> <xsl:value-of select="@name" /> </h2>
 
       <table>
         <tr>
           <td>ID</td>
-          <td> <xsl:value-of select="@d:id" /> </td>
+          <td> <xsl:value-of select="@id" /> </td>
         </tr>
         <tr>
           <td>Last Updated</td>
-          <td> <xsl:value-of select="@d:lastUpdated" /> </td>
+          <td> <xsl:value-of select="@lastUpdated" /> </td>
         </tr>
         <tr>
           <td>Code</td>
-          <td> <xsl:value-of select="@d:code" /> </td>
+          <td> <xsl:value-of select="@code" /> </td>
         </tr>
       </table>
 

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/categoryOption.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/categoryOption.xsl	2012-03-27 17:38:48 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/categoryOption.xsl	2012-04-08 20:23:29 +0000
@@ -6,20 +6,20 @@
 
   <xsl:template match="d:categoryOption">
     <div class="categoryOption">
-      <h2> <xsl:value-of select="@d:name" /> </h2>
+      <h2> <xsl:value-of select="@name" /> </h2>
 
       <table>
         <tr>
           <td>ID</td>
-          <td> <xsl:value-of select="@d:id" /> </td>
+          <td> <xsl:value-of select="@id" /> </td>
         </tr>
         <tr>
           <td>Last Updated</td>
-          <td> <xsl:value-of select="@d:lastUpdated" /> </td>
+          <td> <xsl:value-of select="@lastUpdated" /> </td>
         </tr>
         <tr>
           <td>Code</td>
-          <td> <xsl:value-of select="@d:code" /> </td>
+          <td> <xsl:value-of select="@code" /> </td>
         </tr>
       </table>
 

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/categoryOptionCombo.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/categoryOptionCombo.xsl	2012-03-27 17:38:48 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/categoryOptionCombo.xsl	2012-04-08 20:23:29 +0000
@@ -6,20 +6,20 @@
 
   <xsl:template match="d:categoryOptionCombo">
     <div class="categoryOptionCombo">
-      <h2> <xsl:value-of select="@d:name" /> </h2>
+      <h2> <xsl:value-of select="@name" /> </h2>
 
       <table>
         <tr>
           <td>ID</td>
-          <td> <xsl:value-of select="@d:id" /> </td>
+          <td> <xsl:value-of select="@id" /> </td>
         </tr>
         <tr>
           <td>Last Updated</td>
-          <td> <xsl:value-of select="@d:lastUpdated" /> </td>
+          <td> <xsl:value-of select="@lastUpdated" /> </td>
         </tr>
         <tr>
           <td>Code</td>
-          <td> <xsl:value-of select="@d:code" /> </td>
+          <td> <xsl:value-of select="@code" /> </td>
         </tr>
       </table>
 

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/chart.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/chart.xsl	2012-03-27 20:10:41 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/chart.xsl	2012-04-08 20:23:29 +0000
@@ -6,12 +6,12 @@
 
   <xsl:template match="d:chart">
     <div class="chart">
-      <h2> <xsl:value-of select="@d:name"/> </h2>
+      <h2> <xsl:value-of select="@name"/> </h2>
 	  
 	  <table>
 		<tr>
 			<td>Resource Data</td>
-			<td><a href="{@d:link}/data">png</a></td>
+			<td><a href="{@link}/data">png</a></td>
 		</tr>
 		<tr>
 			<td>width</td>
@@ -54,22 +54,22 @@
 		</tr>
 	  </table><br/>
 	  
-      <a href="{@d:link}/data"><img src="{@d:link}/data" style="border-style:solid; border-width: 1px; padding: 5px;" /></a>
+      <a href="{@link}/data"><img src="{@link}/data" style="border-style:solid; border-width: 1px; padding: 5px;" /></a>
 
       <h3>Details</h3>
 
       <table>
         <tr>
           <td>ID</td>
-          <td> <xsl:value-of select="@d:id"/> </td>
+          <td> <xsl:value-of select="@id"/> </td>
         </tr>
         <tr>
           <td>Last Updated</td>
-          <td> <xsl:value-of select="@d:lastUpdated"/> </td>
+          <td> <xsl:value-of select="@lastUpdated"/> </td>
         </tr>
         <tr>
           <td>Code</td>
-          <td> <xsl:value-of select="@d:code" /> </td>
+          <td> <xsl:value-of select="@code" /> </td>
         </tr>
         <tr>
           <td>Series</td>

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/constant.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/constant.xsl	2012-03-27 21:38:22 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/constant.xsl	2012-04-08 20:23:29 +0000
@@ -6,20 +6,20 @@
 
   <xsl:template match="d:constant">
     <div class="constant">
-      <h2> <xsl:value-of select="@d:name" /> </h2>
+      <h2> <xsl:value-of select="@name" /> </h2>
 
       <table>
         <tr>
           <td>ID</td>
-          <td> <xsl:value-of select="@d:id" /> </td>
+          <td> <xsl:value-of select="@id" /> </td>
         </tr>
         <tr>
           <td>Last Updated</td>
-          <td> <xsl:value-of select="@d:lastUpdated" /> </td>
+          <td> <xsl:value-of select="@lastUpdated" /> </td>
         </tr>
         <tr>
           <td>Code</td>
-          <td> <xsl:value-of select="@d:code" /> </td>
+          <td> <xsl:value-of select="@code" /> </td>
         </tr>
         <tr>
           <td>Value</td>

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataElement.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataElement.xsl	2012-03-27 17:38:48 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataElement.xsl	2012-04-08 20:23:29 +0000
@@ -6,20 +6,20 @@
 
   <xsl:template match="d:dataElement">
     <div class="dataElement">
-      <h2> <xsl:value-of select="@d:name" /> </h2>
+      <h2> <xsl:value-of select="@name" /> </h2>
 
       <table>
         <tr>
           <td>ID</td>
-          <td> <xsl:value-of select="@d:id" /> </td>
+          <td> <xsl:value-of select="@id" /> </td>
         </tr>
         <tr>
           <td>Last Updated</td>
-          <td> <xsl:value-of select="@d:lastUpdated" /> </td>
+          <td> <xsl:value-of select="@lastUpdated" /> </td>
         </tr>
         <tr>
           <td>Code</td>
-          <td> <xsl:value-of select="@d:code" /> </td>
+          <td> <xsl:value-of select="@code" /> </td>
         </tr>
         <tr>
           <td>Short Name</td>

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataElementGroup.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataElementGroup.xsl	2012-03-27 17:38:48 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataElementGroup.xsl	2012-04-08 20:23:29 +0000
@@ -6,20 +6,20 @@
 
   <xsl:template match="d:dataElementGroup">
     <div class="dataElementGroup">
-      <h2> <xsl:value-of select="@d:name" /> </h2>
+      <h2> <xsl:value-of select="@name" /> </h2>
 
       <table>
         <tr>
           <td>ID</td>
-          <td> <xsl:value-of select="@d:id" /> </td>
+          <td> <xsl:value-of select="@id" /> </td>
         </tr>
         <tr>
           <td>Last Updated</td>
-          <td> <xsl:value-of select="@d:lastUpdated" /> </td>
+          <td> <xsl:value-of select="@lastUpdated" /> </td>
         </tr>
         <tr>
           <td>Code</td>
-          <td> <xsl:value-of select="@d:code" /> </td>
+          <td> <xsl:value-of select="@code" /> </td>
         </tr>
       </table>
 

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataElementGroupSet.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataElementGroupSet.xsl	2012-03-27 17:38:48 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataElementGroupSet.xsl	2012-04-08 20:23:29 +0000
@@ -6,20 +6,20 @@
 
   <xsl:template match="d:dataElementGroupSet">
     <div class="dataElementGroupSet">
-      <h2> <xsl:value-of select="@d:name" /> </h2>
+      <h2> <xsl:value-of select="@name" /> </h2>
 
       <table>
         <tr>
           <td>ID</td>
-          <td> <xsl:value-of select="@d:id" /> </td>
+          <td> <xsl:value-of select="@id" /> </td>
         </tr>
         <tr>
           <td>Last Updated</td>
-          <td> <xsl:value-of select="@d:lastUpdated" /> </td>
+          <td> <xsl:value-of select="@lastUpdated" /> </td>
         </tr>
         <tr>
           <td>Code</td>
-          <td> <xsl:value-of select="@d:code" /> </td>
+          <td> <xsl:value-of select="@code" /> </td>
         </tr>
       </table>
 

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataSet.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataSet.xsl	2012-03-27 20:10:41 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataSet.xsl	2012-04-08 20:23:29 +0000
@@ -7,20 +7,20 @@
   <xsl:template match="d:dataSet">
     <div class="dataSet">
       <h2>
-        <xsl:value-of select="@d:name" />
+        <xsl:value-of select="@name" />
       </h2>
       <table>
         <tr>
           <td>ID</td>
-          <td> <xsl:value-of select="@d:id" /> </td>
+          <td> <xsl:value-of select="@id" /> </td>
         </tr>
         <tr>
           <td>Last Updated</td>
-          <td> <xsl:value-of select="@d:lastUpdated" /> </td>
+          <td> <xsl:value-of select="@lastUpdated" /> </td>
         </tr>
         <tr>
           <td>Code</td>
-          <td> <xsl:value-of select="@d:code" /> </td>
+          <td> <xsl:value-of select="@code" /> </td>
         </tr>
         <tr>
           <td>Short Name</td>

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/document.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/document.xsl	2012-03-27 17:38:48 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/document.xsl	2012-04-08 20:23:29 +0000
@@ -6,23 +6,23 @@
 
   <xsl:template match="d:document">
     <div class="document">
-      <h2> <xsl:value-of select="@d:name" /> </h2>
+      <h2> <xsl:value-of select="@name" /> </h2>
 	  
 	  <table>
 		<tr>
 			<td>Resource Data</td>
-			<td><a href="{@d:link}/data">any</a></td>
+			<td><a href="{@link}/data">any</a></td>
 		</tr>
 	  </table><br/>
 	  
       <table>
         <tr>
           <td>ID</td>
-          <td> <xsl:value-of select="@d:id" /> </td>
+          <td> <xsl:value-of select="@id" /> </td>
         </tr>
         <tr>
           <td>Last Updated</td>
-          <td> <xsl:value-of select="@d:lastUpdated" /> </td>
+          <td> <xsl:value-of select="@lastUpdated" /> </td>
         </tr>
         <tr>
           <td>URL</td>

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/grid.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/grid.xsl	2011-12-15 11:53:38 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/grid.xsl	2012-04-08 20:23:29 +0000
@@ -5,7 +5,7 @@
     >
 
   <xsl:template match="d:header">
-	<th> <xsl:value-of select="@d:name"/> </th>
+	<th> <xsl:value-of select="@name"/> </th>
   </xsl:template>
   
   <xsl:template match="d:rows">
@@ -36,7 +36,7 @@
 		</thead>
 		<tbody>
 		  <xsl:apply-templates select="d:rows"/>
-		</tbody>
+		</tbody>
 	  </table>	  
 	</div>
   </xsl:template>

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/identifiable-row.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/identifiable-row.xsl	2012-03-27 17:38:48 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/identifiable-row.xsl	2012-04-08 20:23:29 +0000
@@ -4,11 +4,11 @@
 
   <xsl:template match="*" mode="row">
     <tr>
-      <td> <xsl:value-of select="@d:name"/> </td>
-      <td> <a href="{@d:link}">html</a> </td>
-      <td> <a href="{@d:link}.xml">xml</a> </td>
-      <td> <a href="{@d:link}.json">json</a> </td>
-      <td> <a href="{@d:link}.jsonp">jsonp</a> </td>
+      <td> <xsl:value-of select="@name"/> </td>
+      <td> <a href="{@link}">html</a> </td>
+      <td> <a href="{@link}.xml">xml</a> </td>
+      <td> <a href="{@link}.json">json</a> </td>
+      <td> <a href="{@link}.jsonp">jsonp</a> </td>
     </tr>
   </xsl:template>
 

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicator.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicator.xsl	2012-03-27 20:10:41 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicator.xsl	2012-04-08 20:23:29 +0000
@@ -7,20 +7,20 @@
   <xsl:template match="d:indicator">
     <div class="indicator">
       <h2>
-        <xsl:value-of select="@d:name" />
+        <xsl:value-of select="@name" />
       </h2>
       <table>
         <tr>
           <td>ID</td>
-          <td> <xsl:value-of select="@d:id" /> </td>
+          <td> <xsl:value-of select="@id" /> </td>
         </tr>
         <tr>
           <td>Last Updated</td>
-          <td> <xsl:value-of select="@d:lastUpdated" /> </td>
+          <td> <xsl:value-of select="@lastUpdated" /> </td>
         </tr>
         <tr>
           <td>Code</td>
-          <td> <xsl:value-of select="@d:code" /> </td>
+          <td> <xsl:value-of select="@code" /> </td>
         </tr>
         <tr>
           <td>Short Name</td>

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorGroup.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorGroup.xsl	2012-03-28 09:59:27 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorGroup.xsl	2012-04-08 20:23:29 +0000
@@ -6,20 +6,20 @@
 
   <xsl:template match="d:indicatorGroup">
     <div class="indicatorGroup">
-      <h2> <xsl:value-of select="@d:name" /> </h2>
+      <h2> <xsl:value-of select="@name" /> </h2>
 
       <table>
         <tr>
           <td>ID</td>
-          <td> <xsl:value-of select="@d:id" /> </td>
+          <td> <xsl:value-of select="@id" /> </td>
         </tr>
         <tr>
           <td>Last Updated</td>
-          <td> <xsl:value-of select="@d:lastUpdated" /> </td>
+          <td> <xsl:value-of select="@lastUpdated" /> </td>
         </tr>
         <tr>
           <td>Code</td>
-          <td> <xsl:value-of select="@d:code" /> </td>
+          <td> <xsl:value-of select="@code" /> </td>
         </tr>
       </table>
 

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorGroupSet.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorGroupSet.xsl	2012-03-27 20:10:41 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorGroupSet.xsl	2012-04-08 20:23:29 +0000
@@ -6,20 +6,20 @@
 
   <xsl:template match="d:indicatorGroupSet">
     <div class="indicatorGroupSet">
-      <h2> <xsl:value-of select="@d:name" /> </h2>
+      <h2> <xsl:value-of select="@name" /> </h2>
 
       <table>
         <tr>
           <td>ID</td>
-          <td> <xsl:value-of select="@d:id" /> </td>
+          <td> <xsl:value-of select="@id" /> </td>
         </tr>
         <tr>
           <td>Last Updated</td>
-          <td> <xsl:value-of select="@d:lastUpdated" /> </td>
+          <td> <xsl:value-of select="@lastUpdated" /> </td>
         </tr>
         <tr>
           <td>Code</td>
-          <td> <xsl:value-of select="@d:code" /> </td>
+          <td> <xsl:value-of select="@code" /> </td>
         </tr>
         <tr>
           <td>Compulsory</td>

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorType.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorType.xsl	2012-03-27 17:38:48 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorType.xsl	2012-04-08 20:23:29 +0000
@@ -7,20 +7,20 @@
   <xsl:template match="d:indicatorType">
     <div class="indicatorType">
       <h2>
-        <xsl:value-of select="@d:name" />
+        <xsl:value-of select="@name" />
       </h2>
       <table>
         <tr>
           <td>ID</td>
-          <td> <xsl:value-of select="@d:id" /> </td>
+          <td> <xsl:value-of select="@id" /> </td>
         </tr>
         <tr>
           <td>Last Updated</td>
-          <td> <xsl:value-of select="@d:lastUpdated" /> </td>
+          <td> <xsl:value-of select="@lastUpdated" /> </td>
         </tr>
         <tr>
           <td>Code</td>
-          <td> <xsl:value-of select="@d:code" /> </td>
+          <td> <xsl:value-of select="@code" /> </td>
         </tr>
         <tr>
           <td>Factor</td>

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/map.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/map.xsl	2012-03-27 17:38:48 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/map.xsl	2012-04-08 20:23:29 +0000
@@ -4,12 +4,12 @@
 
   <xsl:template match="d:map">
     <div class="map">
-      <h2><xsl:value-of select="@d:name"/></h2>
+      <h2><xsl:value-of select="@name"/></h2>
 	  
 	  <table>
 		<tr>
 			<td>Resource Data</td>
-			<td><a href="{@d:link}/data">png</a></td>
+			<td><a href="{@link}/data">png</a></td>
 		</tr>
 	  </table><br/>
 	  
@@ -32,7 +32,7 @@
 		</tr>
 	  </table><br/>
 	  
-      <a href="{@d:link}/data"><img src="{@d:link}/data" style="border-style:solid; border-width: 1px; padding: 5px;" /></a>
+      <a href="{@link}/data"><img src="{@link}/data" style="border-style:solid; border-width: 1px; padding: 5px;" /></a>
 
       <h3>Details</h3>
 
@@ -43,7 +43,7 @@
         <xsl:for-each select="child::*">
           <tr><td><xsl:value-of select="local-name()"/></td><td>
             <xsl:choose>
-              <xsl:when test="@d:name"><a href="{@d:link}"><xsl:value-of select="@d:name"/></a>
+              <xsl:when test="@name"><a href="{@link}"><xsl:value-of select="@name"/></a>
               </xsl:when>
               <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
             </xsl:choose>
@@ -55,34 +55,34 @@
 
   <xsl:template match="d:map" mode="row">
     <tr>
-      <td><xsl:value-of select="@d:name"/></td>
+      <td><xsl:value-of select="@name"/></td>
       <td>
         <xsl:element name="a">
-          <xsl:attribute name="href"><xsl:value-of select="@d:link"/></xsl:attribute>
+          <xsl:attribute name="href"><xsl:value-of select="@link"/></xsl:attribute>
           <xsl:text>html</xsl:text>
         </xsl:element>
       </td>
       <td>
         <xsl:element name="a">
-          <xsl:attribute name="href"><xsl:value-of select="concat(@d:link,'.png')"/></xsl:attribute>
+          <xsl:attribute name="href"><xsl:value-of select="concat(@link,'.png')"/></xsl:attribute>
           <xsl:text>png</xsl:text>
         </xsl:element>
       </td>
       <td>
         <xsl:element name="a">
-          <xsl:attribute name="href"><xsl:value-of select="concat(@d:link,'.xml')"/></xsl:attribute>
+          <xsl:attribute name="href"><xsl:value-of select="concat(@link,'.xml')"/></xsl:attribute>
           <xsl:text>xml</xsl:text>
         </xsl:element>
       </td>
       <td>
         <xsl:element name="a">
-          <xsl:attribute name="href"><xsl:value-of select="concat(@d:link,'.json')"/></xsl:attribute>
+          <xsl:attribute name="href"><xsl:value-of select="concat(@link,'.json')"/></xsl:attribute>
           <xsl:text>json</xsl:text>
         </xsl:element>
       </td>
       <td>
         <xsl:element name="a">
-          <xsl:attribute name="href"><xsl:value-of select="concat(@d:link,'.jsonp')"/></xsl:attribute>
+          <xsl:attribute name="href"><xsl:value-of select="concat(@link,'.jsonp')"/></xsl:attribute>
           <xsl:text>jsonp</xsl:text>
         </xsl:element>
       </td>

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/messageConversation.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/messageConversation.xsl	2012-03-27 17:38:48 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/messageConversation.xsl	2012-04-08 20:23:29 +0000
@@ -7,20 +7,20 @@
   <xsl:template match="d:messageConversation">
     <div class="messageConversation">
       <h2>
-        <xsl:value-of select="@d:name" />
+        <xsl:value-of select="@name" />
       </h2>
       <table>
         <tr>
           <td>ID</td>
-          <td> <xsl:value-of select="@d:id" /> </td>
+          <td> <xsl:value-of select="@id" /> </td>
         </tr>
         <tr>
           <td>Last Updated</td>
-          <td> <xsl:value-of select="@d:lastUpdated" /> </td>
+          <td> <xsl:value-of select="@lastUpdated" /> </td>
         </tr>
         <tr>
           <td>Code</td>
-          <td> <xsl:value-of select="@d:code" /> </td>
+          <td> <xsl:value-of select="@code" /> </td>
         </tr>
       </table>
 
@@ -49,7 +49,7 @@
       </tr>
       <tr>
         <td>Sender</td>
-        <td> <xsl:value-of select="d:sender/@d:name" /> </td>
+        <td> <xsl:value-of select="d:sender/@name" /> </td>
       </tr>
     </table>
     <br/>

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnit.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnit.xsl	2012-03-27 20:10:41 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnit.xsl	2012-04-08 20:23:29 +0000
@@ -6,20 +6,20 @@
   
   <xsl:template match="d:organisationUnit">
     <div class="organisationUnit">
-      <h2> <xsl:value-of select="@d:name" /> </h2>
+      <h2> <xsl:value-of select="@name" /> </h2>
 
       <table>
         <tr>
           <td>ID</td>
-          <td> <xsl:value-of select="@d:id" /> </td>
+          <td> <xsl:value-of select="@id" /> </td>
         </tr>
         <tr>
           <td>Last Updated</td>
-          <td> <xsl:value-of select="@d:lastUpdated" /> </td>
+          <td> <xsl:value-of select="@lastUpdated" /> </td>
         </tr>
         <tr>
           <td>Code</td>
-          <td> <xsl:value-of select="@d:code" /> </td>
+          <td> <xsl:value-of select="@code" /> </td>
         </tr>
         <tr>
           <td>Short Name</td>

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnitGroup.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnitGroup.xsl	2012-03-28 09:59:27 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnitGroup.xsl	2012-04-08 20:23:29 +0000
@@ -6,20 +6,20 @@
 
   <xsl:template match="d:organisationUnitGroup">
     <div class="organisationUnitGroup">
-      <h2> <xsl:value-of select="@d:name" /> </h2>
+      <h2> <xsl:value-of select="@name" /> </h2>
 
       <table>
         <tr>
           <td>ID</td>
-          <td> <xsl:value-of select="@d:id" /> </td>
+          <td> <xsl:value-of select="@id" /> </td>
         </tr>
         <tr>
           <td>Last Updated</td>
-          <td> <xsl:value-of select="@d:lastUpdated" /> </td>
+          <td> <xsl:value-of select="@lastUpdated" /> </td>
         </tr>
         <tr>
           <td>Code</td>
-          <td> <xsl:value-of select="@d:code" /> </td>
+          <td> <xsl:value-of select="@code" /> </td>
         </tr>
       </table>
 

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnitGroupSet.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnitGroupSet.xsl	2012-03-28 09:59:27 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnitGroupSet.xsl	2012-04-08 20:23:29 +0000
@@ -6,20 +6,20 @@
 
   <xsl:template match="d:organisationUnitGroupSet">
     <div class="organisationUnitGroupSet">
-      <h2> <xsl:value-of select="@d:name" /> </h2>
+      <h2> <xsl:value-of select="@name" /> </h2>
 
       <table>
         <tr>
           <td>ID</td>
-          <td> <xsl:value-of select="@d:id" /> </td>
+          <td> <xsl:value-of select="@id" /> </td>
         </tr>
         <tr>
           <td>Last Updated</td>
-          <td> <xsl:value-of select="@d:lastUpdated" /> </td>
+          <td> <xsl:value-of select="@lastUpdated" /> </td>
         </tr>
         <tr>
           <td>Code</td>
-          <td> <xsl:value-of select="@d:code" /> </td>
+          <td> <xsl:value-of select="@code" /> </td>
         </tr>
       </table>
 

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/report.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/report.xsl	2012-03-28 09:59:27 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/report.xsl	2012-04-08 20:23:29 +0000
@@ -6,13 +6,13 @@
 
   <xsl:template match="d:report">
   <div class="report">
-    <h2> <xsl:value-of select="@d:name" /> </h2>
+    <h2> <xsl:value-of select="@name" /> </h2>
 	  
 	  <table>
 		<tr>
 			<td>Resource Data</td>
-			<td><a href="{@d:link}/data">pdf</a></td>
-			<td><a href="{@d:link}/data.xls">xls</a></td>
+			<td><a href="{@link}/data">pdf</a></td>
+			<td><a href="{@link}/data.xls">xls</a></td>
 		</tr>
 		<tr>
 			<td>ou</td>
@@ -27,15 +27,15 @@
     <table>
       <tr>
         <td>ID</td>
-        <td> <xsl:value-of select="@d:id" /> </td>
+        <td> <xsl:value-of select="@id" /> </td>
       </tr>
       <tr>
         <td>Last Updated</td>
-        <td> <xsl:value-of select="@d:lastUpdated" /> </td>
+        <td> <xsl:value-of select="@lastUpdated" /> </td>
       </tr>
       <tr>
         <td>Code</td>
-        <td> <xsl:value-of select="@d:code" /> </td>
+        <td> <xsl:value-of select="@code" /> </td>
       </tr>
       <tr>
         <td>UsingOrgUnitGroupSets</td>

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/reportTable.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/reportTable.xsl	2012-03-27 17:38:48 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/reportTable.xsl	2012-04-08 20:23:29 +0000
@@ -6,15 +6,15 @@
 
   <xsl:template match="d:reportTable">
     <div class="reportTable">
-      <h2> <xsl:value-of select="@d:name" /> </h2>
+      <h2> <xsl:value-of select="@name" /> </h2>
 	  
 	  <table>
 		<tr>
 			<td>Resource Data</td>
-			<td><a href="{@d:link}/data">html</a></td>
-			<td><a href="{@d:link}/data.pdf">pdf</a></td>
-			<td><a href="{@d:link}/data.xls">xls</a></td>
-			<td><a href="{@d:link}/data.csv">csv</a></td>
+			<td><a href="{@link}/data">html</a></td>
+			<td><a href="{@link}/data.pdf">pdf</a></td>
+			<td><a href="{@link}/data.xls">xls</a></td>
+			<td><a href="{@link}/data.csv">csv</a></td>
 		</tr>
 		<tr>
 			<td>ou</td>
@@ -29,15 +29,15 @@
       <table>
         <tr>
           <td>ID</td>
-          <td> <xsl:value-of select="@d:id" /> </td>
+          <td> <xsl:value-of select="@id" /> </td>
         </tr>
         <tr>
           <td>Last Updated</td>
-          <td> <xsl:value-of select="@d:lastUpdated" /> </td>
+          <td> <xsl:value-of select="@lastUpdated" /> </td>
         </tr>
         <tr>
           <td>Code</td>
-          <td> <xsl:value-of select="@d:code" /> </td>
+          <td> <xsl:value-of select="@code" /> </td>
         </tr>
         <tr>
           <td>DoIndicators</td>

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/sqlView.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/sqlView.xsl	2012-03-27 17:38:48 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/sqlView.xsl	2012-04-08 20:23:29 +0000
@@ -7,20 +7,20 @@
   <xsl:template match="d:sqlView">
     <div class="sqlView">
       <h2>
-        <xsl:value-of select="@d:name" />
+        <xsl:value-of select="@name" />
       </h2>
       <table>
         <tr>
           <td>ID</td>
-          <td> <xsl:value-of select="@d:id" /> </td>
+          <td> <xsl:value-of select="@id" /> </td>
         </tr>
         <tr>
           <td>Last Updated</td>
-          <td> <xsl:value-of select="@d:lastUpdated" /> </td>
+          <td> <xsl:value-of select="@lastUpdated" /> </td>
         </tr>
         <tr>
           <td>Code</td>
-          <td> <xsl:value-of select="@d:code" /> </td>
+          <td> <xsl:value-of select="@code" /> </td>
         </tr>
         <tr>
           <td>Description</td>

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/user.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/user.xsl	2012-03-28 09:29:38 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/user.xsl	2012-04-08 20:23:29 +0000
@@ -6,20 +6,20 @@
   <xsl:template match="d:user">
     <div class="user">
       <h2>
-        <xsl:value-of select="@d:name" />
+        <xsl:value-of select="@name" />
       </h2>
       <table>
         <tr>
           <td>ID</td>
-          <td> <xsl:value-of select="@d:id" /> </td>
+          <td> <xsl:value-of select="@id" /> </td>
         </tr>
         <tr>
           <td>Last Updated</td>
-          <td> <xsl:value-of select="@d:lastUpdated" /> </td>
+          <td> <xsl:value-of select="@lastUpdated" /> </td>
         </tr>
         <tr>
           <td>Code</td>
-          <td> <xsl:value-of select="@d:code" /> </td>
+          <td> <xsl:value-of select="@code" /> </td>
         </tr>
         <tr>
           <td>First Name</td>

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/userAuthorityGroup.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/userAuthorityGroup.xsl	2012-03-28 09:29:38 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/userAuthorityGroup.xsl	2012-04-08 20:23:29 +0000
@@ -6,20 +6,20 @@
   <xsl:template match="d:userAuthorityGroup">
     <div class="userAuthorityGroup">
       <h2>
-        <xsl:value-of select="@d:name" />
+        <xsl:value-of select="@name" />
       </h2>
       <table>
         <tr>
           <td>ID</td>
-          <td> <xsl:value-of select="@d:id" /> </td>
+          <td> <xsl:value-of select="@id" /> </td>
         </tr>
         <tr>
           <td>Last Updated</td>
-          <td> <xsl:value-of select="@d:lastUpdated" /> </td>
+          <td> <xsl:value-of select="@lastUpdated" /> </td>
         </tr>
         <tr>
           <td>Code</td>
-          <td> <xsl:value-of select="@d:code" /> </td>
+          <td> <xsl:value-of select="@code" /> </td>
         </tr>
       </table>
 

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/userGroup.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/userGroup.xsl	2012-03-27 17:38:48 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/userGroup.xsl	2012-04-08 20:23:29 +0000
@@ -6,20 +6,20 @@
   <xsl:template match="d:userGroup">
     <div class="userGroup">
       <h2>
-        <xsl:value-of select="@d:name" />
+        <xsl:value-of select="@name" />
       </h2>
       <table>
         <tr>
           <td>ID</td>
-          <td> <xsl:value-of select="@d:id" /> </td>
+          <td> <xsl:value-of select="@id" /> </td>
         </tr>
         <tr>
           <td>Last Updated</td>
-          <td> <xsl:value-of select="@d:lastUpdated" /> </td>
+          <td> <xsl:value-of select="@lastUpdated" /> </td>
         </tr>
         <tr>
           <td>Code</td>
-          <td> <xsl:value-of select="@d:code" /> </td>
+          <td> <xsl:value-of select="@code" /> </td>
         </tr>
       </table>
 

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/validationRule.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/validationRule.xsl	2012-03-27 17:38:48 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/validationRule.xsl	2012-04-08 20:23:29 +0000
@@ -7,20 +7,20 @@
   <xsl:template match="d:validationRule">
     <div class="validationRule">
       <h2>
-        <xsl:value-of select="@d:name" />
+        <xsl:value-of select="@name" />
       </h2>
       <table>
         <tr>
           <td>ID</td>
-          <td> <xsl:value-of select="@d:id" /> </td>
+          <td> <xsl:value-of select="@id" /> </td>
         </tr>
         <tr>
           <td>Last Updated</td>
-          <td> <xsl:value-of select="@d:lastUpdated" /> </td>
+          <td> <xsl:value-of select="@lastUpdated" /> </td>
         </tr>
         <tr>
           <td>Code</td>
-          <td> <xsl:value-of select="@d:code" /> </td>
+          <td> <xsl:value-of select="@code" /> </td>
         </tr>
         <tr>
           <td>Description</td>

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/validationRuleGroup.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/validationRuleGroup.xsl	2012-03-27 17:38:48 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/validationRuleGroup.xsl	2012-04-08 20:23:29 +0000
@@ -7,20 +7,20 @@
   <xsl:template match="d:validationRuleGroup">
     <div class="validationRuleGroup">
       <h2>
-        <xsl:value-of select="@d:name" />
+        <xsl:value-of select="@name" />
       </h2>
       <table>
         <tr>
           <td>ID</td>
-          <td> <xsl:value-of select="@d:id" /> </td>
+          <td> <xsl:value-of select="@id" /> </td>
         </tr>
         <tr>
           <td>Last Updated</td>
-          <td> <xsl:value-of select="@d:lastUpdated" /> </td>
+          <td> <xsl:value-of select="@lastUpdated" /> </td>
         </tr>
         <tr>
           <td>Code</td>
-          <td> <xsl:value-of select="@d:code" /> </td>
+          <td> <xsl:value-of select="@code" /> </td>
         </tr>
         <tr>
           <td>Description</td>