/ - Diff - EDIT - EDIT Project Management

     <booleanAttribute key="net.sourceforge.eclipsejetty.launcher.threadPool.limit.enabled" value="false"/>
     <stringAttribute key="net.sourceforge.eclipsejetty.launcher.webappdir" value="src/main/webapp"/>
     <stringAttribute key="net.sourceforge.eclipsejetty.launcher.websocket.enabled" value="false"/>
     <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
     <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
     <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
     </listAttribute>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
     <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="net.sourceforge.eclipsejetty.launcher.JettyLaunchClassPathProvider"/>
     <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="net.sourceforge.eclipsejetty.starter.embedded.JettyEmbeddedLauncherMain"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="cdm-vaadin"/>
     <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dlog4j.configDebug=true&#10;-Dlog4j.configuration=file:///${system_property:user.home}/.cdmLibrary/log4j.properties"/>
     <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dlog4j.configDebug=false&#10;-Dlog4j.configuration=file:///${system_property:user.home}/.cdmLibrary/log4j.properties"/>
     </launchConfiguration>

     /**
     * Copyright (C) 2017 EDIT
     * European Distributed Institute of Taxonomy
     * http://www.e-taxonomy.eu
+    *
     * The contents of this file are subject to the Mozilla Public License Version 1.1
     * See LICENSE.TXT at the top of this package for the full license terms.
     */
     package eu.etaxonomy.cdm.addon.config;
     import org.apache.log4j.Logger;
     import org.springframework.context.annotation.ComponentScan;
     import org.springframework.context.annotation.Configuration;
     import com.vaadin.spring.annotation.EnableVaadin;
     /**
+     *
      * @author a.kohlbecker
      * @since Feb 8, 2017
+     *
      */
     @Configuration
     @ComponentScan(basePackages={"eu.etaxonomy.cdm.vaadin"})
     @EnableVaadin   // this imports VaadinConfiguration
     public class CdmVaadinConfiguration {
         public static final Logger logger = Logger.getLogger(CdmVaadinConfiguration.class);
     //    @Configuration
     //    @EnableVaadin
     //    @Order(value=1)
     //    public static class CdmVaadinEnabler {
     //
     //        public CdmVaadinEnabler() {
     //            logger.debug("CdmVaadinConfiguration enabled");
     //        }
     //
     //    }
     //
     //    @Configuration
     //    @ComponentScan(basePackages={"eu.etaxonomy.cdm.vaadin"})
     //    @Order(value=2)
     //    public static class CdmVaadinScanner {
     //
     //        public CdmVaadinScanner() {
     //            logger.debug("CdmVaadinScanner enabled");
     //        }
     //
     //    }
         public CdmVaadinConfiguration() {
             logger.debug("CdmVaadinConfiguration enabled");
+        }
+    }

src/main/java/eu/etaxonomy/cdm/addon/config/README
	1	The package eu.etaxonomy.cdm.addon.config is an extension point where
	2	addon-modules can place their Spring configuration classes.
	3	A component scan defined in cdmlib-remote-webapp will find them:
	4
	5	<context:component-scan base-package="eu/etaxonomy/cdm/addon/config" />
	6

     /**
     * Copyright (C) 2017 EDIT
     * European Distributed Institute of Taxonomy
     * http://www.e-taxonomy.eu
+    *
     * The contents of this file are subject to the Mozilla Public License Version 1.1
     * See LICENSE.TXT at the top of this package for the full license terms.
     */
     package eu.etaxonomy.cdm.vaadin.conf;
     import org.apache.log4j.Logger;
     import org.springframework.context.annotation.Configuration;
     import com.vaadin.spring.annotation.EnableVaadin;
     /**
+     *
      * @author a.kohlbecker
      * @since Feb 8, 2017
+     *
      */
     @Configuration
     @EnableVaadin   // this imports VaadinConfiguration
     public class CdmVaadinConfiguration {
         public static final Logger logger = Logger.getLogger(CdmVaadinConfiguration.class);
         public CdmVaadinConfiguration() {
             logger.debug("CdmVaadinConfiguration enabled");
+        }
+    }

     import java.util.HashMap;
     import java.util.Map;
     import org.springframework.beans.factory.annotation.Autowired;
     import com.vaadin.data.Item;
     import com.vaadin.data.util.HierarchicalContainer;
     import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
     import eu.etaxonomy.cdm.model.taxon.TaxonNode;
     import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
     import eu.etaxonomy.cdm.vaadin.util.CdmSpringContextHelper;
     public class TaxonNodeContainer extends HierarchicalContainer {
     	private static final long serialVersionUID = 102401340698963360L;
     	public static final String LABEL = "titleCache";
     	private Map<Object, Object> itemCache = new HashMap<>();
     	@Autowired
     	private ITaxonNodeService taxonNodeService;
     	/**
          * Creates a new taxon node container
     	 * @param roots the root elements of the table
-...
          */
         public void addChildItems(UuidAndTitleCache<TaxonNode> parent) {
             if(itemCache.get(parent.getId()).equals(Boolean.FALSE)){
                 Collection<UuidAndTitleCache<TaxonNode>> children = CdmSpringContextHelper.getTaxonNodeService().listChildNodesAsUuidAndTitleCache(parent);
                 Collection<UuidAndTitleCache<TaxonNode>> children = taxonNodeService.listChildNodesAsUuidAndTitleCache(parent);
                 setChildrenAllowed(parent, !children.isEmpty());
                 for (UuidAndTitleCache<TaxonNode> child : children) {
                     Item childItem = addItem(child);
                     if(childItem!=null){
                         setParent(child, parent);
+                    }
                     Collection<UuidAndTitleCache<TaxonNode>> grandChildren = CdmSpringContextHelper.getTaxonNodeService().listChildNodesAsUuidAndTitleCache(child);
                     Collection<UuidAndTitleCache<TaxonNode>> grandChildren = taxonNodeService.listChildNodesAsUuidAndTitleCache(child);
                     setChildrenAllowed(child, !grandChildren.isEmpty());
+                }
                 itemCache.put(parent.getId(), true);

     import eu.etaxonomy.cdm.vaadin.util.CdmVaadinSessionUtilities;
     import eu.etaxonomy.cdm.vaadin.view.IAuthenticationComponent;
     public class AuthenticationPresenter implements IAuthenticationComponent.AuthenticationComponentListener{
         @Override

+     *
      */
     @Theme("edit")
     @SpringUI(path="/app/concept")
     @SpringUI(path="concept")
     @Widgetset("eu.etaxonomy.cdm.vaadin.AppWidgetSet")
     public class ConceptRelationshipUI extends AbstractAuthenticatedUI {
-...
         private final static Logger logger = Logger.getLogger(ConceptRelationshipUI.class);
         @WebServlet(value = {"/*"}, asyncSupported = true)
         @WebServlet(value = {"/app/*"}, asyncSupported = true)
         public static class Servlet extends SpringVaadinServlet {
+        }

+     *
      */
     @Theme("edit")
     // @SpringUI(path="/app/concept") // not needed since this UI is used in the context of ConceptRelationshipUI
     // @SpringUI(path="concept") // not needed since this UI is used in the context of ConceptRelationshipUI
     @Widgetset("eu.etaxonomy.cdm.vaadin.AppWidgetSet")
     public class ConceptRelationshipUIRedirect extends AbstractAuthenticatedUI {
-...
         private final static Logger logger = Logger.getLogger(ConceptRelationshipUIRedirect.class);
     // not needed since this UI is used in the context of ConceptRelationshipUI
     //    @WebServlet(value = {"/*"}, asyncSupported = true)
     //    @WebServlet(value = {"/app/*"}, asyncSupported = true)
     //    public static class Servlet extends SpringVaadinServlet {
     //    }

     @Theme("macosx")
     @Title("CDM Board")
     @SpringUI(path="/app/distribution")
     @SpringUI(path="distribution")
     @Widgetset("eu.etaxonomy.cdm.vaadin.AppWidgetSet")
     @SuppressWarnings("serial")
     public class DbStatusUI extends AbstractAuthenticatedUI{
-...
     	private static final String FIRST_VIEW = "firstView";
     	@WebServlet(urlPatterns = {"/*"}, name="DbStatusUIServlet", asyncSupported = true)
     	@WebServlet(urlPatterns = {"/app/*"}, name="DbStatusUIServlet", asyncSupported = true)
     	public static class Servlet extends CdmVaadinConversationalServlet {
+    	}

     @Theme("edit")
     @Title("CDM Board")
     // @SpringUI(path="/app/distribution") // not needed since this UI is used in the context of DbStatusUI
     // @SpringUI(path="distribution") // not needed since this UI is used in the context of DbStatusUI
     @Widgetset("eu.etaxonomy.cdm.vaadin.AppWidgetSet")
     @SuppressWarnings("serial")
     public class DbStatusUIRedirect extends AbstractAuthenticatedUI{
-...
     	private static final String FIRST_VIEW = "firstView";
     // not needed since this UI is used in the context of DbStatusUI
     //	@WebServlet(value = {"/*"}, asyncSupported = true)
     //	@WebServlet(value = {"/app/*"}, asyncSupported = true)
     //	public static class Servlet extends CdmVaadinConversationalServlet {
     //	}

+     *
      */
     @Theme("edit")
     @SpringUI(path="/app/editstatus")
     @SpringUI(path="editstatus")
     @Widgetset("eu.etaxonomy.cdm.vaadin.AppWidgetSet")
     public class StatusEditorUI extends AbstractAuthenticatedUI {
-...
          * @WebServlets is mapped to the root path. It is sufficient to configure one of the
          * servlets with this path see BookOfVaadin 5.9.5. Servlet Mapping with URL Patterns
          */
         @WebServlet(value = {"/*", "/VAADIN/*"}, asyncSupported = true)
         @WebServlet(value = {"/app/*", "/VAADIN/*"}, asyncSupported = true)
         public static class Servlet extends SpringVaadinServlet {
+        }

      * been written to retrieve the beans given the bean name.
+     *
      * @author c.mathew
      * @deprecated no longer needed since vaadin-spring is being used
+     *
      * TODO This class may no longer needed in a couple of cases since vaadin-spring
      * is being used and spring beans can be injected now.
+     *
      */
     @Deprecated
     public class CdmSpringContextHelper {
         private final ApplicationContext context;

         http://www.springframework.org/schema/tx   http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
         ">
        <context:annotation-config/>
       <!--
         NOTE:
         For a detailed overview on the spring MVC and application context configuration and
         bootstrapping of this web application see:
         http://dev.e-taxonomy.eu/trac/wiki/cdmlib-remote-webappConfigurationAndBootstrapping
       -->
        <bean class="eu.etaxonomy.cdm.vaadin.conf.CdmVaadinConfiguration" />
        <context:component-scan base-package="eu/etaxonomy/cdm/vaadin" />
        <context:annotation-config />
         <!--
             find the eu.etaxonomy.cdm.remote.config.CdmVaadinConfiguration
         -->
        <context:component-scan base-package="eu/etaxonomy/cdm/addon/config" />
        <!-- include default application context and customization -->
         <import resource="classpath:/eu/etaxonomy/cdm/defaultApplicationContext.xml"/>
         <bean id="persistentTermInitializer" class="eu.etaxonomy.cdm.database.PersistentTermInitializer">
        <import resource="classpath:/eu/etaxonomy/cdm/defaultApplicationContext.xml"/>
        <bean id="persistentTermInitializer" class="eu.etaxonomy.cdm.database.PersistentTermInitializer">
            <property name="omit" value="false" />
         </bean>
        </bean>
        <context:component-scan base-package="eu/etaxonomy/cdm/ext" />
     <!--    <import resource="classpath:/eu/etaxonomy/cdm/remote-security.xml"/> -->
         <import resource="classpath:/eu/etaxonomy/cdm/remote.xml"/>
         <context:component-scan base-package="eu/etaxonomy/cdm/io">
             <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.io\.pesi.*" />
             <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.io\.faunaEuropaea.*" />
-...
         </bean>
         <!-- enable the configuration of transactional behavior based on annotations -->
         <tx:annotation-driven transaction-manager="transactionManager"/>
         <tx:annotation-driven transaction-manager="transactionManager" />
       	<!-- import additional beans into the root context (this is in cdmlib-remote-webapp) -->
       	<!-- <import resource="applicationContext.views.xml" />  -->
         <!-- import configuration of the datasource bean -->
         <import resource="datasources/configurable.xml" />
       <!--
         <bean class="eu.etaxonomy.cdm.opt.config.LoggingConfigurer">
         </bean>
      -->
         <!-- bootstrap the Web Configuration -->
       	<bean class="eu.etaxonomy.cdm.remote.config.MultiWebSecurityConfiguration" />
         <bean class="eu.etaxonomy.cdm.opt.config.LoggingConfigurer" />
         <bean class="eu.etaxonomy.cdm.opt.config.EhCacheDiskStoreConfiguration" />
       <bean id="serializableFactory" class="org.springmodules.cache.serializable.XStreamSerializableFactory"/>
         <bean id="serializableFactory" class="org.springmodules.cache.serializable.XStreamSerializableFactory" />
       <bean id="cacheProviderFacade" class="org.springmodules.cache.provider.ehcache.EhCacheFacade">
           <property name="cacheManager" ref="cacheManager" />
           <property name="serializableFactory" ref="serializableFactory"/>
       </bean>
         <bean id="cacheProviderFacade" class="org.springmodules.cache.provider.ehcache.EhCacheFacade">
             <!--
                 the cacheManager is provided by the eu.etaxonomy.cdm.api.config.EhCacheConfiguration
                 in cdmlib-services
             -->
             <property name="cacheManager" ref="cacheManager" />
             <property name="serializableFactory" ref="serializableFactory"/>
         </bean>
     </beans>

         http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
         ">
       <!--
         Initialize SpringMVCConfig and its dependency SpringSwaggerConfig.
         All further component scans are defined in this mvc configuration class
       <context:component-scan base-package="eu/etaxonomy/cdm/remote/config" />
       <context:component-scan base-package="eu/etaxonomy/cdm/vaadin" />
       -->
     </beans>

           xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
           version="3.0">
       <!--
            NOTE: For a detailed overview on the spring MVC and application context
            configuration and bootstrapping of this web application
            see: http://dev.e-taxonomy.eu/trac/wiki/cdmlib-remote-webappConfigurationAndBootstrapping
       -->
         <description>cdmlib-vaadin web-application instance</description>
         <display-name>cdmlib-vaadin</display-name>
-...
           <filter-name>charsetFilter</filter-name>
           <url-pattern>/*</url-pattern>
         </filter-mapping>
         <!-- Remoting Security -->
         <filter>
           <filter-name>springSecurityFilterChain</filter-name>
           <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
         </filter>
         <filter-mapping>
           <filter-name>springSecurityFilterChain</filter-name>
           <url-pattern>/*</url-pattern>
         </filter-mapping>
         <!--
           The production mode is disabled per default.

     import com.vaadin.ui.VerticalLayout;
     @Theme("edit")
     @SpringUI(path="/app-test/*")
     @SpringUI(path="")
     @Widgetset("eu.etaxonomy.cdm.vaadin.AppWidgetSet")
     @SuppressWarnings("serial")
     public class CheckTestUI extends UI {
         @WebServlet(value = {"/*", "/VAADIN/*"}, asyncSupported = true)
         @WebServlet(value = {"/app-test/*", "/VAADIN/*"}, asyncSupported = true)
         public static class Servlet extends SpringVaadinServlet {
+        }

+     *
      */
     @Theme("edit")
     @SpringUI(path="/app-test/d3ctree")
     @SpringUI(path="d3ctree")
     @Widgetset("eu.etaxonomy.cdm.vaadin.AppWidgetSet")
     public class D3CTreeUI extends UI {
         private final static Logger logger =
                 Logger.getLogger(D3CTreeUI.class.getName());
         @WebServlet(value = {"/*"}, asyncSupported = true)
         @WebServlet(value = {"/app-test/*"}, asyncSupported = true)
         public static class Servlet extends SpringVaadinServlet {
+        }

     import eu.etaxonomy.cdm.vaadin.view.NaviTestView;
     @Theme("edit")
     @SpringUI(path="/app-test/navi")
     @SpringUI(path="navi")
     @Widgetset("eu.etaxonomy.cdm.vaadin.AppWidgetSet")
     public class NavigatorTestUI extends AbstractAuthenticatedUI {
-...
     	private final static Logger logger =
     			Logger.getLogger(NavigatorTestUI.class.getName());
     	@WebServlet(value = {"/*"}, asyncSupported = true)
     	@WebServlet(value = {"/app-test/*"}, asyncSupported = true)
     	public static class Servlet extends CdmVaadinConversationalServlet {
+    	}

         <context:property-override location="classpath:override.properties"/>
         <bean class="eu.etaxonomy.cdm.vaadin.conf.CdmVaadinConfiguration" />
         <context:component-scan base-package="eu/etaxonomy/cdm/vaadin" />
         <context:component-scan base-package="eu/etaxonomy/cdm/api/config" />
         <context:component-scan base-package="eu/etaxonomy/cdm/api/service">
         </context:component-scan>
             <context:component-scan base-package="eu/etaxonomy/cdm/api/config">
         </context:component-scan>
         <context:component-scan base-package="eu/etaxonomy/cdm/api/application">

Project

General

Profile

EDIT

Revision e6b01164

Added by Andreas Kohlbecker about 7 years ago