From f9da5db0ff14879e47a6d83244ba63d45b4d432d Mon Sep 17 00:00:00 2001 From: Ashlee Young Date: Tue, 8 Dec 2015 11:32:02 -0800 Subject: onos-1.4.0-rc1 tag Change-Id: I7f6b85bbf2574b9e174ad919ff36acde28ca50a1 Signed-off-by: Ashlee Young --- framework/src/onos/apps/aaa/pom.xml | 2 +- framework/src/onos/apps/acl/pom.xml | 4 ++-- framework/src/onos/apps/bgprouter/pom.xml | 2 +- framework/src/onos/apps/cip/pom.xml | 2 +- framework/src/onos/apps/cordfabric/pom.xml | 2 +- framework/src/onos/apps/cordvtn/pom.xml | 2 +- framework/src/onos/apps/cpman/pom.xml | 4 ++-- framework/src/onos/apps/demo/cord-gui/pom.xml | 2 +- .../onos/apps/demo/cord-gui/src/scripts/pullwar.sh | 2 +- .../src/onos/apps/demo/cord-gui/src/scripts/run.me | 2 +- framework/src/onos/apps/dhcp/api/pom.xml | 2 +- framework/src/onos/apps/dhcp/app/pom.xml | 2 +- framework/src/onos/apps/dhcp/pom.xml | 2 +- .../src/onos/apps/faultmanagement/app/pom.xml | 2 +- .../src/onos/apps/faultmanagement/fmmgr/pom.xml | 2 +- .../src/onos/apps/faultmanagement/fmweb/pom.xml | 2 +- framework/src/onos/apps/faultmanagement/pom.xml | 2 +- framework/src/onos/apps/flowanalyzer/pom.xml | 2 +- framework/src/onos/apps/fwd/pom.xml | 2 +- framework/src/onos/apps/igmp/pom.xml | 2 +- framework/src/onos/apps/iptopology-api/pom.xml | 2 +- framework/src/onos/apps/metrics/pom.xml | 2 +- framework/src/onos/apps/mfwd/pom.xml | 2 +- framework/src/onos/apps/mlb/pom.xml | 2 +- framework/src/onos/apps/mobility/pom.xml | 2 +- framework/src/onos/apps/olt/pom.xml | 2 +- .../src/onos/apps/openstackswitching/api/pom.xml | 2 +- .../src/onos/apps/openstackswitching/app/pom.xml | 2 +- framework/src/onos/apps/openstackswitching/pom.xml | 2 +- framework/src/onos/apps/optical/pom.xml | 2 +- framework/src/onos/apps/pathpainter/pom.xml | 2 +- framework/src/onos/apps/pcep-api/pom.xml | 2 +- framework/src/onos/apps/pim/pom.xml | 2 +- framework/src/onos/apps/pom.xml | 2 +- framework/src/onos/apps/proxyarp/pom.xml | 2 +- framework/src/onos/apps/reactive-routing/pom.xml | 2 +- framework/src/onos/apps/routing-api/pom.xml | 2 +- framework/src/onos/apps/routing/pom.xml | 2 +- framework/src/onos/apps/sdnip/pom.xml | 2 +- framework/src/onos/apps/segmentrouting/pom.xml | 2 +- framework/src/onos/apps/test/demo/pom.xml | 2 +- .../onos/apps/test/distributed-primitives/pom.xml | 4 ++-- framework/src/onos/apps/test/election/pom.xml | 2 +- framework/src/onos/apps/test/intent-perf/pom.xml | 2 +- .../src/onos/apps/test/messaging-perf/pom.xml | 2 +- framework/src/onos/apps/test/pom.xml | 2 +- framework/src/onos/apps/virtualbng/pom.xml | 2 +- framework/src/onos/apps/vtn/app/pom.xml | 2 +- framework/src/onos/apps/vtn/pom.xml | 2 +- framework/src/onos/apps/vtn/sfcmgr/pom.xml | 2 +- framework/src/onos/apps/vtn/vtnmgr/pom.xml | 2 +- framework/src/onos/apps/vtn/vtnrsc/pom.xml | 2 +- .../flowclassifier/FlowClassifierService.java | 17 ++++++++++++++-- .../flowclassifier/impl/FlowClassifierManager.java | 23 +++++++++++++++++----- framework/src/onos/apps/vtn/vtnweb/pom.xml | 2 +- framework/src/onos/apps/xos-integration/pom.xml | 2 +- 56 files changed, 90 insertions(+), 64 deletions(-) (limited to 'framework/src/onos/apps') diff --git a/framework/src/onos/apps/aaa/pom.xml b/framework/src/onos/apps/aaa/pom.xml index b03930a9..78c18ed7 100644 --- a/framework/src/onos/apps/aaa/pom.xml +++ b/framework/src/onos/apps/aaa/pom.xml @@ -23,7 +23,7 @@ org.onosproject onos-apps - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/acl/pom.xml b/framework/src/onos/apps/acl/pom.xml index 454ac7e6..c029cef7 100644 --- a/framework/src/onos/apps/acl/pom.xml +++ b/framework/src/onos/apps/acl/pom.xml @@ -26,12 +26,12 @@ org.onosproject onos-apps - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml onos-app-acl - 1.4.0-SNAPSHOT + 1.4.0-rc1 bundle ONOS ACL application diff --git a/framework/src/onos/apps/bgprouter/pom.xml b/framework/src/onos/apps/bgprouter/pom.xml index 6503ee79..72fa806a 100644 --- a/framework/src/onos/apps/bgprouter/pom.xml +++ b/framework/src/onos/apps/bgprouter/pom.xml @@ -20,7 +20,7 @@ onos-apps org.onosproject - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml 4.0.0 diff --git a/framework/src/onos/apps/cip/pom.xml b/framework/src/onos/apps/cip/pom.xml index 77cfe150..1befe45a 100644 --- a/framework/src/onos/apps/cip/pom.xml +++ b/framework/src/onos/apps/cip/pom.xml @@ -22,7 +22,7 @@ org.onosproject onos-apps - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/cordfabric/pom.xml b/framework/src/onos/apps/cordfabric/pom.xml index a10db440..be28c210 100644 --- a/framework/src/onos/apps/cordfabric/pom.xml +++ b/framework/src/onos/apps/cordfabric/pom.xml @@ -20,7 +20,7 @@ onos-apps org.onosproject - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml 4.0.0 diff --git a/framework/src/onos/apps/cordvtn/pom.xml b/framework/src/onos/apps/cordvtn/pom.xml index 3f3ec23b..2d530be2 100644 --- a/framework/src/onos/apps/cordvtn/pom.xml +++ b/framework/src/onos/apps/cordvtn/pom.xml @@ -22,7 +22,7 @@ org.onosproject onos-apps - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/cpman/pom.xml b/framework/src/onos/apps/cpman/pom.xml index c01af6d8..e40cace6 100644 --- a/framework/src/onos/apps/cpman/pom.xml +++ b/framework/src/onos/apps/cpman/pom.xml @@ -20,7 +20,7 @@ org.onosproject onos-apps - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml @@ -33,7 +33,7 @@ org.onosproject onos-api - 1.4.0-SNAPSHOT + 1.4.0-rc1 diff --git a/framework/src/onos/apps/demo/cord-gui/pom.xml b/framework/src/onos/apps/demo/cord-gui/pom.xml index 16ed5d95..8ac0ad06 100644 --- a/framework/src/onos/apps/demo/cord-gui/pom.xml +++ b/framework/src/onos/apps/demo/cord-gui/pom.xml @@ -27,7 +27,7 @@ cord-gui - 1.4.0-SNAPSHOT + 1.4.0-rc1 war Demo CORD Subscriber Web GUI diff --git a/framework/src/onos/apps/demo/cord-gui/src/scripts/pullwar.sh b/framework/src/onos/apps/demo/cord-gui/src/scripts/pullwar.sh index d5a75289..3e764314 100644 --- a/framework/src/onos/apps/demo/cord-gui/src/scripts/pullwar.sh +++ b/framework/src/onos/apps/demo/cord-gui/src/scripts/pullwar.sh @@ -1 +1 @@ -cp $ONOS_ROOT/apps/demo/cord-gui/target/cord-gui-1.4.0-SNAPSHOT.war . +cp $ONOS_ROOT/apps/demo/cord-gui/target/cord-gui-1.4.0-rc1.war . diff --git a/framework/src/onos/apps/demo/cord-gui/src/scripts/run.me b/framework/src/onos/apps/demo/cord-gui/src/scripts/run.me index 496b18e4..ef18d13c 100644 --- a/framework/src/onos/apps/demo/cord-gui/src/scripts/run.me +++ b/framework/src/onos/apps/demo/cord-gui/src/scripts/run.me @@ -4,7 +4,7 @@ export LISTENPORT=8080 export JETTY="-jar jetty-runner.jar" -export CORD=./cord-gui-1.4.0-SNAPSHOT.war +export CORD=./cord-gui-1.4.0-rc1.war export LOGDBG=-Dorg.onosproject.cord.gui.LEVEL=DEBUG export DEBUG="-Xdebug -Xrunjdwp:transport=dt_socket,address=5005,server=y,suspend=n" export LOG=cord.log diff --git a/framework/src/onos/apps/dhcp/api/pom.xml b/framework/src/onos/apps/dhcp/api/pom.xml index fb5246f7..e9899071 100644 --- a/framework/src/onos/apps/dhcp/api/pom.xml +++ b/framework/src/onos/apps/dhcp/api/pom.xml @@ -22,7 +22,7 @@ onos-dhcp org.onosproject - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/dhcp/app/pom.xml b/framework/src/onos/apps/dhcp/app/pom.xml index 6589402a..d29dc0f2 100644 --- a/framework/src/onos/apps/dhcp/app/pom.xml +++ b/framework/src/onos/apps/dhcp/app/pom.xml @@ -21,7 +21,7 @@ onos-dhcp org.onosproject - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/dhcp/pom.xml b/framework/src/onos/apps/dhcp/pom.xml index 473caea6..45f7f302 100644 --- a/framework/src/onos/apps/dhcp/pom.xml +++ b/framework/src/onos/apps/dhcp/pom.xml @@ -22,7 +22,7 @@ org.onosproject onos-apps - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/faultmanagement/app/pom.xml b/framework/src/onos/apps/faultmanagement/app/pom.xml index ef41cdde..c446c0ae 100644 --- a/framework/src/onos/apps/faultmanagement/app/pom.xml +++ b/framework/src/onos/apps/faultmanagement/app/pom.xml @@ -21,7 +21,7 @@ org.onosproject onos-app-fm - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/faultmanagement/fmmgr/pom.xml b/framework/src/onos/apps/faultmanagement/fmmgr/pom.xml index 86b7cb67..a6bb3103 100644 --- a/framework/src/onos/apps/faultmanagement/fmmgr/pom.xml +++ b/framework/src/onos/apps/faultmanagement/fmmgr/pom.xml @@ -22,7 +22,7 @@ org.onosproject onos-app-fm - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/faultmanagement/fmweb/pom.xml b/framework/src/onos/apps/faultmanagement/fmweb/pom.xml index 8d759710..edaa9d3c 100644 --- a/framework/src/onos/apps/faultmanagement/fmweb/pom.xml +++ b/framework/src/onos/apps/faultmanagement/fmweb/pom.xml @@ -22,7 +22,7 @@ org.onosproject onos-app-fm - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/faultmanagement/pom.xml b/framework/src/onos/apps/faultmanagement/pom.xml index e7bb6a1b..3ea3bc81 100644 --- a/framework/src/onos/apps/faultmanagement/pom.xml +++ b/framework/src/onos/apps/faultmanagement/pom.xml @@ -22,7 +22,7 @@ org.onosproject onos-apps - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/flowanalyzer/pom.xml b/framework/src/onos/apps/flowanalyzer/pom.xml index b0920412..1981bff9 100644 --- a/framework/src/onos/apps/flowanalyzer/pom.xml +++ b/framework/src/onos/apps/flowanalyzer/pom.xml @@ -22,7 +22,7 @@ org.onosproject onos-apps - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/fwd/pom.xml b/framework/src/onos/apps/fwd/pom.xml index 977a75a4..78601300 100644 --- a/framework/src/onos/apps/fwd/pom.xml +++ b/framework/src/onos/apps/fwd/pom.xml @@ -22,7 +22,7 @@ org.onosproject onos-apps - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/igmp/pom.xml b/framework/src/onos/apps/igmp/pom.xml index 7980d2c0..aac02439 100644 --- a/framework/src/onos/apps/igmp/pom.xml +++ b/framework/src/onos/apps/igmp/pom.xml @@ -22,7 +22,7 @@ org.onosproject onos-apps - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/iptopology-api/pom.xml b/framework/src/onos/apps/iptopology-api/pom.xml index 50cb4adc..0250bb05 100644 --- a/framework/src/onos/apps/iptopology-api/pom.xml +++ b/framework/src/onos/apps/iptopology-api/pom.xml @@ -20,7 +20,7 @@ org.onosproject onos-apps - 1.4.0-SNAPSHOT + 1.4.0-rc1 onos-app-iptopology-api bundle diff --git a/framework/src/onos/apps/metrics/pom.xml b/framework/src/onos/apps/metrics/pom.xml index 8a39990a..e9e0fc45 100644 --- a/framework/src/onos/apps/metrics/pom.xml +++ b/framework/src/onos/apps/metrics/pom.xml @@ -22,7 +22,7 @@ org.onosproject onos-apps - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/mfwd/pom.xml b/framework/src/onos/apps/mfwd/pom.xml index 835de836..5256b85b 100644 --- a/framework/src/onos/apps/mfwd/pom.xml +++ b/framework/src/onos/apps/mfwd/pom.xml @@ -22,7 +22,7 @@ org.onosproject onos-apps - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/mlb/pom.xml b/framework/src/onos/apps/mlb/pom.xml index 21692374..a6548209 100644 --- a/framework/src/onos/apps/mlb/pom.xml +++ b/framework/src/onos/apps/mlb/pom.xml @@ -22,7 +22,7 @@ org.onosproject onos-apps - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/mobility/pom.xml b/framework/src/onos/apps/mobility/pom.xml index 59fd6668..d5a54c5c 100644 --- a/framework/src/onos/apps/mobility/pom.xml +++ b/framework/src/onos/apps/mobility/pom.xml @@ -22,7 +22,7 @@ org.onosproject onos-apps - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/olt/pom.xml b/framework/src/onos/apps/olt/pom.xml index f803a61a..855a80f8 100644 --- a/framework/src/onos/apps/olt/pom.xml +++ b/framework/src/onos/apps/olt/pom.xml @@ -22,7 +22,7 @@ org.onosproject onos-apps - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/openstackswitching/api/pom.xml b/framework/src/onos/apps/openstackswitching/api/pom.xml index f5e6f94f..7bb09465 100644 --- a/framework/src/onos/apps/openstackswitching/api/pom.xml +++ b/framework/src/onos/apps/openstackswitching/api/pom.xml @@ -22,7 +22,7 @@ org.onosproject onos-openstackswitching - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/openstackswitching/app/pom.xml b/framework/src/onos/apps/openstackswitching/app/pom.xml index 7d26f8f2..edd43e02 100644 --- a/framework/src/onos/apps/openstackswitching/app/pom.xml +++ b/framework/src/onos/apps/openstackswitching/app/pom.xml @@ -22,7 +22,7 @@ org.onosproject onos-openstackswitching - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/openstackswitching/pom.xml b/framework/src/onos/apps/openstackswitching/pom.xml index 9dbdcf5f..cfeaa5b3 100644 --- a/framework/src/onos/apps/openstackswitching/pom.xml +++ b/framework/src/onos/apps/openstackswitching/pom.xml @@ -22,7 +22,7 @@ org.onosproject onos-apps - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/optical/pom.xml b/framework/src/onos/apps/optical/pom.xml index 9ae6f85e..0ec42e68 100644 --- a/framework/src/onos/apps/optical/pom.xml +++ b/framework/src/onos/apps/optical/pom.xml @@ -22,7 +22,7 @@ org.onosproject onos-apps - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/pathpainter/pom.xml b/framework/src/onos/apps/pathpainter/pom.xml index c14294c8..b46f7d10 100644 --- a/framework/src/onos/apps/pathpainter/pom.xml +++ b/framework/src/onos/apps/pathpainter/pom.xml @@ -22,7 +22,7 @@ org.onosproject onos-apps - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/pcep-api/pom.xml b/framework/src/onos/apps/pcep-api/pom.xml index 5e871678..2e5be63b 100644 --- a/framework/src/onos/apps/pcep-api/pom.xml +++ b/framework/src/onos/apps/pcep-api/pom.xml @@ -20,7 +20,7 @@ org.onosproject onos-apps - 1.4.0-SNAPSHOT + 1.4.0-rc1 onos-app-pcep-api bundle diff --git a/framework/src/onos/apps/pim/pom.xml b/framework/src/onos/apps/pim/pom.xml index 83a366b6..6d3785e9 100644 --- a/framework/src/onos/apps/pim/pom.xml +++ b/framework/src/onos/apps/pim/pom.xml @@ -22,7 +22,7 @@ org.onosproject onos-apps - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/pom.xml b/framework/src/onos/apps/pom.xml index 1a279c53..3708e6b9 100644 --- a/framework/src/onos/apps/pom.xml +++ b/framework/src/onos/apps/pom.xml @@ -19,7 +19,7 @@ org.onosproject onos - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/proxyarp/pom.xml b/framework/src/onos/apps/proxyarp/pom.xml index 69f64ddb..28adaf8a 100644 --- a/framework/src/onos/apps/proxyarp/pom.xml +++ b/framework/src/onos/apps/proxyarp/pom.xml @@ -22,7 +22,7 @@ org.onosproject onos-apps - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/reactive-routing/pom.xml b/framework/src/onos/apps/reactive-routing/pom.xml index 58fb91ee..3272f599 100644 --- a/framework/src/onos/apps/reactive-routing/pom.xml +++ b/framework/src/onos/apps/reactive-routing/pom.xml @@ -22,7 +22,7 @@ org.onosproject onos-apps - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/routing-api/pom.xml b/framework/src/onos/apps/routing-api/pom.xml index 4c2d7d37..6a10092c 100644 --- a/framework/src/onos/apps/routing-api/pom.xml +++ b/framework/src/onos/apps/routing-api/pom.xml @@ -20,7 +20,7 @@ onos-apps org.onosproject - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml 4.0.0 diff --git a/framework/src/onos/apps/routing/pom.xml b/framework/src/onos/apps/routing/pom.xml index 2882f52e..c4562106 100644 --- a/framework/src/onos/apps/routing/pom.xml +++ b/framework/src/onos/apps/routing/pom.xml @@ -20,7 +20,7 @@ onos-apps org.onosproject - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml 4.0.0 diff --git a/framework/src/onos/apps/sdnip/pom.xml b/framework/src/onos/apps/sdnip/pom.xml index 99314aa8..8ff8cbcf 100644 --- a/framework/src/onos/apps/sdnip/pom.xml +++ b/framework/src/onos/apps/sdnip/pom.xml @@ -22,7 +22,7 @@ org.onosproject onos-apps - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/segmentrouting/pom.xml b/framework/src/onos/apps/segmentrouting/pom.xml index d170a7ab..76d90490 100644 --- a/framework/src/onos/apps/segmentrouting/pom.xml +++ b/framework/src/onos/apps/segmentrouting/pom.xml @@ -21,7 +21,7 @@ onos-apps org.onosproject - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/test/demo/pom.xml b/framework/src/onos/apps/test/demo/pom.xml index 4b08430d..d82139d0 100644 --- a/framework/src/onos/apps/test/demo/pom.xml +++ b/framework/src/onos/apps/test/demo/pom.xml @@ -22,7 +22,7 @@ org.onosproject onos-apps-test - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/test/distributed-primitives/pom.xml b/framework/src/onos/apps/test/distributed-primitives/pom.xml index f77fd57f..0c303d66 100644 --- a/framework/src/onos/apps/test/distributed-primitives/pom.xml +++ b/framework/src/onos/apps/test/distributed-primitives/pom.xml @@ -23,7 +23,7 @@ org.onosproject onos-apps-test - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml @@ -54,7 +54,7 @@ org.onosproject onos-core-dist - 1.4.0-SNAPSHOT + 1.4.0-rc1 org.osgi diff --git a/framework/src/onos/apps/test/election/pom.xml b/framework/src/onos/apps/test/election/pom.xml index 3ceadb4d..7ffb0b57 100644 --- a/framework/src/onos/apps/test/election/pom.xml +++ b/framework/src/onos/apps/test/election/pom.xml @@ -23,7 +23,7 @@ org.onosproject onos-apps-test - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/test/intent-perf/pom.xml b/framework/src/onos/apps/test/intent-perf/pom.xml index b837d114..e0596cc3 100644 --- a/framework/src/onos/apps/test/intent-perf/pom.xml +++ b/framework/src/onos/apps/test/intent-perf/pom.xml @@ -22,7 +22,7 @@ org.onosproject onos-apps-test - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/test/messaging-perf/pom.xml b/framework/src/onos/apps/test/messaging-perf/pom.xml index 28de5b7c..ea78791b 100644 --- a/framework/src/onos/apps/test/messaging-perf/pom.xml +++ b/framework/src/onos/apps/test/messaging-perf/pom.xml @@ -22,7 +22,7 @@ org.onosproject onos-apps-test - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/test/pom.xml b/framework/src/onos/apps/test/pom.xml index ead2252e..89167713 100644 --- a/framework/src/onos/apps/test/pom.xml +++ b/framework/src/onos/apps/test/pom.xml @@ -22,7 +22,7 @@ org.onosproject onos-apps - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/virtualbng/pom.xml b/framework/src/onos/apps/virtualbng/pom.xml index 01caa66c..f2d7ea8f 100644 --- a/framework/src/onos/apps/virtualbng/pom.xml +++ b/framework/src/onos/apps/virtualbng/pom.xml @@ -22,7 +22,7 @@ org.onosproject onos-apps - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/vtn/app/pom.xml b/framework/src/onos/apps/vtn/app/pom.xml index 5a877363..93d2d95c 100644 --- a/framework/src/onos/apps/vtn/app/pom.xml +++ b/framework/src/onos/apps/vtn/app/pom.xml @@ -14,7 +14,7 @@ org.onosproject onos-app-vtn - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/vtn/pom.xml b/framework/src/onos/apps/vtn/pom.xml index e4528517..8bbd2657 100644 --- a/framework/src/onos/apps/vtn/pom.xml +++ b/framework/src/onos/apps/vtn/pom.xml @@ -22,7 +22,7 @@ org.onosproject onos-apps - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/vtn/sfcmgr/pom.xml b/framework/src/onos/apps/vtn/sfcmgr/pom.xml index 8b5f1983..bac0cc36 100644 --- a/framework/src/onos/apps/vtn/sfcmgr/pom.xml +++ b/framework/src/onos/apps/vtn/sfcmgr/pom.xml @@ -21,7 +21,7 @@ org.onosproject onos-app-vtn - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/vtn/vtnmgr/pom.xml b/framework/src/onos/apps/vtn/vtnmgr/pom.xml index 03e66708..890b2168 100644 --- a/framework/src/onos/apps/vtn/vtnmgr/pom.xml +++ b/framework/src/onos/apps/vtn/vtnmgr/pom.xml @@ -22,7 +22,7 @@ org.onosproject onos-app-vtn - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/vtn/vtnrsc/pom.xml b/framework/src/onos/apps/vtn/vtnrsc/pom.xml index 816624cb..a2905909 100644 --- a/framework/src/onos/apps/vtn/vtnrsc/pom.xml +++ b/framework/src/onos/apps/vtn/vtnrsc/pom.xml @@ -21,7 +21,7 @@ org.onosproject onos-app-vtn - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/flowclassifier/FlowClassifierService.java b/framework/src/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/flowclassifier/FlowClassifierService.java index 48438846..e3cbf9ac 100644 --- a/framework/src/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/flowclassifier/FlowClassifierService.java +++ b/framework/src/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/flowclassifier/FlowClassifierService.java @@ -15,14 +15,13 @@ */ package org.onosproject.vtnrsc.flowclassifier; -import org.onosproject.event.ListenerService; import org.onosproject.vtnrsc.FlowClassifier; import org.onosproject.vtnrsc.FlowClassifierId; /** * Provides Services for Flow Classifier. */ -public interface FlowClassifierService extends ListenerService { +public interface FlowClassifierService { /** * Check whether Flow Classifier is present based on given Flow Classifier @@ -80,4 +79,18 @@ public interface FlowClassifierService extends ListenerService - implements FlowClassifierService { +public class FlowClassifierManager implements FlowClassifierService { private static final String FLOW_CLASSIFIER_NOT_NULL = "Flow Classifier cannot be null"; private static final String FLOW_CLASSIFIER_ID_NOT_NULL = "Flow Classifier Id cannot be null"; private static final String LISTENER_NOT_NULL = "Listener cannot be null"; private final Logger log = getLogger(FlowClassifierManager.class); - + private final Set listeners = Sets.newCopyOnWriteArraySet(); private EventuallyConsistentMap flowClassifierStore; @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @@ -75,6 +75,7 @@ public class FlowClassifierManager extends AbstractListenerManager org.onosproject onos-app-vtn - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml diff --git a/framework/src/onos/apps/xos-integration/pom.xml b/framework/src/onos/apps/xos-integration/pom.xml index 68eafd16..9f0cb918 100644 --- a/framework/src/onos/apps/xos-integration/pom.xml +++ b/framework/src/onos/apps/xos-integration/pom.xml @@ -22,7 +22,7 @@ org.onosproject onos-apps - 1.4.0-SNAPSHOT + 1.4.0-rc1 ../pom.xml -- cgit