Integrate OpenFlowJava into OpenFlowPlugin build 29/59529/16
authorTomas Slusny <tomas.slusny@pantheon.tech>
Mon, 26 Jun 2017 14:34:09 +0000 (16:34 +0200)
committerTomas Slusny <tomas.slusny@pantheon.tech>
Mon, 10 Jul 2017 07:58:39 +0000 (09:58 +0200)
commit1f719a8b9a0d298c652898ee84492330d2b298c4
treec957574496c1255c6e00d9c97f4f3b656ddfc535
parent34a07eabaeccb03d834359b99694f79b89e37583
Integrate OpenFlowJava into OpenFlowPlugin build

- Integrate OpenFlowJava artifacts building into OpenFlowPlugin maven
build
- Merge openflowjava-artifacts with openflowplugin-artifacts
- Remove odl-openflowjava-all feature, because it was unused and
contained only odl-openflowjava-protocol
- Change org.opendaylight.openflowjava groupId to
org.opendaylight.openflowplugin.openflowjava
- Move sample-client to OpenFlowPlugin samples and fix missing license
headers in sample-client

Resolves: bug 8747

Change-Id: I5cff2e93bcbe00aa7543a03c990aa4d61b0878b8
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.tech>
65 files changed:
artifacts/pom.xml
extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml
extension/openflowjava-extension-nicira-api/pom.xml
extension/openflowjava-extension-nicira/pom.xml
extension/openflowplugin-extension-api/pom.xml
extension/openflowplugin-extension-nicira/pom.xml
extension/openflowplugin-extension-onf/pom.xml
extension/test-extension/pom.xml
features-aggregator/odl-openflowplugin-nsf-model/pom.xml
model/model-flow-base/pom.xml
openflowjava/artifacts/pom.xml [deleted file]
openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml [moved from openflowjava/features/features-openflowjava/pom.xml with 76% similarity]
openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml [moved from openflowjava/features/odl-openflowjava-protocol/pom.xml with 88% similarity]
openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/src/main/feature/feature.xml [moved from openflowjava/features/odl-openflowjava-protocol/src/main/feature/feature.xml with 61% similarity]
openflowjava/features-openflowjava-aggregator/pom.xml [moved from openflowjava/features/pom.xml with 82% similarity]
openflowjava/features/odl-openflowjava-all/pom.xml [deleted file]
openflowjava/openflow-protocol-api/pom.xml
openflowjava/openflow-protocol-impl/pom.xml
openflowjava/openflow-protocol-it/pom.xml
openflowjava/openflow-protocol-spi/pom.xml
openflowjava/openflowjava-blueprint-config/pom.xml
openflowjava/openflowjava-config/pom.xml
openflowjava/openflowjava-util/pom.xml
openflowjava/parent/pom.xml [deleted file]
openflowjava/pom.xml
openflowplugin-api/pom.xml
openflowplugin-impl/pom.xml
openflowplugin-it/pom.xml
openflowplugin/pom.xml
parent/pom.xml
pom.xml
samples/learning-switch/pom.xml
samples/pom.xml [new file with mode: 0644]
samples/sample-consumer/pom.xml
samples/simple-client/pom.xml [moved from openflowjava/simple-client/pom.xml with 71% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/CallableClient.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/CallableClient.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ClientEvent.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ClientEvent.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ClientSslContextFactory.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ClientSslContextFactory.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ClientSslKeyStore.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ClientSslKeyStore.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ClientSslTrustStore.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ClientSslTrustStore.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/EventType.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/EventType.java with 74% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ListeningSimpleClient.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ListeningSimpleClient.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/OFClient.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/OFClient.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/Scenario.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/Scenario.java with 85% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ScenarioFactory.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ScenarioFactory.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ScenarioHandler.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ScenarioHandler.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ScenarioService.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ScenarioService.java with 76% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ScenarioServiceImpl.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ScenarioServiceImpl.java with 91% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/Scenarios.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/Scenarios.java with 81% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SendEvent.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SendEvent.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SimpleClient.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SimpleClient.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SimpleClientFramer.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SimpleClientFramer.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SimpleClientHandler.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SimpleClientHandler.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SimpleClientInitializer.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SimpleClientInitializer.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SleepEvent.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SleepEvent.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/Step.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/Step.java with 89% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/UdpSimpleClient.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/UdpSimpleClient.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/UdpSimpleClientFramer.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/UdpSimpleClientFramer.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/UdpSimpleClientInitializer.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/UdpSimpleClientInitializer.java with 100% similarity]
samples/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/WaitForMessageEvent.java [moved from openflowjava/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/WaitForMessageEvent.java with 100% similarity]
samples/simple-client/src/main/resources/scenario.xml [moved from openflowjava/simple-client/src/main/resources/scenario.xml with 100% similarity]
samples/simple-client/src/main/resources/scenario.xsd [moved from openflowjava/simple-client/src/main/resources/scenario.xsd with 100% similarity]
samples/simple-client/src/main/resources/selfSignedController [moved from openflowjava/simple-client/src/main/resources/selfSignedController with 100% similarity]
samples/simple-client/src/main/resources/selfSignedSwitch [moved from openflowjava/simple-client/src/main/resources/selfSignedSwitch with 100% similarity]
test-common/pom.xml