diff --git a/src/main/webapp/WEB-INF/LICENSE b/src/main/webapp/WEB-INF/LICENSE
new file mode 100644
index 0000000..3695e26
--- /dev/null
+++ b/src/main/webapp/WEB-INF/LICENSE
@@ -0,0 +1 @@
+${gcube.license}
diff --git a/src/main/webapp/WEB-INF/README b/src/main/webapp/WEB-INF/README
new file mode 100644
index 0000000..2a5e628
--- /dev/null
+++ b/src/main/webapp/WEB-INF/README
@@ -0,0 +1,62 @@
+The gCube System - ICProxy
+--------------------------------------------------
+ 
+${description}
+ 
+ 
+${gcube.description}
+ 
+${gcube.funding}
+ 
+ 
+Version
+--------------------------------------------------
+ 
+1.1.0-SNAPSHOT (${buildDate})
+ 
+Please see the file named "changelog.xml" in this directory for the release notes.
+ 
+ 
+Authors
+--------------------------------------------------
+
+* Lucio Lelii (lucio.lelii-AT-isti.cnr.it), CNR, Italy
+
+Maintainers
+--------------------------------------------------
+
+* Lucio Lelii (lucio.lelii-AT-isti.cnr.it), CNR, Italy
+
+Download information
+--------------------------------------------------
+ 
+Source code is available from SVN: 
+    https://svn.d4science.research-infrastructures.eu/gcube/trunk/information-system/icproxy
+ 
+Binaries can be downloaded from the gCube website: 
+   ${gcube.website}
+ 
+ 
+Installation
+--------------------------------------------------
+ 
+Installation documentation is available on-line in the gCube Wiki:
+    ${gcube.wikiRoot}
+ 
+Documentation 
+--------------------------------------------------
+ 
+Documentation is available on-line in the gCube Wiki:
+    ${gcube.wikiRoot}
+ 
+Support 
+--------------------------------------------------
+ 
+Bugs and support requests can be reported in the gCube issue tracking tool:
+    ${gcube.issueTracking}
+ 
+ 
+Licensing
+--------------------------------------------------
+ 
+This software is licensed under the terms you may find in the file named "LICENSE" in this directory.
diff --git a/src/main/webapp/WEB-INF/changelog.xml b/src/main/webapp/WEB-INF/changelog.xml
new file mode 100644
index 0000000..06a4db7
--- /dev/null
+++ b/src/main/webapp/WEB-INF/changelog.xml
@@ -0,0 +1,8 @@
+<ReleaseNotes>
+	<Changeset component="org.gcube.information-system.icproxy.1-0-0" date="2015-04-28">
+		<Change>First Release</Change>
+	</Changeset>
+	<Changeset component="org.gcube.information-system.icproxy.1-1-0" date="2016-10-3-">
+		<Change>Porting to auth2</Change>
+	</Changeset>
+</ReleaseNotes>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/descriptor.xml b/src/main/webapp/WEB-INF/descriptor.xml
new file mode 100644
index 0000000..f942e46
--- /dev/null
+++ b/src/main/webapp/WEB-INF/descriptor.xml
@@ -0,0 +1,35 @@
+<assembly
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+	<id>servicearchive</id>
+	<formats>
+		<format>tar.gz</format>
+	</formats>
+	<baseDirectory>/</baseDirectory>
+	<fileSets>
+		<fileSet>
+			<directory>/home/lucio/workspace/imarine/icproxy.1.1/distro</directory>
+			<outputDirectory>/</outputDirectory>
+			<useDefaultExcludes>true</useDefaultExcludes>
+			<includes>
+				<include>README</include>
+				<include>LICENSE</include>
+				<include>changelog.xml</include>
+			</includes>
+			<fileMode>755</fileMode>
+			<filtered>true</filtered>
+		</fileSet>
+	</fileSets>
+	<files>
+		<file>
+			<source>/home/lucio/workspace/imarine/icproxy.1.1/distro/profile.xml</source>
+			<outputDirectory>/</outputDirectory>
+			<filtered>true</filtered>
+		</file>
+		<file>
+			<source>target/icproxy.war</source>
+			<outputDirectory>/icproxy</outputDirectory>
+		</file>
+	</files>
+</assembly>
diff --git a/src/main/webapp/WEB-INF/gcube-app.xml b/src/main/webapp/WEB-INF/gcube-app.xml
deleted file mode 100644
index f60faa5..0000000
--- a/src/main/webapp/WEB-INF/gcube-app.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<application mode='online'>
-		<name>ICProxy</name>
-		<group>DataAccess</group>
-		<version>1.0.0-SNAPSHOT</version>
-		<description>icproxy webapp</description>
-		<!--  <servlets>
-			<servlet name="org.gcube.data.analysis.rconnector.RConnector" entryPointName="connector"/>
-		</servlets> -->
-		<local-persistence location='target' />
-		<exclude>/ServiceEndpoint/*</exclude>
-</application>
-
diff --git a/src/main/webapp/WEB-INF/profile.xml b/src/main/webapp/WEB-INF/profile.xml
new file mode 100644
index 0000000..452a978
--- /dev/null
+++ b/src/main/webapp/WEB-INF/profile.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<ID />
+	<Type>Service</Type>
+	<Profile>
+		<Description>${description}</Description>
+		<Class>InformationSystem</Class>
+		<Name>icproxy</Name>
+		<Version>1.0.0</Version>
+		<Packages>
+			<Software>
+				<Name>icproxy</Name>
+				<Version>1.1.0-SNAPSHOT</Version>
+				<MavenCoordinates>
+					<groupId>org.gcube.information-system</groupId>
+					<artifactId>icproxy</artifactId>
+					<version>1.1.0-SNAPSHOT</version>
+				</MavenCoordinates>
+				<Files>
+					<File>icproxy.jar</File>
+				</Files>
+			</Software>
+		</Packages>
+	</Profile>
+</Resource>
+
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 78214bc..0000000
--- a/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<web-app>
-	<servlet>
-    	<servlet-name>org.gcube.informationsystem.icproxy.ICProxy</servlet-name>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>org.gcube.informationsystem.icproxy.ICProxy</servlet-name>
-        <url-pattern>/gcube/service/*</url-pattern>
-    </servlet-mapping>
-</web-app>
\ No newline at end of file