Commit eb785f39 authored by akucera's avatar akucera
Browse files

Adjustments needed for correct servlet 3.0 deployment (dependencies, 

lifecycle control)
parent 0fdfd5d9

CommonComponents/pom.xml

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
            <artifactId>jersey-server</artifactId>

            <version>${jersey.version}</version>

    </dependency>

    

    <dependency>

    <groupId>javax.ws.rs</groupId>

    <artifactId>javax.ws.rs-api</artifactId>

DataAccessAPI/pom.xml

+15 −2
Original line number Diff line number Diff line
@@ -23,12 +23,25 @@ 
    </dependencyManagement>

 -->

    <dependencies>

         

         <dependency>

    		<groupId>javax.servlet</groupId>

    		<artifactId>javax.servlet-api</artifactId>

    		<version>3.1.0</version>

		</dependency>

         

         <dependency>

            <groupId>org.glassfish.jersey.core</groupId>

            <artifactId>jersey-server</artifactId>

            <version>${jersey.version}</version>

        </dependency>

          

         <dependency>

    		<groupId>org.glassfish.jersey.containers</groupId>

    		<artifactId>jersey-container-servlet</artifactId>

    		<version>${jersey.version}</version>

		</dependency>

          

         <dependency>

    		<groupId>org.glassfish.jersey.media</groupId>

    		<artifactId>jersey-media-json-jackson</artifactId>

DataAccessAPI/src/main/java/cz/muni/fi/lasaris/sbms/data/Application.java

+8 −5
Original line number Diff line number Diff line
@@ -3,7 +3,9 @@ package cz.muni.fi.lasaris.sbms.data; 
import java.io.InputStream;

import java.util.Properties;



import javax.servlet.ServletContext;

import javax.ws.rs.ApplicationPath;

import javax.ws.rs.core.Context;



import org.apache.log4j.Logger;

import org.glassfish.jersey.server.ResourceConfig;
@@ -15,10 +17,12 @@ import cz.muni.fi.lasaris.sbms.auth.AuthenticationFilter; 
public class Application extends ResourceConfig {

	final static Logger logger = Logger.getLogger(Application.class);

	private Properties prop;

	@Context ServletContext context;

	

	public Application() {

		super();

		setApplicationName("Semantic BMS Data Access API");

		

		// http://crunchify.com/java-properties-file-how-to-read-config-properties-values-in-java/

		this.prop = new Properties();

		try {
@@ -49,18 +53,17 @@ public class Application extends ResourceConfig { 
	}

	

	public Properties getSBMSProperties() {

		

		return prop;

	}

	

	public void close() {

	public static void close() {

		logger.debug("Closing connectors...");

		ConnectorProvider.close();

		logger.debug("Connectors closed.");

	}

	

	public void finalize() {

		logger.debug("Closing connectors...");

		ConnectorProvider.close();

		logger.debug("Connectors closed.");

		close();

	}



}

DataAccessAPI/src/main/java/cz/muni/fi/lasaris/sbms/data/ContextListener.java

0 → 100644
+28 −0
Original line number Diff line number Diff line 
package cz.muni.fi.lasaris.sbms.data;



import javax.servlet.ServletContextEvent;

import javax.servlet.ServletContextListener;

import javax.servlet.annotation.WebListener;



import org.apache.log4j.Logger;



@WebListener

public class ContextListener implements ServletContextListener {

	final static Logger logger = Logger.getLogger(ContextListener.class);

	

	public ContextListener() {

		logger.debug("Custom ContextListener initialized.");

	}

	

	@Override

	public void contextDestroyed(ServletContextEvent c) {

		logger.debug("Closing the SBMS Data API...");

		Application.close();

		logger.debug("Closed.");

	}



	@Override

	public void contextInitialized(ServletContextEvent c) {

	}



}

SemanticAPI/pom.xml

+13 −0
Original line number Diff line number Diff line
@@ -22,11 +22,24 @@ 
    </dependencyManagement>

	 -->

    <dependencies>

       	<dependency>

    		<groupId>javax.servlet</groupId>

    		<artifactId>javax.servlet-api</artifactId>

    		<version>3.1.0</version>

		</dependency>

       	

       	<dependency>

            <groupId>org.glassfish.jersey.core</groupId>

            <artifactId>jersey-server</artifactId>

            <version>${jersey.version}</version>

        </dependency>

        

        <dependency>

    		<groupId>org.glassfish.jersey.containers</groupId>

    		<artifactId>jersey-container-servlet</artifactId>

    		<version>${jersey.version}</version>

		</dependency>

        

         <dependency>

    		<groupId>org.glassfish.jersey.media</groupId>

    		<artifactId>jersey-media-json-jackson</artifactId>