Undoing changes

pom.xml

@@ -116,7 +116,7 @@
         <dependency>
             <groupId>org.genesys2</groupId>
             <artifactId>transifex-client</artifactId>
-            <version>0.1</version>
+            <version>0.1-SNAPSHOT</version>
         </dependency>
 
 		<!--Test dependencies -->

src/main/java/org/genesys2/spring/config/ApplicationConfig.java

@@ -24,8 +24,8 @@ import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.ImportResource;
 
 @Configuration
-@Import({ SpringProperties.class, SpringCommonConfig.class, SpringAclConfig.class, SpringSchedulerConfig.class, SpringDataBaseConfig.class,
-		SpringMailConfig.class, SpringSecurityOauthConfig.class, SpringCacheConfig.class, ElasticsearchConfig.class })
+@Import({ SpringProperties.class, SpringCommonConfig.class, SpringAclConfig.class, SpringSchedulerConfig.class, SpringDataBaseConfig.class, SpringMailConfig.class,
+		SpringSecurityOauthConfig.class, SpringCacheConfig.class, ElasticsearchConfig.class })
 @ImportResource({ "classpath:/spring/spring-security.xml" })
 public class ApplicationConfig {
 

src/main/java/org/genesys2/spring/config/SpringCommonConfig.java

@@ -16,18 +16,24 @@
 
 package org.genesys2.spring.config;
 
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.SerializationFeature;
+import javax.persistence.Entity;
+
 import org.genesys2.spring.validation.oval.spring.SpringOvalValidator;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.*;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.context.annotation.FilterType;
+import org.springframework.context.annotation.Scope;
 import org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean;
 import org.springframework.security.acls.AclPermissionEvaluator;
 import org.springframework.security.web.access.expression.DefaultWebSecurityExpressionHandler;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.Validator;
 
-import javax.persistence.Entity;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.SerializationFeature;
 
 @EnableAspectJAutoProxy
 @ComponentScan(basePackages = { "org.genesys2.spring", "org.genesys2.server" }, excludeFilters = {

src/main/java/org/genesys2/spring/config/SpringDataBaseConfig.java

@@ -16,6 +16,8 @@
 
 package org.genesys2.spring.config;
 
+import java.util.Properties;
+
 import org.apache.tomcat.jdbc.pool.DataSource;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
@@ -27,8 +29,6 @@ import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
-import java.util.Properties;
-
 @EnableJpaRepositories(basePackages = { "org.genesys2.server.persistence.domain", "org.genesys2.server.persistence.acl" }, entityManagerFactoryRef = "entityManagerFactory", transactionManagerRef = "transactionManager", repositoryImplementationPostfix = "CustomImpl")
 // @EnableJpaAuditing(auditorAwareRef = "auditorAware")
 @EnableTransactionManagement

src/main/resources/spring/spring-db.xml

@@ -15,19 +15,13 @@
   limitations under the License.
 -->
 
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:tx="http://www.springframework.org/schema/tx"
-       xmlns:jpa="http://www.springframework.org/schema/data/jpa"
-       xmlns:context="http://www.springframework.org/schema/context"
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:jpa="http://www.springframework.org/schema/data/jpa" xmlns:context="http://www.springframework.org/schema/context"
 	   xsi:schemaLocation="http://www.springframework.org/schema/tx
        http://www.springframework.org/schema/tx/spring-tx-3.2.xsd
        http://www.springframework.org/schema/beans
        http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
        http://www.springframework.org/schema/data/jpa
-       http://www.springframework.org/schema/data/jpa/spring-jpa-1.3.xsd
-        http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context.xsd">
+       http://www.springframework.org/schema/data/jpa/spring-jpa-1.3.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
 	<jpa:auditing auditor-aware-ref="auditorAware" />
 

src/main/resources/spring/spring-security.xml

@@ -47,13 +47,6 @@
 	<!-- And other stuff -->
 	<sec:http pattern="/webapi/**" security="none" create-session="stateless" />
 
-    <!--Ignore security for Transifex hook-->
-    <!--Use "magic" SHA1 hash value just for some security purposes-->
-    <!--see org.genesys2.server.servlet.controller.transifex.TransifexAPIController#webHookHandle-->
-
-    <!--* Note: the very same value should be in Transifex preferences-->
-    <sec:http pattern="/transifex/hooks/40874cca86ca396169a5f4e6ebf6e4bf7199c4e7" security="none" create-session="stateless" />
-
 	<!-- Closed page and Authentication filter -->
 	<sec:http auto-config="true" use-expressions="true">
 		<!-- <intercept-url pattern="/data/**" access="isAuthenticated()" /> -->
@@ -61,11 +54,6 @@
 		<sec:intercept-url pattern="/profile**" access="isAuthenticated()" />
   		<sec:intercept-url pattern="/oauth/authorize" access="isAuthenticated()" />
 
-        <!--secure transifex URLs-->
-        <sec:intercept-url pattern="/transifex/**" access="isAuthenticated()" />
-
-        <sec:intercept-url pattern="/content/deleteFromTransifex" access="isAuthenticated()"/>
-
 		<!--Override default login and logout pages -->
 		<sec:form-login login-page="/login" authentication-failure-url="/login?error=1" login-processing-url="/login-attempt" default-target-url="/" always-use-default-target="false" />
         <sec:session-management session-fixation-protection="migrateSession" />

src/main/webapp/WEB-INF/web.xml

@@ -26,10 +26,6 @@
         <!--<param-value>classpath:spring/application-context.xml</param-value>-->
     <!--</context-param>-->
 
-    <context-param>
-        <param-name>spring.profiles.active</param-name>
-        <param-value>dev</param-value>
-    </context-param>
     <context-param>
         <param-name>contextClass</param-name>
         <param-value>
@@ -194,18 +190,10 @@
 		<filter-name>sitemesh</filter-name>
 		<filter-class>org.sitemesh.config.ConfigurableSiteMeshFilter</filter-class>
 	</filter>
-    <filter>
-        <filter-name>springSecurityFilterChain</filter-name>
-        <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-    </filter>
     <filter-mapping>
 		<filter-name>sitemesh</filter-name>
 		<url-pattern>/*</url-pattern>
 	</filter-mapping>
-    <filter-mapping>
-        <filter-name>springSecurityFilterChain</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
 
     <servlet>
         <servlet-name>mvc</servlet-name>

src/test/java/org/genesys2/server/test/PropertyPlacholderInitializer.java

@@ -16,6 +16,8 @@
 
 package org.genesys2.server.test;
 
+import java.io.IOException;
+
 import org.junit.Ignore;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.config.PlaceholderConfigurerSupport;
@@ -25,8 +27,6 @@ import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.core.io.support.ResourcePatternResolver;
 
-import java.io.IOException;
-
 /**
  * Initializing class for using "context:property-placeholder" within @Configuration
  * classes