Igor

json

@@ -0,0 +1 @@
+[{"id":"7","projectObjectId":1,"name":"wbs2","code":"wbs_code2","parentId":0,"indexNumber":1,"cost":null,"w2ui":{"children":[{"id":"8","projectObjectId":1,"name":"wbs3","code":"wbs_code3","parentId":7,"indexNumber":1,"cost":null,"w2ui":{"children":[{"id":"9","projectObjectId":1,"name":"wbs4","code":"wbs_code4","parentId":8,"indexNumber":1,"cost":null,"w2ui":{"children":[{"id":"_14","projectObjectId":1,"name":"act_name4","code":null,"parentId":null,"indexNumber":null,"cost":5,"w2ui":null,"type":"act"}]},"type":"wbs"},{"id":"10","projectObjectId":1,"name":"wbs5","code":"wbs_code5","parentId":8,"indexNumber":1,"cost":null,"w2ui":{"children":[{"id":"_15","projectObjectId":1,"name":"act_name5","code":null,"parentId":null,"indexNumber":null,"cost":5,"w2ui":null,"type":"act"}]},"type":"wbs"},{"id":"_12","projectObjectId":1,"name":"act_name2","code":null,"parentId":null,"indexNumber":null,"cost":5,"w2ui":null,"type":"act"},{"id":"_13","projectObjectId":1,"name":"act_name3","code":null,"parentId":null,"indexNumber":null,"cost":5,"w2ui":null,"type":"act"}]},"type":"wbs"},{"id":"_11","projectObjectId":1,"name":"act_name1","code":null,"parentId":null,"indexNumber":null,"cost":5,"w2ui":null,"type":"act"}]},"type":"wbs"},{"id":"11","projectObjectId":1,"name":"wbs6","code":"wbs_code6","parentId":0,"indexNumber":1,"cost":null,"w2ui":null,"type":"wbs"}]

pom.xml

@@ -4,11 +4,11 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.ibcon</groupId>
-	<artifactId>factage_web</artifactId>
+	<artifactId>sproject</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<packaging>jar</packaging>
+	<packaging>war</packaging>
 
-	<name>factage_web</name>
+	<name>sproject</name>
 	<description></description>
 
 	<parent>
@@ -21,7 +21,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<start-class>com.ibcon.factage_web.FactageWebApplication</start-class>
+		<start-class>com.ibcon.sproject.SprojectWebApplication</start-class>
 		<java.version>1.8</java.version>
 	</properties>
 
@@ -109,6 +109,44 @@
 			<version>1.16.16</version>
 			<scope>provided</scope>
 		</dependency>
+
+		<!--XML-->
+		<dependency>
+			<groupId>org.jdom</groupId>
+			<artifactId>jdom2</artifactId>
+			<version>2.0.6</version>
+		</dependency>
+
+		<!--MathParser-->
+		<dependency>
+			<groupId>bsh</groupId>
+			<artifactId>bsh</artifactId>
+			<version>2.0b4</version>
+		</dependency>
+
+		<dependency>
+			<groupId>joda-time</groupId>
+			<artifactId>joda-time</artifactId>
+			<version>2.9.9</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.jadira.usertype</groupId>
+			<artifactId>usertype.core</artifactId>
+			<version>5.0.0.GA</version>
+		</dependency>
+
+
+		<dependency>
+			<groupId>com.fasterxml.jackson.jaxrs</groupId>
+			<artifactId>jackson-jaxrs-json-provider</artifactId>
+			<version>2.2.1</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.fasterxml.jackson.datatype</groupId>
+			<artifactId>jackson-datatype-joda</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>

src/main/java/com/ibcon/factage_web/FactageWebApplication.java → src/main/java/com/ibcon/sproject/SprojectWebApplication.java

@@ -1,12 +1,12 @@
-package com.ibcon.factage_web;
+package com.ibcon.sproject;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class FactageWebApplication {
+public class SprojectWebApplication {
 
 	public static void main(String[] args) {
-		SpringApplication.run(FactageWebApplication.class, args);
+		SpringApplication.run(SprojectWebApplication.class, args);
 	}
 }

src/main/java/com/ibcon/factage_web/configuration/CommonBeanConfig.java → src/main/java/com/ibcon/sproject/configuration/CommonBeanConfig.java

@@ -1,9 +1,9 @@
-package com.ibcon.factage_web.configuration;
+package com.ibcon.sproject.configuration;
 
-import com.ibcon.factage_web.services.crud.role.RoleService;
-import com.ibcon.factage_web.services.crud.role.RoleServiceImpl;
-import com.ibcon.factage_web.services.crud.user.UserServiceCrud;
-import com.ibcon.factage_web.services.crud.user.UserServiceCrudImp;
+import com.ibcon.sproject.services.crud.role.RoleService;
+import com.ibcon.sproject.services.crud.role.RoleServiceImpl;
+import com.ibcon.sproject.services.crud.user.UserServiceCrud;
+import com.ibcon.sproject.services.crud.user.UserServiceCrudImp;
 import org.jasypt.util.password.StrongPasswordEncryptor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -21,8 +21,4 @@ public RoleService roleService() {
         return new RoleServiceImpl();
     }
 
-    @Bean
-    public UserServiceCrud userServiceCrud() {
-        return new UserServiceCrudImp();
-    }
 }

src/main/java/com/ibcon/factage_web/configuration/SecurityConfiguration.java → src/main/java/com/ibcon/sproject/configuration/SecurityConfiguration.java

@@ -1,4 +1,4 @@
-package com.ibcon.factage_web.configuration;
+package com.ibcon.sproject.configuration;
 
 import org.jasypt.springsecurity3.authentication.encoding.PasswordEncoder;
 import org.jasypt.util.password.StrongPasswordEncryptor;
@@ -8,7 +8,6 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.core.userdetails.UserDetailsService;
@@ -43,6 +42,7 @@ public DaoAuthenticationProvider daoAuthenticationProvider(PasswordEncoder passw
 
     @Override
     protected void configure(HttpSecurity http) throws Exception {
+        //TODO access to resources?
         http.authorizeRequests().antMatchers("/").permitAll()
                 .antMatchers("/user*").hasAuthority("ADMIN")
                 .anyRequest().authenticated()
@@ -52,7 +52,7 @@ protected void configure(HttpSecurity http) throws Exception {
                 .logout().permitAll();
 //        http.authorizeRequests().antMatchers("/users/**").hasAuthority("ADMIN");
 
-//        http.csrf().disable();
+        http.csrf().disable();
         http.headers().frameOptions().disable();
     }