홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Ray Milkey
Committed by Gerrit Code Review
e6099413 1 parent 5d5e0629

Temporarily remove several intent compilers that have unstatisifed dependencies 

Change-Id: I6b207f8a720fd70b998be6442c917638fe65a87d
Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
...@@ -17,7 +17,6 @@ package org.onosproject.net.intent.impl.compiler; ...@@ -17,7 +17,6 @@ package org.onosproject.net.intent.impl.compiler;
17 17
18 import org.apache.commons.lang3.tuple.Pair; 18 import org.apache.commons.lang3.tuple.Pair;
19 import org.apache.felix.scr.annotations.Activate; 19 import org.apache.felix.scr.annotations.Activate;
20 -import org.apache.felix.scr.annotations.Component;
21 import org.apache.felix.scr.annotations.Deactivate; 20 import org.apache.felix.scr.annotations.Deactivate;
22 import org.apache.felix.scr.annotations.Modified; 21 import org.apache.felix.scr.annotations.Modified;
23 import org.apache.felix.scr.annotations.Property; 22 import org.apache.felix.scr.annotations.Property;
...@@ -70,7 +69,8 @@ import static com.google.common.base.Preconditions.checkArgument; ...@@ -70,7 +69,8 @@ import static com.google.common.base.Preconditions.checkArgument;
70 /** 69 /**
71 * An intent compiler for {@link org.onosproject.net.intent.OpticalCircuitIntent}. 70 * An intent compiler for {@link org.onosproject.net.intent.OpticalCircuitIntent}.
72 */ 71 */
73 -@Component(immediate = true) 72 +// For now, remove component designation until dependency on the new resource manager is available.
73 +// @Component(immediate = true)
74 public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircuitIntent> { 74 public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircuitIntent> {
75 75
76 private static final Logger log = LoggerFactory.getLogger(OpticalCircuitIntentCompiler.class); 76 private static final Logger log = LoggerFactory.getLogger(OpticalCircuitIntentCompiler.class);
......
...@@ -17,7 +17,6 @@ package org.onosproject.net.intent.impl.compiler; ...@@ -17,7 +17,6 @@ package org.onosproject.net.intent.impl.compiler;
17 17
18 import com.google.common.collect.ImmutableList; 18 import com.google.common.collect.ImmutableList;
19 import org.apache.felix.scr.annotations.Activate; 19 import org.apache.felix.scr.annotations.Activate;
20 -import org.apache.felix.scr.annotations.Component;
21 import org.apache.felix.scr.annotations.Deactivate; 20 import org.apache.felix.scr.annotations.Deactivate;
22 import org.apache.felix.scr.annotations.Reference; 21 import org.apache.felix.scr.annotations.Reference;
23 import org.apache.felix.scr.annotations.ReferenceCardinality; 22 import org.apache.felix.scr.annotations.ReferenceCardinality;
...@@ -63,7 +62,8 @@ import static com.google.common.base.Preconditions.checkArgument; ...@@ -63,7 +62,8 @@ import static com.google.common.base.Preconditions.checkArgument;
63 /** 62 /**
64 * An intent compiler for {@link org.onosproject.net.intent.OpticalConnectivityIntent}. 63 * An intent compiler for {@link org.onosproject.net.intent.OpticalConnectivityIntent}.
65 */ 64 */
66 -@Component(immediate = true) 65 +// For now, remove component designation until dependency on the new resource manager is available.
66 +// @Component(immediate = true)
67 public class OpticalConnectivityIntentCompiler implements IntentCompiler<OpticalConnectivityIntent> { 67 public class OpticalConnectivityIntentCompiler implements IntentCompiler<OpticalConnectivityIntent> {
68 68
69 protected static final Logger log = LoggerFactory.getLogger(OpticalConnectivityIntentCompiler.class); 69 protected static final Logger log = LoggerFactory.getLogger(OpticalConnectivityIntentCompiler.class);
......