Skip to content

Commit

Permalink
#146 - spring + security 4, apache cxf ... buildable, deployable - se…
Browse files Browse the repository at this point in the history 
…curity problem, no CSRF token
  • Loading branch information
@stebjan
stebjan committed Feb 9, 2016
1 parent 0c36113 commit 0889364
Show file tree
Hide file tree
Showing 60 changed files with 640 additions and 701 deletions.
174 changes: 90 additions & 84 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<build.timestamp>${maven.build.timestamp}</build.timestamp>
<spring.version>3.1.4.RELEASE</spring.version>
<spring.security.version>3.1.0.RELEASE</spring.security.version>
<org.springframework.social-version>1.0.2.RELEASE</org.springframework.social-version>
<org.springframework.social.facebook-version>1.0.1.RELEASE</org.springframework.social.facebook-version>
<org.springframework.social.linkedin-version>1.0.0.RC1</org.springframework.social.linkedin-version>
<spring.version>4.2.4.RELEASE</spring.version>
<spring.security.version>4.0.3.RELEASE</spring.security.version>
<org.springframework.social-version>1.1.4.RELEASE</org.springframework.social-version>
<org.springframework.social.facebook-version>1.1.1.RELEASE</org.springframework.social.facebook-version>
<org.springframework.social.linkedin-version>1.0.0.RELEASE</org.springframework.social.linkedin-version>

<spring.webmvc.struts.version>2.5.6.SEC02</spring.webmvc.struts.version>
<slf4j-version>1.6.1</slf4j-version>
Expand Down Expand Up @@ -84,7 +84,7 @@
<artifactId>hibernate-profiler</artifactId>
<version>1.0</version>
</dependency>

<!-- ============================= In-house libs in Nexus repository =========================== -->
<dependency>
<groupId>cz.zcu.kiv</groupId>
Expand All @@ -96,7 +96,7 @@
<artifactId>odml-java-lib</artifactId>
<version>1.1.7</version>
</dependency>

<!--=================================== Test scoped libraries ================================== -->
<dependency>
<groupId>junit</groupId>
Expand Down Expand Up @@ -202,35 +202,35 @@

<!--================================== Sun jaxb and jaxws ======================================= -->

<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.2.6</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
<version>2.2.6</version>
</dependency>
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
<version>2.2.7</version>
</dependency>
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>policy</artifactId>
<version>2.3.1</version>
</dependency>
<!--<dependency>-->
<!--<groupId>com.sun.xml.bind</groupId>-->
<!--<artifactId>jaxb-impl</artifactId>-->
<!--<version>2.2.6</version>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>com.sun.xml.bind</groupId>-->
<!--<artifactId>jaxb-xjc</artifactId>-->
<!--<version>2.2.6</version>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>com.sun.xml.ws</groupId>-->
<!--<artifactId>jaxws-rt</artifactId>-->
<!--<version>2.2.10-b140319.1121</version>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>com.sun.xml.ws</groupId>-->
<!--<artifactId>policy</artifactId>-->
<!--<version>2.3.1</version>-->
<!--</dependency>-->
<dependency>
<groupId>com.sun.xml.fastinfoset</groupId>
<artifactId>FastInfoset</artifactId>
<version>1.2.12</version>
<version>1.2.13</version>
</dependency>
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-tools</artifactId>
<version>2.2.7</version>
<version>2.2.8</version>
</dependency>
<dependency>
<groupId>javax.xml</groupId>
Expand All @@ -246,26 +246,23 @@
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
<version>1.9.9</version>
<version>1.9.13</version>
</dependency>

<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-xc</artifactId>
<version>1.9.9</version>
<version>1.9.13</version>
</dependency>


<!--======================================= Spring ============================================= -->
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-elasticsearch</artifactId>
<version>1.0.0</version>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>

</dependency>
<dependency>
<groupId>org.springframework</groupId>
Expand All @@ -287,14 +284,14 @@
<artifactId>spring-aop</artifactId>
<version>${spring.version}</version>
</dependency>
<!-- Spring Test -->
<!--Spring Test-->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${spring.version}</version>
<scope>test</scope>
</dependency>
<!-- Spring Persistence -->
<!--Spring Persistence-->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
Expand All @@ -310,19 +307,14 @@
<artifactId>spring-orm</artifactId>
<version>${spring.version}</version>
</dependency>
<!-- Spring Expression -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
<version>${spring.version}</version>
</dependency>
<!-- Spring Web -->
<!--Spring Expression-->
<!--Spring Web-->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${spring.version}</version>
</dependency>
<!-- Spring MVC -->
<!--Spring MVC-->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
Expand All @@ -334,17 +326,17 @@
<version>${spring.webmvc.struts.version}</version>
</dependency>

<!-- Spring Security -->
<!--Spring Security-->
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<version>${spring.security.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-acl</artifactId>
<version>${spring.security.version}</version>
</dependency>
<!--<dependency>-->
<!--<groupId>org.springframework.security</groupId>-->
<!--<artifactId>spring-security-acl</artifactId>-->
<!--<version>${spring.security.version}</version>-->
<!--</dependency>-->
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
Expand All @@ -355,13 +347,13 @@
<artifactId>spring-security-web</artifactId>
<version>${spring.security.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-taglibs</artifactId>
<version>${spring.security.version}</version>
</dependency>
<!--<dependency>-->
<!--<groupId>org.springframework.security</groupId>-->
<!--<artifactId>spring-security-taglibs</artifactId>-->
<!--<version>${spring.security.version}</version>-->
<!--</dependency>-->

<!-- Spring Social -->
<!--Spring Social-->
<dependency>
<groupId>org.springframework.social</groupId>
<artifactId>spring-social-core</artifactId>
Expand All @@ -382,6 +374,11 @@
<artifactId>spring-social-linkedin</artifactId>
<version>${org.springframework.social.linkedin-version}</version>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-elasticsearch</artifactId>
<version>1.0.0</version>
</dependency>

<!--======================================= Wicket ============================================= -->
<dependency>
Expand Down Expand Up @@ -443,7 +440,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>4.3.5.Final</version>
<version>4.2.11.Final</version>
<exclusions>
<exclusion>
<artifactId>xml-apis</artifactId>
Expand All @@ -455,7 +452,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-tools</artifactId>
<version>4.3.2.Final</version>
<version>4.0.0.Final</version>
</dependency>

<dependency>
Expand All @@ -464,17 +461,17 @@
<version>3.4.ga</version>
</dependency>

<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
<version>2.2</version>
</dependency>
<!--<dependency>-->
<!--<groupId>cglib</groupId>-->
<!--<artifactId>cglib</artifactId>-->
<!--<version>2.2</version>-->
<!--</dependency>-->

<dependency>
<groupId>asm</groupId>
<artifactId>asm-attrs</artifactId>
<version>1.5.3</version>
</dependency>
<!--<dependency>-->
<!--<groupId>asm</groupId>-->
<!--<artifactId>asm-attrs</artifactId>-->
<!--<version>1.5.3</version>-->
<!--</dependency>-->

<dependency>
<groupId>com.mchange</groupId>
Expand Down Expand Up @@ -532,7 +529,7 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.2.2</version>
<version>1.3.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
Expand Down Expand Up @@ -608,29 +605,38 @@

<!-- ============================== Cxf libraries - lots of transitive dependencies ===================== -->

<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-distribution-manifest</artifactId>
<version>2.6.2</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
</exclusion>
</exclusions>
</dependency>
<!--<dependency>-->
<!--<groupId>org.apache.cxf</groupId>-->
<!--<artifactId>cxf-distribution-manifest</artifactId>-->
<!--<version>3.1.1</version>-->
<!--<exclusions>-->
<!--<exclusion>-->
<!--<groupId>org.slf4j</groupId>-->
<!--<artifactId>slf4j-jdk14</artifactId>-->
<!--</exclusion>-->
<!--<exclusion>-->
<!--<groupId>org.springframework</groupId>-->
<!--<artifactId>spring-asm</artifactId>-->
<!--</exclusion>-->
<!--</exclusions>-->
<!--</dependency>-->

<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>2.6.2</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>3.1.1</version>
</dependency>


<dependency>
<groupId>org.apache.ws.xmlschema</groupId>
<artifactId>xmlschema-core</artifactId>
<version>2.0.3</version>
<version>2.2.0</version>
</dependency>

<!-- ===================================== Semantic web libs ============================================ -->
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/cz/zcu/kiv/eegdatabase/data/dao/GenericDao.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
******************************************************************************/
package cz.zcu.kiv.eegdatabase.data.dao;

import org.apache.lucene.queryparser.classic.ParseException;
import org.hibernate.SessionFactory;

import java.io.Serializable;
import java.util.List;
import java.util.Map;

import org.apache.lucene.queryparser.classic.ParseException;
import org.hibernate.SessionFactory;

/**
* Interface for connecting logic and data layer.
* This interface makes create, showing, delete,
Expand Down
Loading

0 comments on commit 0889364

Please sign in to comment.