Fixed xml files

descriptor.xml

@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xml>
 <assembly
         xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -26,7 +28,7 @@
     <files>
         <file>
             <source>target${file.separator}${build.finalName}.${project.packaging}</source>
-            <outputDirectory>${file.separator}${artifactId}</outputDirectory>
+            <outputDirectory>${file.separator}${project.artifactId}</outputDirectory>
         </file>
     </files>
 </assembly>

gcube-app.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE xml>
 <application mode='online'>
-		<name>${artifactId}</name>
+		<name>${project.artifactId}</name>
 		<group>${serviceClass}</group>
-		<version>${version}</version>
+		<version>${project.version}</version>
-		<description>${description}</description>
+		<description>${project.description}</description>
 		<local-persistence location='target' />
 </application>
 

profile.xml

@@ -11,8 +11,8 @@
 		<Packages>
 			<Main>
 				<Name>${project.artifactId}</Name>
-				<Description>${project.description}</Description>
 				<Version>${project.version}</Version>
+				<Description>${project.description}</Description>
 				<MavenCoordinates>
 					<groupId>${project.groupId}</groupId>
 					<artifactId>${project.artifactId}</artifactId>