Move the IntentSynchronizer out of the routing app into its own app

Change-Id: I05e84bce3853ea995b9921b96a2e6a3e8eddb689
diff --git a/apps/castor/BUCK b/apps/castor/BUCK
index 1e2cd89..890b291 100644
--- a/apps/castor/BUCK
+++ b/apps/castor/BUCK
@@ -7,6 +7,7 @@
   '//core/store/serializers:onos-core-serializers',
   '//incubator/api:onos-incubator-api',
   '//apps/routing-api:onos-apps-routing-api',
+  '//apps/intentsync:onos-apps-intentsync',
 ]
 
 BUNDLES = [
@@ -37,4 +38,5 @@
   url = 'http://onosproject.org',
   included_bundles = BUNDLES,
   description = 'Castor application',
-)
\ No newline at end of file
+  required_apps = [ 'org.onosproject.intentsynchronizer' ],
+)
diff --git a/apps/castor/src/main/java/org/onosproject/castor/Castor.java b/apps/castor/src/main/java/org/onosproject/castor/Castor.java
index b604b77..7b2f210 100644
--- a/apps/castor/src/main/java/org/onosproject/castor/Castor.java
+++ b/apps/castor/src/main/java/org/onosproject/castor/Castor.java
@@ -23,7 +23,7 @@
 import org.onosproject.app.ApplicationService;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.CoreService;
-import org.onosproject.routing.IntentSynchronizationService;
+import org.onosproject.intentsync.IntentSynchronizationService;
 import org.slf4j.Logger;
 
 import static org.slf4j.LoggerFactory.getLogger;
diff --git a/apps/castor/src/main/java/org/onosproject/castor/ConnectivityManager.java b/apps/castor/src/main/java/org/onosproject/castor/ConnectivityManager.java
index bd55d0d..57943fa 100644
--- a/apps/castor/src/main/java/org/onosproject/castor/ConnectivityManager.java
+++ b/apps/castor/src/main/java/org/onosproject/castor/ConnectivityManager.java
@@ -37,7 +37,7 @@
 import org.onosproject.net.intent.Key;
 import org.onosproject.net.intent.MultiPointToSinglePointIntent;
 import org.onosproject.net.intent.PointToPointIntent;
-import org.onosproject.routing.IntentSynchronizationService;
+import org.onosproject.intentsync.IntentSynchronizationService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;