Revision 4cd4de2d
Added by Andreas Müller over 3 years ago
| src/main/java/eu/etaxonomy/cdm/vaadin/model/registration/SpecimenTypeDesignationDTO.java | ||
|---|---|---|
| 8 | 8 |
*/ |
| 9 | 9 |
package eu.etaxonomy.cdm.vaadin.model.registration; |
| 10 | 10 |
|
| 11 |
import java.net.URI; |
|
| 12 | 11 |
import java.util.UUID; |
| 13 | 12 |
|
| 14 | 13 |
import org.apache.commons.collections.CollectionUtils; |
| 15 | 14 |
|
| 16 | 15 |
import eu.etaxonomy.cdm.api.utility.DerivedUnitConversionException; |
| 17 | 16 |
import eu.etaxonomy.cdm.api.utility.DerivedUnitConverter; |
| 17 |
import eu.etaxonomy.cdm.common.URI; |
|
| 18 | 18 |
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; |
| 19 | 19 |
import eu.etaxonomy.cdm.model.common.IdentifiableSource; |
| 20 | 20 |
import eu.etaxonomy.cdm.model.media.Media; |
| src/main/java/eu/etaxonomy/cdm/vaadin/ui/AbstractAuthenticatedUI.java | ||
|---|---|---|
| 1 | 1 |
package eu.etaxonomy.cdm.vaadin.ui; |
| 2 | 2 |
|
| 3 |
import java.net.URI; |
|
| 4 | 3 |
import java.util.logging.Logger; |
| 5 | 4 |
|
| 6 | 5 |
import com.vaadin.navigator.Navigator; |
| ... | ... | |
| 11 | 10 |
import com.vaadin.spring.navigator.SpringViewProvider; |
| 12 | 11 |
import com.vaadin.ui.UI; |
| 13 | 12 |
|
| 13 |
import eu.etaxonomy.cdm.common.URI; |
|
| 14 | 14 |
import eu.etaxonomy.cdm.vaadin.util.CdmVaadinAuthentication; |
| 15 | 15 |
import eu.etaxonomy.cdm.vaadin.view.AuthenticationView; |
| 16 | 16 |
|
| ... | ... | |
| 53 | 53 |
CdmVaadinAuthentication cvAuthentication = (CdmVaadinAuthentication) VaadinSession.getCurrent().getAttribute(CdmVaadinAuthentication.KEY); |
| 54 | 54 |
|
| 55 | 55 |
doInit(request); |
| 56 |
URI uri = Page.getCurrent().getLocation();
|
|
| 56 |
URI uri = new URI(Page.getCurrent().getLocation());
|
|
| 57 | 57 |
String context = VaadinServlet.getCurrent().getServletContext().getContextPath(); |
| 58 | 58 |
if(ignoreAuthentication || (cvAuthentication != null && cvAuthentication.isAuthenticated(uri, context))) {
|
| 59 | 59 |
if(cvAuthentication != null) {
|
| src/main/java/eu/etaxonomy/cdm/vaadin/util/CdmVaadinAuthentication.java | ||
|---|---|---|
| 8 | 8 |
*/ |
| 9 | 9 |
package eu.etaxonomy.cdm.vaadin.util; |
| 10 | 10 |
|
| 11 |
import java.net.URI; |
|
| 12 | 11 |
import java.util.HashMap; |
| 13 | 12 |
import java.util.Map; |
| 14 | 13 |
|
| ... | ... | |
| 16 | 15 |
import org.springframework.security.core.Authentication; |
| 17 | 16 |
import org.springframework.security.core.context.SecurityContextHolder; |
| 18 | 17 |
|
| 18 |
import eu.etaxonomy.cdm.common.URI; |
|
| 19 |
|
|
| 19 | 20 |
/** |
| 20 | 21 |
* @author cmathew |
| 21 | 22 |
* @since 28 Apr 2015 |
| src/main/java/eu/etaxonomy/cdm/vaadin/util/converter/UriConverter.java | ||
|---|---|---|
| 8 | 8 |
*/ |
| 9 | 9 |
package eu.etaxonomy.cdm.vaadin.util.converter; |
| 10 | 10 |
|
| 11 |
import java.net.URI; |
|
| 12 | 11 |
import java.util.Locale; |
| 13 | 12 |
|
| 14 | 13 |
import com.vaadin.data.util.converter.Converter; |
| 15 | 14 |
|
| 15 |
import eu.etaxonomy.cdm.common.URI; |
|
| 16 |
|
|
| 16 | 17 |
/** |
| 17 | 18 |
* Creates a link from the values in the column. |
| 18 | 19 |
* |
| src/main/java/eu/etaxonomy/cdm/vaadin/view/AuthenticationPresenter.java | ||
|---|---|---|
| 1 | 1 |
package eu.etaxonomy.cdm.vaadin.view; |
| 2 | 2 |
|
| 3 |
import java.net.URI; |
|
| 4 |
|
|
| 5 | 3 |
import org.springframework.security.authentication.AuthenticationManager; |
| 6 | 4 |
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; |
| 7 | 5 |
import org.springframework.security.core.Authentication; |
| ... | ... | |
| 9 | 7 |
|
| 10 | 8 |
import com.vaadin.server.VaadinSession; |
| 11 | 9 |
|
| 10 |
import eu.etaxonomy.cdm.common.URI; |
|
| 12 | 11 |
import eu.etaxonomy.cdm.vaadin.util.CdmSpringContextHelper; |
| 13 | 12 |
import eu.etaxonomy.cdm.vaadin.util.CdmVaadinAuthentication; |
| 14 | 13 |
import eu.etaxonomy.cdm.vaadin.util.CdmVaadinSessionUtilities; |
| src/main/java/eu/etaxonomy/cdm/vaadin/view/AuthenticationView.java | ||
|---|---|---|
| 22 | 22 |
import com.vaadin.ui.UI; |
| 23 | 23 |
import com.vaadin.ui.VerticalLayout; |
| 24 | 24 |
|
| 25 |
import eu.etaxonomy.cdm.common.URI; |
|
| 25 | 26 |
import eu.etaxonomy.cdm.vaadin.component.TextFieldNFix; |
| 26 | 27 |
import eu.etaxonomy.cdm.vaadin.ui.AbstractAuthenticatedUI; |
| 27 | 28 |
|
| ... | ... | |
| 80 | 81 |
public void buttonClick(ClickEvent event) {
|
| 81 | 82 |
boolean isAuthenticated = false; |
| 82 | 83 |
try {
|
| 83 |
isAuthenticated = authListener.login(Page.getCurrent().getLocation(),
|
|
| 84 |
isAuthenticated = authListener.login(new URI(Page.getCurrent().getLocation()),
|
|
| 84 | 85 |
VaadinServlet.getCurrent().getServletContext().getContextPath(), |
| 85 | 86 |
userNameTF.getValue(), |
| 86 | 87 |
passwordField.getValue()); |
| src/main/java/eu/etaxonomy/cdm/vaadin/view/IAuthenticationComponent.java | ||
|---|---|---|
| 1 | 1 |
package eu.etaxonomy.cdm.vaadin.view; |
| 2 | 2 |
|
| 3 |
import java.net.URI; |
|
| 4 |
|
|
| 5 |
|
|
| 3 |
import eu.etaxonomy.cdm.common.URI; |
|
| 6 | 4 |
|
| 7 | 5 |
public interface IAuthenticationComponent {
|
| 8 | 6 |
|
| src/test/java/eu/etaxonomy/cdm/service/SpecimenTypeDesignationWorkingSetServiceImplTest.java | ||
|---|---|---|
| 9 | 9 |
package eu.etaxonomy.cdm.service; |
| 10 | 10 |
|
| 11 | 11 |
import java.io.FileNotFoundException; |
| 12 |
import java.net.URI; |
|
| 13 | 12 |
import java.net.URISyntaxException; |
| 14 | 13 |
import java.util.UUID; |
| 15 | 14 |
|
| ... | ... | |
| 28 | 27 |
import eu.etaxonomy.cdm.CdmVaadinIntegrationTest; |
| 29 | 28 |
import eu.etaxonomy.cdm.api.application.CdmRepository; |
| 30 | 29 |
import eu.etaxonomy.cdm.api.utility.DerivedUnitConversionException; |
| 30 |
import eu.etaxonomy.cdm.common.URI; |
|
| 31 | 31 |
import eu.etaxonomy.cdm.model.agent.Team; |
| 32 | 32 |
import eu.etaxonomy.cdm.model.common.Language; |
| 33 | 33 |
import eu.etaxonomy.cdm.model.common.LanguageString; |
| src/test/java/eu/etaxonomy/cdm/vaadin/presenter/AuthenticationPresenterTest.java | ||
|---|---|---|
| 8 | 8 |
*/ |
| 9 | 9 |
package eu.etaxonomy.cdm.vaadin.presenter; |
| 10 | 10 |
|
| 11 |
import java.net.URI; |
|
| 12 | 11 |
import java.net.URISyntaxException; |
| 13 | 12 |
|
| 14 | 13 |
import org.apache.log4j.Logger; |
| ... | ... | |
| 19 | 18 |
|
| 20 | 19 |
import com.vaadin.server.VaadinSession; |
| 21 | 20 |
|
| 21 |
import eu.etaxonomy.cdm.common.URI; |
|
| 22 | 22 |
import eu.etaxonomy.cdm.vaadin.CdmVaadinBaseTest; |
| 23 | 23 |
import eu.etaxonomy.cdm.vaadin.util.CdmVaadinAuthentication; |
| 24 | 24 |
import eu.etaxonomy.cdm.vaadin.view.AuthenticationPresenter; |
Also available in: Unified diff
ref #9114 adapt URIs to URI wrapper in vaadin