syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject [35/53] [abbrv] syncope git commit: Fixing deprecation errors during compilation
Date Mon, 05 Jan 2015 13:34:40 GMT
Fixing deprecation errors  during compilation


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/ac4d6af4
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/ac4d6af4
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/ac4d6af4

Branch: refs/heads/2_0_X
Commit: ac4d6af48f8c08167db7051d69c011f650b48555
Parents: b19ff85
Author: giacomolm <giacomolm@hotmail.it>
Authored: Tue Dec 30 18:25:12 2014 +0100
Committer: giacomolm <giacomolm@hotmail.it>
Committed: Tue Dec 30 18:25:12 2014 +0100

----------------------------------------------------------------------
 .../core/provisioning/camel/CamelRoleProvisioningManager.java  | 4 ++--
 .../core/provisioning/camel/CamelUserProvisioningManager.java  | 5 +++--
 .../syncope/core/provisioning/camel/SyncopeCamelContext.java   | 6 +++---
 .../camel/processors/DefaultUserUpdatePropagation.java         | 2 --
 4 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/ac4d6af4/core/src/main/java/org/apache/syncope/core/provisioning/camel/CamelRoleProvisioningManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/CamelRoleProvisioningManager.java
b/core/src/main/java/org/apache/syncope/core/provisioning/camel/CamelRoleProvisioningManager.java
index 33856a9..9b121a4 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/CamelRoleProvisioningManager.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/CamelRoleProvisioningManager.java
@@ -68,7 +68,7 @@ public class CamelRoleProvisioningManager implements RoleProvisioningManager
{
 
     private static final Logger LOG = LoggerFactory.getLogger(CamelRoleProvisioningManager.class);
 
-    private DefaultCamelContext camelContext;
+    private SpringCamelContext camelContext;
 
     private RoutesDefinition routes;
 
@@ -95,7 +95,7 @@ public class CamelRoleProvisioningManager implements RoleProvisioningManager
{
         camelContext.stop();
     }
 
-    public CamelContext getContext() {
+    public SpringCamelContext getContext() {
         //ApplicationContext context = ApplicationContextProvider.getApplicationContext();
         //return context.getBean("camel-context", DefaultCamelContext.class);        
         return contextFactory.getContext(routeDAO);

http://git-wip-us.apache.org/repos/asf/syncope/blob/ac4d6af4/core/src/main/java/org/apache/syncope/core/provisioning/camel/CamelUserProvisioningManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/CamelUserProvisioningManager.java
b/core/src/main/java/org/apache/syncope/core/provisioning/camel/CamelUserProvisioningManager.java
index d30c624..01b057a 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/CamelUserProvisioningManager.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/CamelUserProvisioningManager.java
@@ -40,6 +40,7 @@ import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.impl.DefaultExchange;
 import org.apache.camel.impl.DefaultMessage;
 import org.apache.camel.model.RoutesDefinition;
+import org.apache.camel.spring.SpringCamelContext;
 import org.apache.syncope.common.mod.StatusMod;
 import org.apache.syncope.common.mod.UserMod;
 import org.apache.syncope.common.to.PropagationStatus;
@@ -59,7 +60,7 @@ public class CamelUserProvisioningManager implements UserProvisioningManager
{
 
     private static final Logger LOG = LoggerFactory.getLogger(CamelUserProvisioningManager.class);
 
-    private DefaultCamelContext camelContext;
+    private SpringCamelContext camelContext;
 
     private RoutesDefinition routes;
 
@@ -98,7 +99,7 @@ public class CamelUserProvisioningManager implements UserProvisioningManager
{
         camelContext.stop();
     }
 
-    public CamelContext getContext() {
+    public SpringCamelContext getContext() {
         //ApplicationContext context = ApplicationContextProvider.getApplicationContext();
         //return context.getBean("camel-context", DefaultCamelContext.class);           
        
         return contextFactory.getContext(routeDAO);

http://git-wip-us.apache.org/repos/asf/syncope/blob/ac4d6af4/core/src/main/java/org/apache/syncope/core/provisioning/camel/SyncopeCamelContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/SyncopeCamelContext.java
b/core/src/main/java/org/apache/syncope/core/provisioning/camel/SyncopeCamelContext.java
index c529dcf..6d3e77d 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/SyncopeCamelContext.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/SyncopeCamelContext.java
@@ -48,15 +48,15 @@ public class SyncopeCamelContext {
 
     private static final Logger LOG = LoggerFactory.getLogger(SyncopeCamelContext.class);
 
-    private CamelContext camelContext = null;
+    private SpringCamelContext camelContext = null;
 
     public SyncopeCamelContext() {
     }
 
-    public CamelContext getContext(RouteDAO routeDAO) {
+    public SpringCamelContext getContext(RouteDAO routeDAO) {
 
         if (camelContext == null) {
-            camelContext = new SpringCamelContext(ApplicationContextProvider.getApplicationContext());
+            camelContext = new  SpringCamelContext(ApplicationContextProvider.getApplicationContext());
         }
         if (camelContext.getRouteDefinitions().isEmpty()) {
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/ac4d6af4/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserUpdatePropagation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserUpdatePropagation.java
b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserUpdatePropagation.java
index a94bea5..c9b498e 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserUpdatePropagation.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserUpdatePropagation.java
@@ -24,11 +24,9 @@ import java.util.List;
 import java.util.Map;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
-import org.apache.syncope.common.mod.AttributeMod;
 import org.apache.syncope.common.mod.MembershipMod;
 import org.apache.syncope.common.mod.UserMod;
 import org.apache.syncope.common.to.PropagationStatus;
-import org.apache.syncope.common.to.UserTO;
 import org.apache.syncope.core.persistence.beans.PropagationTask;
 import org.apache.syncope.core.propagation.PropagationByResource;
 import org.apache.syncope.core.propagation.PropagationException;


Mime
View raw message