Project

General

Profile

« Previous | Next » 

Revision a1dac6b2

Added by Andreas Kohlbecker about 7 years ago

#5285 removing problematic multi VaadinServlet configuration

View differences:

src/main/java/eu/etaxonomy/cdm/addon/config/CdmVaadinConfiguration.java
8 8 
*/
9 9 
package eu.etaxonomy.cdm.addon.config;
10 10 

  		




  
  11
  
    
import javax.servlet.annotation.WebServlet;


  		




  
  12
  
    

  		




  11
  13
  
    
import org.apache.log4j.Logger;


  		




  12
  14
  
    
import org.springframework.context.annotation.ComponentScan;


  		




  13
  15
  
    
import org.springframework.context.annotation.Configuration;


  		




  14
  16
  
    

  		




  15
  17
  
    
import com.vaadin.spring.annotation.EnableVaadin;


  		




  
  18
  
    
import com.vaadin.spring.server.SpringVaadinServlet;


  		




  16
  19
  
    

  		




  17
  20
  
    
/**


  		




  18
  21
  
    
 *


  		




  ......




  27
  30
  
    

  		




  28
  31
  
    
    public static final Logger logger = Logger.getLogger(CdmVaadinConfiguration.class);


  		




  29
  32
  
    

  		




  30
  
  
    
//    @Configuration


  		




  31
  
  
    
//    @EnableVaadin


  		




  32
  
  
    
//    @Order(value=1)


  		




  33
  
  
    
//    public static class CdmVaadinEnabler {


  		




  34
  
  
    
//


  		




  35
  
  
    
//        public CdmVaadinEnabler() {


  		




  36
  
  
    
//            logger.debug("CdmVaadinConfiguration enabled");


  		




  37
  
  
    
//        }


  		




  38
  
  
    
//


  		




  39
  
  
    
//    }


  		




  40
  
  
    
//


  		




  41
  
  
    
//    @Configuration


  		




  42
  
  
    
//    @ComponentScan(basePackages={"eu.etaxonomy.cdm.vaadin"})


  		




  43
  
  
    
//    @Order(value=2)


  		




  44
  
  
    
//    public static class CdmVaadinScanner {


  		




  45
  
  
    
//


  		




  46
  
  
    
//        public CdmVaadinScanner() {


  		




  47
  
  
    
//            logger.debug("CdmVaadinScanner enabled");


  		




  48
  
  
    
//        }


  		




  49
  
  
    
//


  		




  50
  
  
    
//    }


  		




  51
  33
  
    

  		




  
  34
  
    
    /*


  		




  
  35
  
    
     * NOTE: It is necessary to map the URLs starting with /VAADIN/* since none of the


  		




  
  36
  
    
     * @WebServlets is mapped to the root path. It is sufficient to configure one of the


  		




  
  37
  
    
     * servlets with this path see BookOfVaadin 5.9.5. Servlet Mapping with URL Patterns


  		




  
  38
  
    
     */


  		




  
  39
  
    
    @WebServlet(value = {"/app/*", "/VAADIN/*"}, asyncSupported = true)


  		




  
  40
  
    
    public static class Servlet extends SpringVaadinServlet {


  		




  
  41
  
    
    }


  		




  52
  42
  
    

  		




  53
  43
  
    

  		




  54
  44
  
    
    public CdmVaadinConfiguration() {


  		












  

    
      src/main/java/eu/etaxonomy/cdm/vaadin/ui/ConceptRelationshipUI.java
    
  





  9
  9
  
    
package eu.etaxonomy.cdm.vaadin.ui;


  		




  10
  10
  
    

  		




  11
  11
  
    

  		




  12
  
  
    
import javax.servlet.annotation.WebServlet;


  		




  13
  
  
    

  		




  14
  12
  
    
import org.apache.log4j.Logger;


  		




  15
  13
  
    

  		




  16
  14
  
    
import com.vaadin.annotations.Theme;


  		




  ......




  18
  16
  
    
import com.vaadin.navigator.Navigator;


  		




  19
  17
  
    
import com.vaadin.server.VaadinRequest;


  		




  20
  18
  
    
import com.vaadin.spring.annotation.SpringUI;


  		




  21
  
  
    
import com.vaadin.spring.server.SpringVaadinServlet;


  		




  22
  19
  
    
import com.vaadin.ui.UI;


  		




  23
  20
  
    

  		




  24
  21
  
    
import eu.etaxonomy.cdm.vaadin.view.ConceptRelationshipView;


  		




  ......




  39
  36
  
    

  		




  40
  37
  
    
    private final static Logger logger = Logger.getLogger(ConceptRelationshipUI.class);


  		




  41
  38
  
    

  		




  42
  
  
    
    @WebServlet(value = {"/app/*"}, asyncSupported = true)


  		




  43
  
  
    
    public static class Servlet extends SpringVaadinServlet {


  		




  44
  
  
    
    }


  		




  45
  
  
    

  		




  46
  39
  
    
    @Override


  		




  47
  40
  
    
    protected void doInit(VaadinRequest request) {


  		




  48
  41
  
    
        // FIXME: remove this when testing is done


  		












  

    
      src/main/java/eu/etaxonomy/cdm/vaadin/ui/ConceptRelationshipUIRedirect.java
    
  





  35
  35
  
    

  		




  36
  36
  
    
    private final static Logger logger = Logger.getLogger(ConceptRelationshipUIRedirect.class);


  		




  37
  37
  
    

  		




  38
  
  
    
// not needed since this UI is used in the context of ConceptRelationshipUI


  		




  39
  
  
    
//    @WebServlet(value = {"/app/*"}, asyncSupported = true)


  		




  40
  
  
    
//    public static class Servlet extends SpringVaadinServlet {


  		




  41
  
  
    
//    }


  		




  42
  
  
    

  		




  43
  38
  
    
    @Override


  		




  44
  39
  
    
    protected void doInit(VaadinRequest request) {


  		




  45
  40
  
    
        // FIXME: remove this when testing is done


  		












  

    
      src/main/java/eu/etaxonomy/cdm/vaadin/ui/DbStatusUI.java
    
  





  1
  1
  
    
package eu.etaxonomy.cdm.vaadin.ui;


  		




  2
  2
  
    

  		




  3
  
  
    
import javax.servlet.annotation.WebServlet;


  		




  4
  
  
    

  		




  5
  3
  
    
import org.apache.log4j.Logger;


  		




  6
  4
  
    

  		




  7
  5
  
    
import com.vaadin.annotations.Theme;


  		




  ......




  12
  10
  
    
import com.vaadin.spring.annotation.SpringUI;


  		




  13
  11
  
    
import com.vaadin.ui.UI;


  		




  14
  12
  
    

  		




  15
  
  
    
import eu.etaxonomy.cdm.vaadin.servlet.CdmVaadinConversationalServlet;


  		




  16
  13
  
    
import eu.etaxonomy.cdm.vaadin.view.dbstatus.RedirectAfterLoginView;


  		




  17
  14
  
    

  		




  18
  15
  
    
@Theme("macosx")


  		




  19
  
  
    
@Title("CDM Board")


  		




  
  16
  
    
@Title("Distribution Editor")


  		




  20
  17
  
    
@SpringUI(path="distribution")


  		




  21
  18
  
    
@Widgetset("eu.etaxonomy.cdm.vaadin.AppWidgetSet")


  		




  22
  19
  
    
@SuppressWarnings("serial")


  		




  ......




  26
  23
  
    

  		




  27
  24
  
    
	private static final String FIRST_VIEW = "firstView";


  		




  28
  25
  
    

  		




  29
  
  
    
	@WebServlet(urlPatterns = {"/app/*"}, name="DbStatusUIServlet", asyncSupported = true)


  		




  30
  
  
    
	public static class Servlet extends CdmVaadinConversationalServlet {


  		




  31
  
  
    
	}


  		




  32
  
  
    

  		




  33
  26
  
    
	public DbStatusUI () {


  		




  34
  27
  
    
	    logger.debug("constructor");


  		




  35
  28
  
    
	}


  		












  

    
      src/main/java/eu/etaxonomy/cdm/vaadin/ui/DbStatusUIRedirect.java
    
  





  18
  18
  
    

  		




  19
  19
  
    
	private static final String FIRST_VIEW = "firstView";


  		




  20
  20
  
    

  		




  21
  
  
    
// not needed since this UI is used in the context of DbStatusUI


  		




  22
  
  
    
//	@WebServlet(value = {"/app/*"}, asyncSupported = true)


  		




  23
  
  
    
//	public static class Servlet extends CdmVaadinConversationalServlet {


  		




  24
  
  
    
//	}


  		




  25
  
  
    

  		




  26
  
  
    

  		




  27
  21
  
    
	@Override


  		




  28
  22
  
    
	protected void doInit(VaadinRequest request) {


  		




  29
  23
  
    
		Navigator navigator = UI.getCurrent().getNavigator();


  		












  

    
      src/main/java/eu/etaxonomy/cdm/vaadin/ui/StatusEditorUI.java
    
  





  11
  11
  
    

  		




  12
  12
  
    
import java.util.logging.Logger;


  		




  13
  13
  
    

  		




  14
  
  
    
import javax.servlet.annotation.WebServlet;


  		




  15
  
  
    

  		




  16
  14
  
    
import com.vaadin.annotations.Theme;


  		




  17
  15
  
    
import com.vaadin.annotations.Widgetset;


  		




  18
  16
  
    
import com.vaadin.navigator.Navigator;


  		




  19
  17
  
    
import com.vaadin.server.VaadinRequest;


  		




  20
  18
  
    
import com.vaadin.spring.annotation.SpringUI;


  		




  21
  
  
    
import com.vaadin.spring.server.SpringVaadinServlet;


  		




  22
  19
  
    
import com.vaadin.ui.UI;


  		




  23
  20
  
    

  		




  24
  21
  
    
import eu.etaxonomy.cdm.vaadin.component.StatusComposite;


  		




  ......




  39
  36
  
    

  		




  40
  37
  
    
    private final static Logger logger =


  		




  41
  38
  
    
            Logger.getLogger(StatusEditorUI.class.getName());


  		




  42
  
  
    
    /*


  		




  43
  
  
    
     * NOTE: It is necessary to map the URLs starting with /VAADIN/* since none of the


  		




  44
  
  
    
     * @WebServlets is mapped to the root path. It is sufficient to configure one of the


  		




  45
  
  
    
     * servlets with this path see BookOfVaadin 5.9.5. Servlet Mapping with URL Patterns


  		




  46
  
  
    
     */


  		




  47
  
  
    
    @WebServlet(value = {"/app/*", "/VAADIN/*"}, asyncSupported = true)


  		




  48
  
  
    
    public static class Servlet extends SpringVaadinServlet {


  		




  49
  
  
    
    }


  		




  50
  39
  
    

  		




  51
  40
  
    
    @Override


  		




  52
  41
  
    
    protected void doInit(VaadinRequest request) {


  		












  

    
      src/test/java/eu/etaxonomy/cdm/vaadin/ui/CheckTestUI.java
    
  





  1
  1
  
    
package eu.etaxonomy.cdm.vaadin.ui;


  		




  2
  2
  
    

  		




  3
  
  
    
import javax.servlet.annotation.WebServlet;


  		




  4
  
  
    

  		




  5
  3
  
    
import com.vaadin.annotations.Theme;


  		




  6
  4
  
    
import com.vaadin.annotations.Widgetset;


  		




  7
  5
  
    
import com.vaadin.server.VaadinRequest;


  		




  8
  6
  
    
import com.vaadin.spring.annotation.SpringUI;


  		




  9
  
  
    
import com.vaadin.spring.server.SpringVaadinServlet;


  		




  10
  7
  
    
import com.vaadin.ui.Button;


  		




  11
  8
  
    
import com.vaadin.ui.Button.ClickEvent;


  		




  12
  9
  
    
import com.vaadin.ui.Label;


  		




  ......




  19
  16
  
    
@SuppressWarnings("serial")


  		




  20
  17
  
    
public class CheckTestUI extends UI {


  		




  21
  18
  
    

  		




  22
  
  
    

  		




  23
  
  
    
    @WebServlet(value = {"/app-test/*", "/VAADIN/*"}, asyncSupported = true)


  		




  24
  
  
    
    public static class Servlet extends SpringVaadinServlet {


  		




  25
  
  
    
    }


  		




  26
  
  
    

  		




  27
  19
  
    
    @Override


  		




  28
  20
  
    
    protected void init(VaadinRequest request) {


  		




  29
  21
  
    
        final VerticalLayout layout = new VerticalLayout();


  		












  

    
      src/test/java/eu/etaxonomy/cdm/vaadin/ui/D3CTreeUI.java
    
  





  10
  10
  
    

  		




  11
  11
  
    
import java.util.logging.Logger;


  		




  12
  12
  
    

  		




  13
  
  
    
import javax.servlet.annotation.WebServlet;


  		




  14
  
  
    

  		




  15
  13
  
    
import com.vaadin.annotations.Theme;


  		




  16
  14
  
    
import com.vaadin.annotations.Widgetset;


  		




  17
  15
  
    
import com.vaadin.server.VaadinRequest;


  		




  18
  16
  
    
import com.vaadin.spring.annotation.SpringUI;


  		




  19
  
  
    
import com.vaadin.spring.server.SpringVaadinServlet;


  		




  20
  17
  
    
import com.vaadin.ui.UI;


  		




  21
  18
  
    
import com.vaadin.ui.VerticalLayout;


  		




  22
  19
  
    

  		




  ......




  35
  32
  
    
    private final static Logger logger =


  		




  36
  33
  
    
            Logger.getLogger(D3CTreeUI.class.getName());


  		




  37
  34
  
    

  		




  38
  
  
    
    @WebServlet(value = {"/app-test/*"}, asyncSupported = true)


  		




  39
  
  
    
    public static class Servlet extends SpringVaadinServlet {


  		




  40
  
  
    

  		




  41
  
  
    
    }


  		




  42
  
  
    

  		




  43
  35
  
    
    final VerticalLayout layout = new VerticalLayout();


  		




  44
  36
  
    
    final D3CTree d3ctree = new D3CTree();


  		




  45
  37
  
    

  		












  

    
      src/test/java/eu/etaxonomy/cdm/vaadin/ui/NavigatorTestUI.java
    
  





  2
  2
  
    

  		




  3
  3
  
    
import java.util.logging.Logger;


  		




  4
  4
  
    

  		




  5
  
  
    
import javax.servlet.annotation.WebServlet;


  		




  6
  
  
    

  		




  7
  5
  
    
import com.vaadin.annotations.Theme;


  		




  8
  6
  
    
import com.vaadin.annotations.Widgetset;


  		




  9
  7
  
    
import com.vaadin.navigator.Navigator;


  		




  ......




  11
  9
  
    
import com.vaadin.spring.annotation.SpringUI;


  		




  12
  10
  
    
import com.vaadin.ui.UI;


  		




  13
  11
  
    

  		




  14
  
  
    
import eu.etaxonomy.cdm.vaadin.servlet.CdmVaadinConversationalServlet;


  		




  15
  12
  
    
import eu.etaxonomy.cdm.vaadin.view.NaviTestView;


  		




  16
  13
  
    

  		




  17
  14
  
    
@Theme("edit")


  		




  ......




  24
  21
  
    
	private static final String FIRST_VIEW = "firstView";


  		




  25
  22
  
    
	public static final String SECOND_VIEW = "secondView";


  		




  26
  23
  
    

  		




  27
  
  
    
	private final static Logger logger =


  		




  28
  
  
    
			Logger.getLogger(NavigatorTestUI.class.getName());


  		




  29
  
  
    

  		




  30
  
  
    
	@WebServlet(value = {"/app-test/*"}, asyncSupported = true)


  		




  31
  
  
    
	public static class Servlet extends CdmVaadinConversationalServlet {


  		




  32
  
  
    

  		




  33
  
  
    
	}


  		




  
  24
  
    
	private final static Logger logger = Logger.getLogger(NavigatorTestUI.class.getName());


  		




  34
  25
  
    

  		




  35
  26
  
    
	@Override


  		




  36
  27
  
    
	protected void doInit(VaadinRequest request) {


  		












Also available in:  Unified diff