From f9418df4eaea11608521ee97cbf75ea70c341b28 Mon Sep 17 00:00:00 2001
From: lucio <lucio@Lucio-desktop>
Date: Wed, 18 Mar 2020 09:10:58 +0100
Subject: [PATCH] path for bunch token resolving modified

---
 distro/LICENSE                                |  1 -
 distro/README                                 | 62 -------------------
 distro/changelog.xml                          |  8 ---
 distro/descriptor.xml                         | 35 -----------
 distro/profile.xml                            | 26 --------
 pom.xml                                       |  2 +-
 .../authorizationservice/TokenManager.java    |  2 +-
 7 files changed, 2 insertions(+), 134 deletions(-)
 delete mode 100644 distro/LICENSE
 delete mode 100644 distro/README
 delete mode 100644 distro/changelog.xml
 delete mode 100644 distro/descriptor.xml
 delete mode 100644 distro/profile.xml

diff --git a/distro/LICENSE b/distro/LICENSE
deleted file mode 100644
index 3695e26..0000000
--- a/distro/LICENSE
+++ /dev/null
@@ -1 +0,0 @@
-${gcube.license}
diff --git a/distro/README b/distro/README
deleted file mode 100644
index 4f0f224..0000000
--- a/distro/README
+++ /dev/null
@@ -1,62 +0,0 @@
-The gCube System - ${name}
---------------------------------------------------
- 
-${description}
- 
- 
-${gcube.description}
- 
-${gcube.funding}
- 
- 
-Version
---------------------------------------------------
- 
-${version} (${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: 
-    ${scm.url}
- 
-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/distro/changelog.xml b/distro/changelog.xml
deleted file mode 100644
index bfa0593..0000000
--- a/distro/changelog.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<ReleaseNotes>
-	<Changeset component="authorization-service-1.0.0" date="2013-11-02">
-		<Change>First Release</Change>
-	</Changeset>
-	<Changeset component="authorization-service-2.0.0" date="2016-09-30">
-		<Change>moved auth to new auth2 model</Change>
-	</Changeset>
-</ReleaseNotes>
\ No newline at end of file
diff --git a/distro/descriptor.xml b/distro/descriptor.xml
deleted file mode 100644
index 5ba272a..0000000
--- a/distro/descriptor.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<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>${distroDirectory}</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>${distroDirectory}/profile.xml</source>
-			<outputDirectory>/</outputDirectory>
-			<filtered>true</filtered>
-		</file>
-		<file>
-			<source>target/${build.finalName}.war</source>
-			<outputDirectory>/${artifactId}</outputDirectory>
-		</file>
-	</files>
-</assembly>
diff --git a/distro/profile.xml b/distro/profile.xml
deleted file mode 100644
index 91c49e4..0000000
--- a/distro/profile.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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>Common</Class>
-		<Name>${artifactId}</Name>
-		<Version>1.0.0</Version>
-		<Packages>
-			<Software>
-				<Name>${artifactId}</Name>
-				<Version>${version}</Version>
-				<MavenCoordinates>
-					<groupId>${groupId}</groupId>
-					<artifactId>${artifactId}</artifactId>
-					<version>${version}</version>
-				</MavenCoordinates>
-				<Files>
-					<File>${build.finalName}.jar</File>
-				</Files>
-			</Software>
-		</Packages>
-	</Profile>
-</Resource>
-
diff --git a/pom.xml b/pom.xml
index 4749516..e47d21e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
 	<groupId>org.gcube.common</groupId>
 	<artifactId>authorization-service</artifactId>
-	<version>2.1.0</version>
+	<version>2.1.1</version>
 	<name>authorization service</name>
 
 	<packaging>war</packaging>
diff --git a/src/main/java/org/gcube/common/authorizationservice/TokenManager.java b/src/main/java/org/gcube/common/authorizationservice/TokenManager.java
index 51ba276..d34c837 100644
--- a/src/main/java/org/gcube/common/authorizationservice/TokenManager.java
+++ b/src/main/java/org/gcube/common/authorizationservice/TokenManager.java
@@ -96,7 +96,7 @@ public class TokenManager {
 	 * @return the authorization entry
 	 */
 	@GET
-	@Path("resolve")
+	@Path("bunch")
 	@Produces(MediaType.APPLICATION_XML)
 	public AuthorizationEntryList retrieveTokenBunch(@NotNull @QueryParam("token") List<String> tokens ) {
 		CalledMethodProvider.instance.set("retrieve");