git-svn-id: https://svn.d4science-ii.research-infrastructures.eu/gcube/branches/common/common-smartgears/2.1@148609 82a268e6-3cf1-43bd-a215-b396298e98cf

pom.xml

@@ -10,9 +10,21 @@
 
 	<groupId>org.gcube.core</groupId>
 	<artifactId>common-smartgears</artifactId>
-	<version>2.1.2-SNAPSHOT</version>
+	<version>2.2.0-SNAPSHOT</version>
 	<name>SmartGears</name>
 	
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.gcube.distribution</groupId>
+				<artifactId>gcube-bom</artifactId>
+				<version>LATEST</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+	
 	<properties>
 		<distroDirectory>distro</distroDirectory>
 		<tomcat.version>7.0.42</tomcat.version>
@@ -31,43 +43,36 @@
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>authorization-client</artifactId>
-			<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>common-authorization</artifactId>
-			<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.gcube.data.publishing</groupId>
 			<artifactId>document-store-lib</artifactId>
-			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.gcube.accounting</groupId>
 			<artifactId>accounting-lib</artifactId>
-			<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>1.7.5</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.gcube.resources</groupId>
 			<artifactId>registry-publisher</artifactId>
-			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.gcube.resources</groupId>
 			<artifactId>common-gcore-resources</artifactId>
-			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 		</dependency>
 
 		<dependency>
@@ -79,7 +84,6 @@
 		<dependency>
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-scope</artifactId>
-			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 		</dependency>
 
 		<dependency>
@@ -164,7 +168,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.2</version>
 				<configuration>
 					<descriptors>
 						<descriptor>${distroDirectory}/descriptor.xml</descriptor>

src/main/java/org/gcube/smartgears/Constants.java

@@ -43,6 +43,8 @@ public class Constants {
 	 */
 	public static final String container_handlers_file_path = "/META-INF/container-handlers.xml";
 	
+	public static final String container_handlers_file_name = "gcube-container-handlers.xml";
+	
 	/**
 	 * The library configuration resource path.
 	 */
@@ -77,6 +79,7 @@ public class Constants {
 	 */
 	public static final String default_handlers_file_path = "/META-INF/default-handlers.xml";
 
+	public static final String application_handlers_file_name = "gcube-application-handlers.xml";
 	
 	/**
 	 * The wildcard exclude directive.
@@ -202,7 +205,7 @@ public class Constants {
 	public static final String allow="Allow";
 	
 	
-	/**
+	/**jar
 	 * The name of the XML media type.
 	 */
 	public static final String plain_text="text/plain";

src/main/java/org/gcube/smartgears/configuration/container/ContainerHandlers.java

@@ -41,4 +41,10 @@ public class ContainerHandlers {
 		return this;
 	}
    
+	public void mergeWith(ContainerHandlers other){
+ 		List<ContainerHandler> handlers = other.get();
+ 		for (ContainerHandler handler : handlers)
+ 			if (!this.get().contains(handler))
+ 				this.get().add(handler);
+ 	}
 }

src/main/java/org/gcube/smartgears/managers/ApplicationManager.java

@@ -15,6 +15,7 @@ import java.io.ObjectOutputStream;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map.Entry;
 import java.util.Set;
 
 import javax.servlet.FilterRegistration;
@@ -71,6 +72,10 @@ public class ApplicationManager {
 
 			context = provider().contextFor(container, application);
 			
+			for (Entry<String,? extends ServletRegistration> servlet : application.getServletRegistrations().entrySet())
+				log.trace("servlet {} :  {} {} ", application.getServletContextName(),servlet.getKey(), servlet.getValue().getMappings());
+			
+			
 			context.configuration().validate();
 
 			if (context.configuration().secure() && 

src/main/java/org/gcube/smartgears/provider/DefaultProvider.java

@@ -3,6 +3,8 @@ package org.gcube.smartgears.provider;
 import static org.gcube.common.authorization.client.Constants.authorizationService;
 import static org.gcube.smartgears.Constants.configuration_file_path;
 import static org.gcube.smartgears.Constants.container_configuraton_file_path;
+import static org.gcube.smartgears.Constants.container_handlers_file_name;
+import static org.gcube.smartgears.Constants.application_handlers_file_name;
 import static org.gcube.smartgears.Constants.container_handlers_file_path;
 import static org.gcube.smartgears.Constants.container_profile_file_path;
 import static org.gcube.smartgears.Constants.default_extensions_file_path;
@@ -18,14 +20,22 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.io.ObjectInputStream;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
 import java.util.UUID;
 
 import javax.servlet.ServletContext;
-
 import org.gcube.common.authorization.client.proxy.AuthorizationProxy;
 import org.gcube.common.events.Hub;
 import org.gcube.common.events.impl.DefaultHub;
+import org.gcube.common.scan.ClasspathScanner;
+import org.gcube.common.scan.ClasspathScannerFactory;
+import org.gcube.common.scan.matchers.NameMatcher;
+import org.gcube.common.scan.resources.ClasspathResource;
 import org.gcube.informationsystem.publisher.RegistryPublisherFactory;
 import org.gcube.informationsystem.publisher.ScopedPublisher;
 import org.gcube.smartgears.configuration.Mode;
@@ -126,8 +136,45 @@ public class DefaultProvider implements Provider {
 				throw new IllegalStateException("invalid distribution: cannot find " + container_handlers_file_path);
 
 			ContainerConfigurationBinder binder = new ContainerConfigurationBinder();
+			ContainerHandlers defaultHandlers =  binder.bindHandlers(config);
 			
-			return binder.bindHandlers(config);
+			ClassLoader currentClassLoader = Thread.currentThread().getContextClassLoader();
+			if (currentClassLoader.getParent()!=null && !currentClassLoader.getParent().equals(ClassLoader.getSystemClassLoader())){
+				log.trace("probably i'm in a webapp classloader");
+				currentClassLoader = currentClassLoader.getParent();
+			}
+			
+			
+			try{
+				if (currentClassLoader instanceof URLClassLoader){
+					URL[] urls = ((URLClassLoader) currentClassLoader).getURLs() ;
+
+					if (urls!=null && urls.length>0){
+						ClasspathScanner scanner = ClasspathScannerFactory.scanner(new HashSet<URL>(Arrays.asList(urls)));
+						Collection<ClasspathResource> resources = scanner.scan(new NameMatcher(container_handlers_file_name));
+						
+						for (URL url: urls)
+							log.trace("URL: "+ url.toString());
+						
+						if (resources==null || resources.isEmpty()) 
+							log.info("no custom container handlers found in the classpath");
+							
+						for (ClasspathResource res : resources){
+							try{
+								ContainerHandlers customHandlers= binder.bindHandlers(res.stream());
+								defaultHandlers.mergeWith(customHandlers);
+								log.trace("container hadlers found in {}",res.name());
+							}catch(Exception e){
+								log.warn("error loading not default container handlers {}",res.name(),e);
+							}
+						}
+					} 
+				} else log.info("this classloader is not instance of {} : ",URLClassLoader.class.getName(), currentClassLoader.getClass().getName());
+			}catch(Exception e){
+				log.warn("cannot load custom handlers for container from the root classloader",e);
+			}
+
+			return defaultHandlers;
 
 		} catch (RuntimeException e) {
 
@@ -210,12 +257,45 @@ public class DefaultProvider implements Provider {
 			if (defaultHandlersStream == null)
 				throw new IllegalStateException("invalid distribution: cannot find " + default_handlers_file_path);
 
-			InputStream appSpecificHandlersStream = context.application().getResourceAsStream(handlers_file_path);
-			
 			ApplicationConfigurationBinder binder = new ApplicationConfigurationBinder();
 
 			ApplicationHandlers defaultHandlers = binder.bindHandlers(defaultHandlersStream);
 			
+			//searching for smartegars related application handlers in the common classloader
+			ClassLoader currentClassLoader = Thread.currentThread().getContextClassLoader();
+			if (currentClassLoader.getParent()!=null && !currentClassLoader.getParent().equals(ClassLoader.getSystemClassLoader())){
+				log.trace("probably i'm in a webapp classloader");
+				currentClassLoader = currentClassLoader.getParent();
+			}
+			
+						
+			try{
+				if (currentClassLoader instanceof URLClassLoader){
+					URL[] urls = ((URLClassLoader) currentClassLoader).getURLs() ;
+
+					if (urls!=null && urls.length>0){
+						ClasspathScanner scanner = ClasspathScannerFactory.scanner(new HashSet<URL>(Arrays.asList(urls)));
+						Collection<ClasspathResource> resources = scanner.scan(new NameMatcher(application_handlers_file_name));
+						if (resources==null || resources.isEmpty()) 
+							log.info("no custom smartgears related application handlers found in the classpath");
+							
+						for (ClasspathResource res : resources){
+							try{
+								ApplicationHandlers customHandlers= binder.bindHandlers(res.stream());
+								defaultHandlers.mergeWith(customHandlers);
+								log.trace("application hadlers found in {}",res.name());
+							}catch(Exception e){
+								log.warn("error loading smartgears related application handlers {}",res.name(),e);
+							}
+						}
+					} 
+				} 
+			}catch(Exception e){
+				log.warn("cannot load smartgears related handlers for application from the root classloader",e);
+			}
+			
+			InputStream appSpecificHandlersStream = context.application().getResourceAsStream(handlers_file_path);
+			
 			if (appSpecificHandlersStream !=null ){
 				defaultHandlers.mergeWith(binder.bindHandlers(appSpecificHandlersStream));
 				log.trace("{} uses default lifecycle with app spceific handler as it includes {}", context.name(), handlers_file_path);