Commit 428b9d61 authored by Peter Harrison's avatar Peter Harrison

Adding Camel dependencies

Resolving issue with locking up moving between boards.
parent 9208b054
......@@ -15,6 +15,7 @@
<java.version>1.6</java.version>
<junit.version>4.8.2</junit.version>
<jackson.version>1.9.10</jackson.version>
<camel.version>2.17.2</camel.version>
</properties>
<licenses>
......@@ -60,17 +61,17 @@
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>1.0.0.GA</version>
<version>1.1.0.Final</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>4.0.0.GA</version>
<version>5.2.4.Final</version>
<scope>compile</scope>
</dependency>
<!-- Spring Dependencies -->
<dependency>
......@@ -343,7 +344,6 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
......@@ -398,6 +398,20 @@
<artifactId>sjsxp</artifactId>
<version>1.0.1</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.camel/camel-core -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
<version>${camel.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.camel/camel-spring -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
<version>${camel.version}</version>
</dependency>
</dependencies>
......
......@@ -39,6 +39,7 @@ import org.apache.jackrabbit.ocm.manager.ObjectContentManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
......@@ -62,6 +63,7 @@ public class UserController {
@Resource(name="ocmFactory")
OcmMapperFactory ocmFactory;
@PreAuthorize("hasPermission('admin', 'TEAM', 'ADMIN')")
@RequestMapping(value = "", method=RequestMethod.POST)
public @ResponseBody User createUser(@RequestBody User user) throws Exception {
if( user.getPath()!=null ){
......@@ -115,6 +117,7 @@ public class UserController {
return taskList;
}
@PreAuthorize("hasPermission('admin', 'TEAM', 'ADMIN')")
@RequestMapping(value = "/{userId}", method=RequestMethod.DELETE)
public @ResponseBody void deleteUser(@PathVariable String userId) throws Exception {
Session session = ocmFactory.getOcm().getSession();
......
<?xml version="1.0" encoding="UTF-8"?>
<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:jee="http://www.springframework.org/schema/jee" xmlns:jms="http://www.springframework.org/schema/jms"
xmlns:util="http://www.springframework.org/schema/util" xmlns:context="http://www.springframework.org/schema/context"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tx="http://www.springframework.org/schema/tx"
xmlns:jee="http://www.springframework.org/schema/jee"
xmlns:jms="http://www.springframework.org/schema/jms"
xmlns:util="http://www.springframework.org/schema/util"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:camel="http://camel.apache.org/schema/spring"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
http://www.springframework.org/schema/tx
......@@ -14,7 +18,9 @@
http://www.springframework.org/schema/util
http://www.springframework.org/schema/util/spring-util-3.1.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-3.1.xsd">
http://www.springframework.org/schema/context/spring-context-3.1.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd">
<bean id="variableInterpreter" class="nz.net.orcon.kanban.automation.VariableInterpreter"/>
......@@ -150,5 +156,10 @@
<!-- Cluster Management -->
<bean id="clusterManager" class="nz.net.orcon.kanban.automation.ClusterManagerImpl"/>
<camel:camelContext>
<!-- and then let Camel use those @Component scanned route builders -->
<camel:contextScan/>
</camel:camelContext>
</beans>
......@@ -172,7 +172,7 @@ var cards = {
if (data.color)
$card.addClass(data.color);
if (view.currentview) {
if (view.currentview && (view.views[view.currentview] != undefined) ) {
$card.append('<div class="card-view-field-wrapper"></div>');
var $fieldwrapper = $card.find('.card-view-field-wrapper'),
n = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment