Fixed package directory issues.

Change-Id: I1a8c8cdcaf862e0f12454bc8cf87486bdf5d5e82
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallAware.java
similarity index 98%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallAware.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallAware.java
index 30acd734c3246dbfc5843302b1424d9f411b7295..9e8ee541afba36a020c82ce46bd1e4258e50a13c 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallAware.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallAware.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods a service that wishes to be aware of Firewall Rules needs to implement

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallCRUD.java
similarity index 98%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallCRUD.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallCRUD.java
index 917108c062a4652b9fbc5cac70405540d3adb521..a3ce88c388c20f90473720877ebba736c9817b08 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallCRUD.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import java.util.List;
 

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallPolicyAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallPolicyAware.java
similarity index 98%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallPolicyAware.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallPolicyAware.java
index 0c39f5cad58de72d1fcbb2ae9fee9919c68d1d74..b3f893ab4a946c2d1412aefa1ab2b864b1384e1a 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallPolicyAware.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallPolicyAware.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods a service that wishes to be aware of Firewall Policys needs to implement

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallPolicyCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallPolicyCRUD.java
similarity index 98%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallPolicyCRUD.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallPolicyCRUD.java
index f105cb38b16793ec09be49fe85a3ffbc2a233c63..a097037d6e2d9d7a35e0beee06b9dfe896885a43 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallPolicyCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallPolicyCRUD.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import java.util.List;
 

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallRuleAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallRuleAware.java
similarity index 98%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallRuleAware.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallRuleAware.java
index b23c008e4f1423aac3a83efc3548c47aa303091b..770e513d501f5770012dea83bec413db3773b0de 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallRuleAware.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallRuleAware.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods a service that wishes to be aware of Firewall Rules needs to implement

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallRuleCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallRuleCRUD.java
similarity index 98%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallRuleCRUD.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallRuleCRUD.java
index 2e3516001f3d3ce075f8809aaeea69606b1ad23f..d4fea36a2093e20cd95edf6c9be22464ee419449 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallRuleCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallRuleCRUD.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import java.util.List;
 

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFloatingIPAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFloatingIPAware.java
similarity index 98%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFloatingIPAware.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFloatingIPAware.java
index 9e60e7c00332b7756b44acb08c4eaaacacaf3c04..fb1fd45a928035d500cd90dde5baa0e7af7a0bc9 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFloatingIPAware.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFloatingIPAware.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods a service that wishes to be aware of Neutron FloatingIPs needs to implement

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFloatingIPCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFloatingIPCRUD.java
similarity index 98%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFloatingIPCRUD.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFloatingIPCRUD.java
index e799e858c2666d23431a29825c98d9e8270742fb..96f1f700a7b2bc93c4e3d451da7766a4ed41495b 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFloatingIPCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFloatingIPCRUD.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import java.util.List;
 

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerAware.java
similarity index 98%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerAware.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerAware.java
index 7609fada7749eb541c02a65af794d21c7e0ecf29..a311e8f31460c6f5cddc4624517ac817bce39714 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerAware.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerAware.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods a service that wishes to be aware of LoadBalancer Rules needs to implement

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerCRUD.java
similarity index 98%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerCRUD.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerCRUD.java
index 1efeeae1b69bd2a3d6c40d818452a74ab7c259cb..c3c7c94a4197c38d3dcee73f2b5c511cfbec43fe 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerCRUD.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import java.util.List;
 

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerHealthMonitorAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerHealthMonitorAware.java
similarity index 98%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerHealthMonitorAware.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerHealthMonitorAware.java
index 8b6117e2b12ec4e7c9e67709f5a1ebedb5fdfe7b..3c68be3bec5467137f1dd008ac0d306389ee3c0f 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerHealthMonitorAware.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerHealthMonitorAware.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods a service that wishes to be aware of LoadBalancerHealthMonitor Rules needs to implement

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerHealthMonitorCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerHealthMonitorCRUD.java
similarity index 98%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerHealthMonitorCRUD.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerHealthMonitorCRUD.java
index d59a2637b74b1ec05454db32c2f4493b28597a7b..51f5e9e989f12e56f179f9a6d39529feaaaaadb5 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerHealthMonitorCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerHealthMonitorCRUD.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import java.util.List;
 

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerListenerAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerListenerAware.java
similarity index 98%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerListenerAware.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerListenerAware.java
index 439b33631aa0056034b403eaec3aef221b7347ac..84e58c3b6ba0da131f837d00f318e7c8e3604b94 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerListenerAware.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerListenerAware.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods a service that wishes to be aware of LoadBalancerListener Rules needs to implement

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerListenerCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerListenerCRUD.java
similarity index 98%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerListenerCRUD.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerListenerCRUD.java
index 4117e7d093acf658f1f446be6c5cae017513eeef..e117deb123a64a419dcfbd69a0625f8cfe132905 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerListenerCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerListenerCRUD.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import java.util.List;
 

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerPoolAware.java
similarity index 98%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolAware.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerPoolAware.java
index 2c1b28d5a114811a332d3f72378996f616f6d226..284cd223878f19f674b6d631988ed3c05376c8a7 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolAware.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerPoolAware.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods a service that wishes to be aware of LoadBalancerPool Rules needs to implement

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerPoolCRUD.java
similarity index 98%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolCRUD.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerPoolCRUD.java
index 7f188e63c02a7d4770f18c907c71b9b2aed0d108..b2585050b1e2c9c6aefc604c046b5ddeec3ac8a4 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerPoolCRUD.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import java.util.List;
 

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolMemberAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerPoolMemberAware.java
similarity index 98%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolMemberAware.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerPoolMemberAware.java
index bb01bf1e9875d7a41169c925bd54a6a411ad3605..634ce3f17c227c88aac903b343474e9d60a9022e 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolMemberAware.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerPoolMemberAware.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 public interface INeutronLoadBalancerPoolMemberAware {
 

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolMemberCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerPoolMemberCRUD.java
similarity index 98%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolMemberCRUD.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerPoolMemberCRUD.java
index 29f8c9ccd6d5ae147ec11ebd368dc9801a7fbad3..b228ecbcdd03853cc0dfbd3f67f676659de9236c 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolMemberCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerPoolMemberCRUD.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import java.util.List;
 

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolMemberRequest.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerPoolMemberRequest.java
similarity index 96%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolMemberRequest.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerPoolMemberRequest.java
index 3d614c93ea10949a053aea6852bd5a9e26bca480..d3933df99690823605ad8bc714f8af2911a44295 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolMemberRequest.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerPoolMemberRequest.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import javax.xml.bind.annotation.XmlElement;
 import java.util.List;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronNetworkAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronNetworkAware.java
similarity index 98%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronNetworkAware.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronNetworkAware.java
index 45c9eaa30e1ed7f7fe2ddc5ce2a3cb22b6e2912f..ac41d8a638e64700359c4650c5c10cee2c99208e 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronNetworkAware.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronNetworkAware.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods a service that wishes to be aware of Neutron Networks needs to implement

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronNetworkCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronNetworkCRUD.java
similarity index 98%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronNetworkCRUD.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronNetworkCRUD.java
index cda35c48480f7e8cac5cc8e60c62c252f94a8fd1..85184662f91116a46fa1e4c421858624480cf94a 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronNetworkCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronNetworkCRUD.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import java.util.List;
 

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronObject.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronObject.java
similarity index 91%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronObject.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronObject.java
index 63280f37b487bc6602df37ebe558979b675319ce..a6d4bfdb149a42d79326a0d8933254c706467639 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronObject.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronObject.java
@@ -8,7 +8,7 @@
  *  Authors : Dave Tucker
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 /**
  * This class contains behaviour common to Neutron configuration objects

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronPortAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronPortAware.java
similarity index 98%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronPortAware.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronPortAware.java
index 2cf2f65ba959595ddf76e2881e6bc7d6d87a3e54..f06618c1aabc402a33d11c62f5ec6ff9b92a67af 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronPortAware.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronPortAware.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods a service that wishes to be aware of Neutron Ports needs to implement

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronPortCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronPortCRUD.java
similarity index 98%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronPortCRUD.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronPortCRUD.java
index 67c8822bb4c3bce9ba96afec92507ca71e0d4a1f..4832afc634a78c17a05dbe9204696c4500017a9d 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronPortCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronPortCRUD.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import java.util.List;
 

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronRouterAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronRouterAware.java
similarity index 99%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronRouterAware.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronRouterAware.java
index 4d08edb369d4dec25c898cf5a045470973454916..865ee5311f74954305ffcd7901fb8daf3ddabc2c 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronRouterAware.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronRouterAware.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods a service that wishes to be aware of Neutron Routers needs to implement

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronRouterCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronRouterCRUD.java
similarity index 98%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronRouterCRUD.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronRouterCRUD.java
index 0a48fc6bff6a6d789dcf594aebd516711a268475..c0990caa46c42eb9864c7a072b1c1ba8da2febfd 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronRouterCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronRouterCRUD.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import java.util.List;
 

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityGroupAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSecurityGroupAware.java
similarity index 98%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityGroupAware.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSecurityGroupAware.java
index 3e3f2599377b7177969ea7cfed1d14eaa0a19fb4..941bac79711683541f8ed91e5daa85ebc535e7ba 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityGroupAware.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSecurityGroupAware.java
@@ -7,7 +7,7 @@
  *
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods a service that wishes to be aware of Neutron Security Groups needs to implement

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityGroupCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSecurityGroupCRUD.java
similarity index 98%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityGroupCRUD.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSecurityGroupCRUD.java
index 73f9edc517f5757bfdd979ef16f2275c0cd52cc2..30ecf55fb4a48602d483518f8c9ac09aefa7c03f 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityGroupCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSecurityGroupCRUD.java
@@ -7,7 +7,7 @@
  *
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import java.util.List;
 

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityRuleAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSecurityRuleAware.java
similarity index 98%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityRuleAware.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSecurityRuleAware.java
index 43e1c427fbff07f231259016c4f0343f417e04bb..87e9f1c8f3aefcac82beea74ce13873ae509cb5e 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityRuleAware.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSecurityRuleAware.java
@@ -7,7 +7,7 @@
  *
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods required to be aware of Neutron Security Rules

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityRuleCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSecurityRuleCRUD.java
similarity index 98%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityRuleCRUD.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSecurityRuleCRUD.java
index 118e125313455dd1a84b85e3650008d83bbd439c..0877cccbe1676714a9ec593cd4ed21f9c6ad47d4 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityRuleCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSecurityRuleCRUD.java
@@ -7,7 +7,7 @@
  *
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import java.util.List;
 

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSubnetAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSubnetAware.java
similarity index 98%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSubnetAware.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSubnetAware.java
index a390553640bfbd34422a0013f88a5eeede5ea828..4b8a8551369ceba1a2ccd99bc8dcd5b32aee6a28 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSubnetAware.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSubnetAware.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods a service that wishes to be aware of Neutron Subnets needs to implement

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSubnetCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSubnetCRUD.java
similarity index 98%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSubnetCRUD.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSubnetCRUD.java
index 5e27d1fd3977cb8c3c0c0401a314caffa2e77e07..e58070eae6580ff5c636114bf15853fb763e45a8 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSubnetCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSubnetCRUD.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import java.util.List;
 

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronCRUDInterfaces.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronCRUDInterfaces.java
similarity index 99%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronCRUDInterfaces.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronCRUDInterfaces.java
index c0ce79e17e8d45541245885134d737b13037677d..d62a5ca3d4aec00382cef5024fe0d1e55bfedd37 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronCRUDInterfaces.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronCRUDInterfaces.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFirewall.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewall.java
similarity index 99%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFirewall.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewall.java
index 4deb8f98ca75cd9959e662ffd600a15f04f09715..6e3b62b18393a585442252e3e03170c7c40a4eff 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFirewall.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewall.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFirewallPolicy.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallPolicy.java
similarity index 99%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFirewallPolicy.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallPolicy.java
index e1ca07539ae24fdffc699114ce67bd53139f9283..91d2e375bb656d57a9bd66e01feabc66b7dfcdd3 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFirewallPolicy.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallPolicy.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFirewallRule.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallRule.java
similarity index 99%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFirewallRule.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallRule.java
index 00155d9de4589888c19d0412f62b142b5d5a8952..bf8c28d940e84704a461bff38a3ae792f4b2c9e0 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFirewallRule.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallRule.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFloatingIP.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFloatingIP.java
similarity index 98%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFloatingIP.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFloatingIP.java
index 4113578e4786e567280cd14fe608736fbf2f1951..515655003e3dd66368bfa6950e3b4373b01d5de4 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFloatingIP.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFloatingIP.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import java.io.Serializable;
 import java.util.Iterator;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancer.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancer.java
similarity index 99%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancer.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancer.java
index 9ea27f76070463cdeae713e88618af6c3a19433b..350134122782af96ee521e9989a0effca8eacd43 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancer.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancer.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerHealthMonitor.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitor.java
similarity index 99%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerHealthMonitor.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitor.java
index 775f319c63636bf7fd9597e51b0c9d330a9381a6..774bc0cd7773bd2ce875ce2747b9394fb2a1ab5f 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerHealthMonitor.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitor.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerListener.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListener.java
similarity index 99%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerListener.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListener.java
index 48c23bf3adca988b680fb5520667ed1422721303..b8894173243a0b49d68c58593938ca01f0a982af 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerListener.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListener.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerPool.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPool.java
similarity index 99%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerPool.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPool.java
index f02875151c17370ee85eb32e66c3caeda1e852c6..a86aa7f17a707fe8147633f2039ede41086b323a 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerPool.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPool.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerPoolMember.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolMember.java
similarity index 99%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerPoolMember.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolMember.java
index 28183d6544abbd28ac443734223045ec23adae10..92f32fb3e7459a6475031c6257e29c564b6bf594 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerPoolMember.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolMember.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronNetwork.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetwork.java
similarity index 99%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronNetwork.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetwork.java
index 8acd31c0f9a6cf13e13fc5dc337d02095421ab9e..7fbe49367a074783ba3d76bc9af509a911156e5c 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronNetwork.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetwork.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import java.io.Serializable;
 import java.util.ArrayList;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronPort.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort.java
similarity index 99%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronPort.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort.java
index 98e5d7f616af183ee398aebb92f375e30d8a461a..d6803bee8dd6d717da045ad131bf4abe3861cc2c 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronPort.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 
 import java.io.Serializable;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronRouter.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter.java
similarity index 99%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronRouter.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter.java
index 8051df99d945faff164539a0b489ebb9080112c6..94bc33eddbb03519b0ab460707bb40af7003fb5e 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronRouter.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import java.io.Serializable;
 import java.util.HashMap;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronRouter_Interface.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter_Interface.java
similarity index 97%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronRouter_Interface.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter_Interface.java
index 30f29319fd716853423ae874f10cb4c460a294c4..9767104a645224dafb525d53c6726c76f69cc0a7 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronRouter_Interface.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter_Interface.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import java.io.Serializable;
 

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronRouter_NetworkReference.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter_NetworkReference.java
similarity index 95%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronRouter_NetworkReference.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter_NetworkReference.java
index 52b23a8810beccf2e6dc20faecc9e4257aece334..ee657f8a22bb7a40f06cda80928eec9afd00f723 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronRouter_NetworkReference.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter_NetworkReference.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import java.io.Serializable;
 

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSecurityGroup.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityGroup.java
similarity index 98%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSecurityGroup.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityGroup.java
index a47529ac057fca5e9b87697b8399b82e3945a002..84d622c8725754300fdb5452e5f59826d6803d16 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSecurityGroup.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityGroup.java
@@ -7,7 +7,7 @@
  *
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSecurityRule.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityRule.java
similarity index 99%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSecurityRule.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityRule.java
index 264dbd663cc8f0db446d115f91b46a1dcb385faa..f975bf7b2dd901e20db81bc23b80e39ab843e55f 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSecurityRule.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityRule.java
@@ -7,7 +7,7 @@
  *
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSubnet.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSubnet.java
similarity index 99%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSubnet.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSubnet.java
index 3b5766327e8c7b07dd12b22dd17970f321a28726..4a12e9aa81b9007c189c7467de5bed200822f5f7 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSubnet.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSubnet.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import java.io.Serializable;
 import java.net.InetAddress;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSubnet_HostRoute.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSubnet_HostRoute.java
similarity index 95%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSubnet_HostRoute.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSubnet_HostRoute.java
index 7b23cdd8836aecb73302b44a5daefd540f3ecc45..d2bdcb79f3344a8970d3dba7dac84c6f371c14a3 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSubnet_HostRoute.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSubnet_HostRoute.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import java.io.Serializable;
 

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSubnet_IPAllocationPool.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSubnet_IPAllocationPool.java
similarity index 99%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSubnet_IPAllocationPool.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSubnet_IPAllocationPool.java
index a0511dc6d238bc448ffb81ad8f8876d77aa1dadf..2227cc6d0b1882df204b6950d4357b5518f802c5 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSubnet_IPAllocationPool.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSubnet_IPAllocationPool.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import java.io.Serializable;
 import java.util.ArrayList;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/Neutron_IPs.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/Neutron_IPs.java
similarity index 97%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/Neutron_IPs.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/Neutron_IPs.java
index ba9fb8d397fec9763bb64b82e97e7da966c4795a..759e3a303b4fce328ace6058f48771bba471190c 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/Neutron_IPs.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/Neutron_IPs.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.neutron.neutron.spi;
+package org.opendaylight.neutron.spi;
 
 import java.io.Serializable;
 

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/BadRequestException.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/BadRequestException.java
similarity index 100%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/BadRequestException.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/BadRequestException.java

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/INeutronRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/INeutronRequest.java
similarity index 89%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/INeutronRequest.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/INeutronRequest.java
index 386351633cdf9be9a255b5ca19da1773ec774a97..dfae6ca3e462343510ed9a5862f359b7fef00cc0 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/INeutronRequest.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/INeutronRequest.java
@@ -10,7 +10,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
-import org.opendaylight.neutron.neutron.spi.INeutronObject;
+import org.opendaylight.neutron.spi.INeutronObject;
 
 import java.util.List;
 

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/InternalServerErrorException.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/InternalServerErrorException.java
similarity index 100%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/InternalServerErrorException.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/InternalServerErrorException.java

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallNorthbound.java
similarity index 98%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallNorthbound.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallNorthbound.java
index b8ca83c645324dc8ba5b0993024169372d8e3901..9a4fdc9379e6709eb11b8ddbaa1af7fe84b4807b 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallNorthbound.java
@@ -11,11 +11,11 @@ package org.opendaylight.neutron.northbound.api;
 
 import org.codehaus.enunciate.jaxrs.ResponseCode;
 import org.codehaus.enunciate.jaxrs.StatusCodes;
-import org.opendaylight.neutron.neutron.spi.INeutronFirewallAware;
-import org.opendaylight.neutron.neutron.spi.INeutronFirewallCRUD;
-import org.opendaylight.neutron.neutron.spi.INeutronFirewallRuleCRUD;
-import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
-import org.opendaylight.neutron.neutron.spi.NeutronFirewall;
+import org.opendaylight.neutron.spi.INeutronFirewallAware;
+import org.opendaylight.neutron.spi.INeutronFirewallCRUD;
+import org.opendaylight.neutron.spi.INeutronFirewallRuleCRUD;
+import org.opendaylight.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.spi.NeutronFirewall;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallPolicyNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallPolicyNorthbound.java
similarity index 98%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallPolicyNorthbound.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallPolicyNorthbound.java
index 7d16b349bbfb5fa28f2eb0e44fba40c3a30fc4f1..9a47ae3a66d670b91cd620350f3a4ea3c0c7a274 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallPolicyNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallPolicyNorthbound.java
@@ -28,10 +28,10 @@ import javax.ws.rs.core.Response;
 
 import org.codehaus.enunciate.jaxrs.ResponseCode;
 import org.codehaus.enunciate.jaxrs.StatusCodes;
-import org.opendaylight.neutron.neutron.spi.INeutronFirewallPolicyAware;
-import org.opendaylight.neutron.neutron.spi.INeutronFirewallPolicyCRUD;
-import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
-import org.opendaylight.neutron.neutron.spi.NeutronFirewallPolicy;
+import org.opendaylight.neutron.spi.INeutronFirewallPolicyAware;
+import org.opendaylight.neutron.spi.INeutronFirewallPolicyCRUD;
+import org.opendaylight.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.spi.NeutronFirewallPolicy;
 
 /**
  * Neutron Northbound REST APIs for Firewall Policies.<br>

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallPolicyRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallPolicyRequest.java
similarity index 95%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallPolicyRequest.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallPolicyRequest.java
index 21c89b051af44df7f5d2818f3d0e292b7f20c035..bc2b7d91b6104edcaaa0eea1416d5aa30f1ad795 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallPolicyRequest.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallPolicyRequest.java
@@ -8,7 +8,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
-import org.opendaylight.neutron.neutron.spi.NeutronFirewallPolicy;
+import org.opendaylight.neutron.spi.NeutronFirewallPolicy;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRequest.java
similarity index 95%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallRequest.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRequest.java
index 4e8f56743a595b8deef50900b7a3e02805d61451..d0429ba1659f623abf91fdd5724a74cae12397be 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallRequest.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRequest.java
@@ -8,7 +8,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
-import org.opendaylight.neutron.neutron.spi.NeutronFirewall;
+import org.opendaylight.neutron.spi.NeutronFirewall;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallRuleRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRuleRequest.java
similarity index 95%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallRuleRequest.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRuleRequest.java
index ff6b3240d807f7966a7264f87c605d7feca7908c..26e0b297d88a65d7f8d7163e3787cc6e0a748823 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallRuleRequest.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRuleRequest.java
@@ -8,7 +8,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
-import org.opendaylight.neutron.neutron.spi.NeutronFirewallRule;
+import org.opendaylight.neutron.spi.NeutronFirewallRule;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallRulesNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRulesNorthbound.java
similarity index 98%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallRulesNorthbound.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRulesNorthbound.java
index 3ea9f61e38e4b1a65a1f68a3fee66d4fe42c5469..a6dcbcebcab97267615dc1bf44979af397e3d5e3 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallRulesNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRulesNorthbound.java
@@ -28,11 +28,11 @@ import javax.ws.rs.core.Response;
 
 import org.codehaus.enunciate.jaxrs.ResponseCode;
 import org.codehaus.enunciate.jaxrs.StatusCodes;
-import org.opendaylight.neutron.neutron.spi.INeutronFirewallPolicyCRUD;
-import org.opendaylight.neutron.neutron.spi.INeutronFirewallRuleAware;
-import org.opendaylight.neutron.neutron.spi.INeutronFirewallRuleCRUD;
-import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
-import org.opendaylight.neutron.neutron.spi.NeutronFirewallRule;
+import org.opendaylight.neutron.spi.INeutronFirewallPolicyCRUD;
+import org.opendaylight.neutron.spi.INeutronFirewallRuleAware;
+import org.opendaylight.neutron.spi.INeutronFirewallRuleCRUD;
+import org.opendaylight.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.spi.NeutronFirewallRule;
 
 /**
  * Neutron Northbound REST APIs for Firewall Rule.<br>

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFloatingIPRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFloatingIPRequest.java
similarity index 95%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFloatingIPRequest.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFloatingIPRequest.java
index 31463b7b3c3b3a8781f640e8796d858de27cb6e6..be420c7f329d516eb3a0e49e732d7d67ecc519ee 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFloatingIPRequest.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFloatingIPRequest.java
@@ -15,7 +15,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.opendaylight.neutron.neutron.spi.NeutronFloatingIP;
+import org.opendaylight.neutron.spi.NeutronFloatingIP;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFloatingIPsNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFloatingIPsNorthbound.java
similarity index 96%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFloatingIPsNorthbound.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFloatingIPsNorthbound.java
index a9749dd6b8fc7be56275650de5c70f5de1654956..59ccfd268f3a4db6feaf802c55c93dee3dc9a2c1 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFloatingIPsNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFloatingIPsNorthbound.java
@@ -26,17 +26,17 @@ import javax.ws.rs.core.Response;
 
 import org.codehaus.enunciate.jaxrs.ResponseCode;
 import org.codehaus.enunciate.jaxrs.StatusCodes;
-import org.opendaylight.neutron.neutron.spi.INeutronFloatingIPAware;
-import org.opendaylight.neutron.neutron.spi.INeutronFloatingIPCRUD;
-import org.opendaylight.neutron.neutron.spi.INeutronNetworkCRUD;
-import org.opendaylight.neutron.neutron.spi.INeutronPortCRUD;
-import org.opendaylight.neutron.neutron.spi.INeutronSubnetCRUD;
-import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
-import org.opendaylight.neutron.neutron.spi.NeutronFloatingIP;
-import org.opendaylight.neutron.neutron.spi.NeutronNetwork;
-import org.opendaylight.neutron.neutron.spi.NeutronPort;
-import org.opendaylight.neutron.neutron.spi.NeutronSubnet;
-import org.opendaylight.neutron.neutron.spi.Neutron_IPs;
+import org.opendaylight.neutron.spi.INeutronFloatingIPAware;
+import org.opendaylight.neutron.spi.INeutronFloatingIPCRUD;
+import org.opendaylight.neutron.spi.INeutronNetworkCRUD;
+import org.opendaylight.neutron.spi.INeutronPortCRUD;
+import org.opendaylight.neutron.spi.INeutronSubnetCRUD;
+import org.opendaylight.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.spi.NeutronFloatingIP;
+import org.opendaylight.neutron.spi.NeutronNetwork;
+import org.opendaylight.neutron.spi.NeutronPort;
+import org.opendaylight.neutron.spi.NeutronSubnet;
+import org.opendaylight.neutron.spi.Neutron_IPs;
 
 /**
  * Neutron Northbound REST APIs.<br>

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerHealthMonitorNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerHealthMonitorNorthbound.java
similarity index 98%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerHealthMonitorNorthbound.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerHealthMonitorNorthbound.java
index 55594500c5645aa0f69d68eaf8296984c6edce0c..86305971731afddbdb3fe1ff91cae058e30d84f3 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerHealthMonitorNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerHealthMonitorNorthbound.java
@@ -28,11 +28,11 @@ import javax.ws.rs.core.Response;
 
 import org.codehaus.enunciate.jaxrs.ResponseCode;
 import org.codehaus.enunciate.jaxrs.StatusCodes;
-import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerHealthMonitorAware;
-import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerHealthMonitorCRUD;
-import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
-import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancer;
-import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerHealthMonitor;
+import org.opendaylight.neutron.spi.INeutronLoadBalancerHealthMonitorAware;
+import org.opendaylight.neutron.spi.INeutronLoadBalancerHealthMonitorCRUD;
+import org.opendaylight.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.spi.NeutronLoadBalancer;
+import org.opendaylight.neutron.spi.NeutronLoadBalancerHealthMonitor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerHealthMonitorRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerHealthMonitorRequest.java
similarity index 95%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerHealthMonitorRequest.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerHealthMonitorRequest.java
index 903648c5f6fedc4a75f06ee0035888e6815b55e0..de2da47cda809d6322dae367c7f5e4ec42780bfc 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerHealthMonitorRequest.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerHealthMonitorRequest.java
@@ -8,7 +8,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
-import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerHealthMonitor;
+import org.opendaylight.neutron.spi.NeutronLoadBalancerHealthMonitor;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerListenerNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerNorthbound.java
similarity index 98%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerListenerNorthbound.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerNorthbound.java
index 6949bf547687939abf0c768e6b29623441418bdc..df627185dffa1bd899fd460e78cb1112f2ad783f 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerListenerNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerNorthbound.java
@@ -28,10 +28,10 @@ import javax.ws.rs.core.Response;
 
 import org.codehaus.enunciate.jaxrs.ResponseCode;
 import org.codehaus.enunciate.jaxrs.StatusCodes;
-import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerListenerAware;
-import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerListenerCRUD;
-import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
-import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerListener;
+import org.opendaylight.neutron.spi.INeutronLoadBalancerListenerAware;
+import org.opendaylight.neutron.spi.INeutronLoadBalancerListenerCRUD;
+import org.opendaylight.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.spi.NeutronLoadBalancerListener;
 
 /**
  * Neutron Northbound REST APIs for LoadBalancerListener Policies.<br>

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerListenerRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerRequest.java
similarity index 95%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerListenerRequest.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerRequest.java
index 8812eb099e6f00ff9c19cdc7bb782e09b69c69a7..9a6cabe94516112203f8dd0add85ccf1ff96911b 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerListenerRequest.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerRequest.java
@@ -8,7 +8,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
-import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerListener;
+import org.opendaylight.neutron.spi.NeutronLoadBalancerListener;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerNorthbound.java
similarity index 98%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerNorthbound.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerNorthbound.java
index f4a1100faab21f072741e2fc6cee1c071866cc85..82d6800da36d69b46c6802915ad0483aedafc291 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerNorthbound.java
@@ -28,10 +28,10 @@ import javax.ws.rs.core.Response;
 
 import org.codehaus.enunciate.jaxrs.ResponseCode;
 import org.codehaus.enunciate.jaxrs.StatusCodes;
-import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerAware;
-import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerCRUD;
-import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
-import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancer;
+import org.opendaylight.neutron.spi.INeutronLoadBalancerAware;
+import org.opendaylight.neutron.spi.INeutronLoadBalancerCRUD;
+import org.opendaylight.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.spi.NeutronLoadBalancer;
 
 /**
  * Neutron Northbound REST APIs for LoadBalancers.<br>

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolMemberRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolMemberRequest.java
similarity index 95%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolMemberRequest.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolMemberRequest.java
index ac54995809d7af5ccd64fcbacf39eeccc8518a67..0bd22d7f896809c70bfa3f79f5c071629a6c48bb 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolMemberRequest.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolMemberRequest.java
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.neutron.northbound.api;
 
-import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerPoolMember;
+import org.opendaylight.neutron.spi.NeutronLoadBalancerPoolMember;
 
 import javax.xml.bind.annotation.XmlElement;
 import java.util.List;

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolMembersNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolMembersNorthbound.java
similarity index 97%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolMembersNorthbound.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolMembersNorthbound.java
index 2a4113d2acf0e9a5222945be75b3b1284049aae5..d6f97bb84af8d7ccdb6bee192e87a346e5e62703 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolMembersNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolMembersNorthbound.java
@@ -28,11 +28,11 @@ import javax.ws.rs.core.Response;
 
 import org.codehaus.enunciate.jaxrs.ResponseCode;
 import org.codehaus.enunciate.jaxrs.StatusCodes;
-import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerPoolCRUD;
-import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerPoolMemberAware;
-import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
-import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerPool;
-import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerPoolMember;
+import org.opendaylight.neutron.spi.INeutronLoadBalancerPoolCRUD;
+import org.opendaylight.neutron.spi.INeutronLoadBalancerPoolMemberAware;
+import org.opendaylight.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.spi.NeutronLoadBalancerPool;
+import org.opendaylight.neutron.spi.NeutronLoadBalancerPoolMember;
 
 @Path("/pools/{loadBalancerPoolUUID}/members")
 public class NeutronLoadBalancerPoolMembersNorthbound {

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolNorthbound.java
similarity index 98%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolNorthbound.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolNorthbound.java
index 2e38e1893223a1df275ec623c2a1a33133bff148..ac3dc44e375fb89948429b6e14a9e1203de12392 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolNorthbound.java
@@ -30,11 +30,11 @@ import javax.ws.rs.core.Response;
 
 import org.codehaus.enunciate.jaxrs.ResponseCode;
 import org.codehaus.enunciate.jaxrs.StatusCodes;
-import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerPoolAware;
-import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerPoolCRUD;
-import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
-import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerPool;
-import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerPoolMember;
+import org.opendaylight.neutron.spi.INeutronLoadBalancerPoolAware;
+import org.opendaylight.neutron.spi.INeutronLoadBalancerPoolCRUD;
+import org.opendaylight.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.spi.NeutronLoadBalancerPool;
+import org.opendaylight.neutron.spi.NeutronLoadBalancerPoolMember;
 
 /**
  * Neutron Northbound REST APIs for LoadBalancerPool Policies.<br>

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolRequest.java
similarity index 95%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolRequest.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolRequest.java
index 505529e0455e01403a42d5450b776bedefc41be9..825e057284f5e9aa5d85d6f523334dc454a15bcd 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolRequest.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolRequest.java
@@ -8,7 +8,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
-import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerPool;
+import org.opendaylight.neutron.spi.NeutronLoadBalancerPool;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerRequest.java
similarity index 95%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerRequest.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerRequest.java
index 337fe501b93486194d579969c0684022b4ce2508..9f69380c05c52b87f9b2097f8b69a793303262b8 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerRequest.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerRequest.java
@@ -8,7 +8,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
-import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancer;
+import org.opendaylight.neutron.spi.NeutronLoadBalancer;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronNetworkRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNetworkRequest.java
similarity index 96%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronNetworkRequest.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNetworkRequest.java
index c5e8cf3f95275b3ce07f0b81b77ce5a2b93fa267..8a2628fdedf11a2334f3673f0bdd5556307c615c 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronNetworkRequest.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNetworkRequest.java
@@ -13,7 +13,7 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-import org.opendaylight.neutron.neutron.spi.NeutronNetwork;
+import org.opendaylight.neutron.spi.NeutronNetwork;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronNetworksNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNetworksNorthbound.java
similarity index 98%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronNetworksNorthbound.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNetworksNorthbound.java
index b1497772bc69d6ae2d122647bfd72e2e9435b19e..5aa5ed377d412aa1b47e28201a6eb830d7f71243 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronNetworksNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNetworksNorthbound.java
@@ -31,10 +31,10 @@ import javax.ws.rs.core.UriInfo;
 import org.codehaus.enunciate.jaxrs.ResponseCode;
 import org.codehaus.enunciate.jaxrs.StatusCodes;
 import org.codehaus.enunciate.jaxrs.TypeHint;
-import org.opendaylight.neutron.neutron.spi.INeutronNetworkAware;
-import org.opendaylight.neutron.neutron.spi.INeutronNetworkCRUD;
-import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
-import org.opendaylight.neutron.neutron.spi.NeutronNetwork;
+import org.opendaylight.neutron.spi.INeutronNetworkAware;
+import org.opendaylight.neutron.spi.INeutronNetworkCRUD;
+import org.opendaylight.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.spi.NeutronNetwork;
 
 /**
  * Neutron Northbound REST APIs for Network.<br>

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronNorthboundRSApplication.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNorthboundRSApplication.java
similarity index 100%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronNorthboundRSApplication.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNorthboundRSApplication.java

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronPageLink.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronPageLink.java
similarity index 100%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronPageLink.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronPageLink.java

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronPortRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronPortRequest.java
similarity index 96%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronPortRequest.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronPortRequest.java
index 1b1833fcb0f6d0e07010a2f2eb48fb385306474b..31d95355fd86d738a6d6270b00422049a043498b 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronPortRequest.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronPortRequest.java
@@ -13,7 +13,7 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-import org.opendaylight.neutron.neutron.spi.NeutronPort;
+import org.opendaylight.neutron.spi.NeutronPort;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronPortsNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronPortsNorthbound.java
similarity index 98%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronPortsNorthbound.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronPortsNorthbound.java
index f8f7386948f461110b5fb987f9c891541b6329d3..4f4495d29b46e3470c55860e24ce87c4c4a09f6c 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronPortsNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronPortsNorthbound.java
@@ -10,14 +10,14 @@ package org.opendaylight.neutron.northbound.api;
 
 import org.codehaus.enunciate.jaxrs.ResponseCode;
 import org.codehaus.enunciate.jaxrs.StatusCodes;
-import org.opendaylight.neutron.neutron.spi.INeutronNetworkCRUD;
-import org.opendaylight.neutron.neutron.spi.INeutronPortAware;
-import org.opendaylight.neutron.neutron.spi.INeutronPortCRUD;
-import org.opendaylight.neutron.neutron.spi.INeutronSubnetCRUD;
-import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
-import org.opendaylight.neutron.neutron.spi.NeutronPort;
-import org.opendaylight.neutron.neutron.spi.NeutronSubnet;
-import org.opendaylight.neutron.neutron.spi.Neutron_IPs;
+import org.opendaylight.neutron.spi.INeutronNetworkCRUD;
+import org.opendaylight.neutron.spi.INeutronPortAware;
+import org.opendaylight.neutron.spi.INeutronPortCRUD;
+import org.opendaylight.neutron.spi.INeutronSubnetCRUD;
+import org.opendaylight.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.spi.NeutronPort;
+import org.opendaylight.neutron.spi.NeutronSubnet;
+import org.opendaylight.neutron.spi.Neutron_IPs;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronRouterRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronRouterRequest.java
similarity index 95%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronRouterRequest.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronRouterRequest.java
index d493b004a844ff649b29596fa6b5d96855b2199d..16ddbda8c77a2d3e24ecb7897ea0a7e4d2f9a5f6 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronRouterRequest.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronRouterRequest.java
@@ -15,7 +15,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.opendaylight.neutron.neutron.spi.NeutronRouter;
+import org.opendaylight.neutron.spi.NeutronRouter;
 
 
 @XmlRootElement

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronRoutersNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronRoutersNorthbound.java
similarity index 97%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronRoutersNorthbound.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronRoutersNorthbound.java
index 025eb34866781b65ca0ccccd43e96fe833484a7c..fec761ff44a7088af785f8cacd3fe4873acbdf46 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronRoutersNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronRoutersNorthbound.java
@@ -26,17 +26,17 @@ import javax.ws.rs.core.Response;
 
 import org.codehaus.enunciate.jaxrs.ResponseCode;
 import org.codehaus.enunciate.jaxrs.StatusCodes;
-import org.opendaylight.neutron.neutron.spi.INeutronNetworkCRUD;
-import org.opendaylight.neutron.neutron.spi.INeutronPortCRUD;
-import org.opendaylight.neutron.neutron.spi.INeutronRouterAware;
-import org.opendaylight.neutron.neutron.spi.INeutronRouterCRUD;
-import org.opendaylight.neutron.neutron.spi.INeutronSubnetCRUD;
-import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
-import org.opendaylight.neutron.neutron.spi.NeutronNetwork;
-import org.opendaylight.neutron.neutron.spi.NeutronPort;
-import org.opendaylight.neutron.neutron.spi.NeutronRouter;
-import org.opendaylight.neutron.neutron.spi.NeutronRouter_Interface;
-import org.opendaylight.neutron.neutron.spi.NeutronSubnet;
+import org.opendaylight.neutron.spi.INeutronNetworkCRUD;
+import org.opendaylight.neutron.spi.INeutronPortCRUD;
+import org.opendaylight.neutron.spi.INeutronRouterAware;
+import org.opendaylight.neutron.spi.INeutronRouterCRUD;
+import org.opendaylight.neutron.spi.INeutronSubnetCRUD;
+import org.opendaylight.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.spi.NeutronNetwork;
+import org.opendaylight.neutron.spi.NeutronPort;
+import org.opendaylight.neutron.spi.NeutronRouter;
+import org.opendaylight.neutron.spi.NeutronRouter_Interface;
+import org.opendaylight.neutron.spi.NeutronSubnet;
 
 
 /**

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityGroupRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupRequest.java
similarity index 95%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityGroupRequest.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupRequest.java
index c70b8577be2fdb6e5715cfa428a65527a2af186d..74d0402311efc300e4653dfb91a19d1f77455fe0 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityGroupRequest.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupRequest.java
@@ -9,7 +9,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
-import org.opendaylight.neutron.neutron.spi.NeutronSecurityGroup;
+import org.opendaylight.neutron.spi.NeutronSecurityGroup;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityGroupsNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupsNorthbound.java
similarity index 98%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityGroupsNorthbound.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupsNorthbound.java
index 1a782d7d7dbc3eab315099bbec961722969f1b9c..89259314c0a5c8d4d04798c46d3d7ff1d52cade7 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityGroupsNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupsNorthbound.java
@@ -29,10 +29,10 @@ import javax.ws.rs.core.Response;
 
 import org.codehaus.enunciate.jaxrs.ResponseCode;
 import org.codehaus.enunciate.jaxrs.StatusCodes;
-import org.opendaylight.neutron.neutron.spi.INeutronSecurityGroupAware;
-import org.opendaylight.neutron.neutron.spi.INeutronSecurityGroupCRUD;
-import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
-import org.opendaylight.neutron.neutron.spi.NeutronSecurityGroup;
+import org.opendaylight.neutron.spi.INeutronSecurityGroupAware;
+import org.opendaylight.neutron.spi.INeutronSecurityGroupCRUD;
+import org.opendaylight.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.spi.NeutronSecurityGroup;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityRuleRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityRuleRequest.java
similarity index 95%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityRuleRequest.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityRuleRequest.java
index f467d5872fc91a7fe2f56f912a823259486a7812..016af7b9091c7f0f93fdecdd2281cbeed773aa45 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityRuleRequest.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityRuleRequest.java
@@ -9,7 +9,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
-import org.opendaylight.neutron.neutron.spi.NeutronSecurityRule;
+import org.opendaylight.neutron.spi.NeutronSecurityRule;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityRulesNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityRulesNorthbound.java
similarity index 98%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityRulesNorthbound.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityRulesNorthbound.java
index bdf12d7eb7c7766623fdb7e562007101783e4dca..9f9e97699598726120866942557f92bb9b800644 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityRulesNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityRulesNorthbound.java
@@ -29,11 +29,11 @@ import javax.ws.rs.core.Response;
 
 import org.codehaus.enunciate.jaxrs.ResponseCode;
 import org.codehaus.enunciate.jaxrs.StatusCodes;
-import org.opendaylight.neutron.neutron.spi.INeutronSecurityGroupCRUD;
-import org.opendaylight.neutron.neutron.spi.INeutronSecurityRuleAware;
-import org.opendaylight.neutron.neutron.spi.INeutronSecurityRuleCRUD;
-import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
-import org.opendaylight.neutron.neutron.spi.NeutronSecurityRule;
+import org.opendaylight.neutron.spi.INeutronSecurityGroupCRUD;
+import org.opendaylight.neutron.spi.INeutronSecurityRuleAware;
+import org.opendaylight.neutron.spi.INeutronSecurityRuleCRUD;
+import org.opendaylight.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.spi.NeutronSecurityRule;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSubnetRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSubnetRequest.java
similarity index 96%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSubnetRequest.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSubnetRequest.java
index ac994f676159d5ac816ef82df113c660fc6b24c4..84716f267f24bbbeb4464f76eef8375e6d09cac0 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSubnetRequest.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSubnetRequest.java
@@ -13,7 +13,7 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-import org.opendaylight.neutron.neutron.spi.NeutronSubnet;
+import org.opendaylight.neutron.spi.NeutronSubnet;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSubnetsNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSubnetsNorthbound.java
similarity index 98%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSubnetsNorthbound.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSubnetsNorthbound.java
index eb3da1d237eb3bb2850922ea06421a5dfe8cc663..8a98b26527ab3a4fcd855dbe2e19dd66f35b8428 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSubnetsNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSubnetsNorthbound.java
@@ -31,11 +31,11 @@ import javax.ws.rs.core.UriInfo;
 
 import org.codehaus.enunciate.jaxrs.ResponseCode;
 import org.codehaus.enunciate.jaxrs.StatusCodes;
-import org.opendaylight.neutron.neutron.spi.INeutronNetworkCRUD;
-import org.opendaylight.neutron.neutron.spi.INeutronSubnetAware;
-import org.opendaylight.neutron.neutron.spi.INeutronSubnetCRUD;
-import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
-import org.opendaylight.neutron.neutron.spi.NeutronSubnet;
+import org.opendaylight.neutron.spi.INeutronNetworkCRUD;
+import org.opendaylight.neutron.spi.INeutronSubnetAware;
+import org.opendaylight.neutron.spi.INeutronSubnetCRUD;
+import org.opendaylight.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.spi.NeutronSubnet;
 
 /**
  * Neutron Northbound REST APIs for Subnets.<br>

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronUtil.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronUtil.java
similarity index 100%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronUtil.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronUtil.java

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/PaginatedRequestFactory.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/PaginatedRequestFactory.java
similarity index 95%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/PaginatedRequestFactory.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/PaginatedRequestFactory.java
index b4650533c0d94e058330d52b559ff32871e46174..95ff0ebe8deb9c24664871e832c495808f83fe5a 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/PaginatedRequestFactory.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/PaginatedRequestFactory.java
@@ -16,10 +16,10 @@ import java.util.Comparator;
 import java.util.List;
 import javax.ws.rs.core.UriInfo;
 
-import org.opendaylight.neutron.neutron.spi.INeutronObject;
-import org.opendaylight.neutron.neutron.spi.NeutronNetwork;
-import org.opendaylight.neutron.neutron.spi.NeutronPort;
-import org.opendaylight.neutron.neutron.spi.NeutronSubnet;
+import org.opendaylight.neutron.spi.INeutronObject;
+import org.opendaylight.neutron.spi.NeutronNetwork;
+import org.opendaylight.neutron.spi.NeutronPort;
+import org.opendaylight.neutron.spi.NeutronSubnet;
 
 public class PaginatedRequestFactory {
     private static final Comparator<INeutronObject> NEUTRON_OBJECT_COMPARATOR = new Comparator<INeutronObject>() {

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/ResourceConflictException.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/ResourceConflictException.java
similarity index 100%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/ResourceConflictException.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/ResourceConflictException.java

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/ResourceNotFoundException.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/ResourceNotFoundException.java
similarity index 100%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/ResourceNotFoundException.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/ResourceNotFoundException.java

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/RestMessages.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/RestMessages.java
similarity index 100%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/RestMessages.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/RestMessages.java

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/ServiceUnavailableException.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/ServiceUnavailableException.java
similarity index 100%
rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/ServiceUnavailableException.java
rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/ServiceUnavailableException.java

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/Activator.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/Activator.java
index bdf4ad31d3a7f8814c01c06a404a628dd16ca4dd..97e7a422db58145dd1ebd8dac174119dcb37601a 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/Activator.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/Activator.java
@@ -11,20 +11,20 @@ package org.opendaylight.neutron.transcriber;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.opendaylight.neutron.neutron.spi.INeutronFirewallCRUD;
-import org.opendaylight.neutron.neutron.spi.INeutronFirewallPolicyCRUD;
-import org.opendaylight.neutron.neutron.spi.INeutronFirewallRuleCRUD;
-import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerCRUD;
-import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerHealthMonitorCRUD;
-import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerListenerCRUD;
-import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerPoolCRUD;
-import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerPoolMemberCRUD;
-import org.opendaylight.neutron.neutron.spi.INeutronNetworkCRUD;
-import org.opendaylight.neutron.neutron.spi.INeutronPortCRUD;
-import org.opendaylight.neutron.neutron.spi.INeutronRouterCRUD;
-import org.opendaylight.neutron.neutron.spi.INeutronSecurityGroupCRUD;
-import org.opendaylight.neutron.neutron.spi.INeutronSecurityRuleCRUD;
-import org.opendaylight.neutron.neutron.spi.INeutronSubnetCRUD;
+import org.opendaylight.neutron.spi.INeutronFirewallCRUD;
+import org.opendaylight.neutron.spi.INeutronFirewallPolicyCRUD;
+import org.opendaylight.neutron.spi.INeutronFirewallRuleCRUD;
+import org.opendaylight.neutron.spi.INeutronLoadBalancerCRUD;
+import org.opendaylight.neutron.spi.INeutronLoadBalancerHealthMonitorCRUD;
+import org.opendaylight.neutron.spi.INeutronLoadBalancerListenerCRUD;
+import org.opendaylight.neutron.spi.INeutronLoadBalancerPoolCRUD;
+import org.opendaylight.neutron.spi.INeutronLoadBalancerPoolMemberCRUD;
+import org.opendaylight.neutron.spi.INeutronNetworkCRUD;
+import org.opendaylight.neutron.spi.INeutronPortCRUD;
+import org.opendaylight.neutron.spi.INeutronRouterCRUD;
+import org.opendaylight.neutron.spi.INeutronSecurityGroupCRUD;
+import org.opendaylight.neutron.spi.INeutronSecurityRuleCRUD;
+import org.opendaylight.neutron.spi.INeutronSubnetCRUD;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallInterface.java
index 13b4853122aac366c3704c8e3000bde58e0aa1d8..5145196a864d3564e79cb48d13010ee309bf4fba 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallInterface.java
@@ -8,8 +8,8 @@
 
 package org.opendaylight.neutron.transcriber;
 
-import org.opendaylight.neutron.neutron.spi.INeutronFirewallCRUD;
-import org.opendaylight.neutron.neutron.spi.NeutronFirewall;
+import org.opendaylight.neutron.spi.INeutronFirewallCRUD;
+import org.opendaylight.neutron.spi.NeutronFirewall;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallPolicyInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallPolicyInterface.java
index 11fa6074d6d0ab1d9ead9be1f9ff89037e670ee8..c55165d9403aa5a0ce54aa5d11a738f94dde42db 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallPolicyInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallPolicyInterface.java
@@ -8,8 +8,8 @@
 
 package org.opendaylight.neutron.transcriber;
 
-import org.opendaylight.neutron.neutron.spi.INeutronFirewallPolicyCRUD;
-import org.opendaylight.neutron.neutron.spi.NeutronFirewallPolicy;
+import org.opendaylight.neutron.spi.INeutronFirewallPolicyCRUD;
+import org.opendaylight.neutron.spi.NeutronFirewallPolicy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallRuleInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallRuleInterface.java
index 0259497e6e72bc32167604f076f15fd73ed74810..df4eeb01057c9a31ea9a209cdc0c38832a35d39d 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallRuleInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallRuleInterface.java
@@ -8,8 +8,8 @@
 
 package org.opendaylight.neutron.transcriber;
 
-import org.opendaylight.neutron.neutron.spi.INeutronFirewallRuleCRUD;
-import org.opendaylight.neutron.neutron.spi.NeutronFirewallRule;
+import org.opendaylight.neutron.spi.INeutronFirewallRuleCRUD;
+import org.opendaylight.neutron.spi.NeutronFirewallRule;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFloatingIPInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFloatingIPInterface.java
index 74ea59e1cc7e3a1f4a149697471db517a277bc04..ba62cda70723f3ecbc11edb650ec5807a8a0f898 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFloatingIPInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFloatingIPInterface.java
@@ -17,14 +17,14 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import org.opendaylight.neutron.neutron.spi.INeutronFloatingIPCRUD;
-import org.opendaylight.neutron.neutron.spi.INeutronNetworkCRUD;
-import org.opendaylight.neutron.neutron.spi.INeutronPortCRUD;
-import org.opendaylight.neutron.neutron.spi.INeutronSubnetCRUD;
-import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
-import org.opendaylight.neutron.neutron.spi.NeutronFloatingIP;
-import org.opendaylight.neutron.neutron.spi.NeutronPort;
-import org.opendaylight.neutron.neutron.spi.NeutronSubnet;
+import org.opendaylight.neutron.spi.INeutronFloatingIPCRUD;
+import org.opendaylight.neutron.spi.INeutronNetworkCRUD;
+import org.opendaylight.neutron.spi.INeutronPortCRUD;
+import org.opendaylight.neutron.spi.INeutronSubnetCRUD;
+import org.opendaylight.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.spi.NeutronFloatingIP;
+import org.opendaylight.neutron.spi.NeutronPort;
+import org.opendaylight.neutron.spi.NeutronSubnet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java
index ef9e8f587cd647b748b01db093685ae0a348342a..f1aa949282595506be78e50767570229d3e97f37 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java
@@ -8,8 +8,8 @@
 
 package org.opendaylight.neutron.transcriber;
 
-import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerHealthMonitorCRUD;
-import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerHealthMonitor;
+import org.opendaylight.neutron.spi.INeutronLoadBalancerHealthMonitorCRUD;
+import org.opendaylight.neutron.spi.NeutronLoadBalancerHealthMonitor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerInterface.java
index 845ff4b7c93057a42894ff9e8079bf680e45c190..6599d907a4d698f88815eebdc8a759361146609e 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerInterface.java
@@ -8,8 +8,8 @@
 
 package org.opendaylight.neutron.transcriber;
 
-import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerCRUD;
-import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancer;
+import org.opendaylight.neutron.spi.INeutronLoadBalancerCRUD;
+import org.opendaylight.neutron.spi.NeutronLoadBalancer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerListenerInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerListenerInterface.java
index f20b48159e31d6158e1554b5c237a50b58eb2800..95ca3494b3e927433e14193330e9c9aea9373288 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerListenerInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerListenerInterface.java
@@ -8,8 +8,8 @@
 
 package org.opendaylight.neutron.transcriber;
 
-import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerListenerCRUD;
-import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerListener;
+import org.opendaylight.neutron.spi.INeutronLoadBalancerListenerCRUD;
+import org.opendaylight.neutron.spi.NeutronLoadBalancerListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java
index 4b0274c58ad4ebfd1198227490130826543b7a99..13a93fc0aeaa510fd5d567f179edaf13201cf964 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java
@@ -8,8 +8,8 @@
 
 package org.opendaylight.neutron.transcriber;
 
-import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerPoolCRUD;
-import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerPool;
+import org.opendaylight.neutron.spi.INeutronLoadBalancerPoolCRUD;
+import org.opendaylight.neutron.spi.NeutronLoadBalancerPool;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolMemberInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolMemberInterface.java
index 97c0ea8015a863c133fe63c4490d60e7fbec0682..ae3cac0575293e3498b11ac4fb7e657800ec3d04 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolMemberInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolMemberInterface.java
@@ -8,8 +8,8 @@
 
 package org.opendaylight.neutron.transcriber;
 
-import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerPoolMemberCRUD;
-import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerPoolMember;
+import org.opendaylight.neutron.spi.INeutronLoadBalancerPoolMemberCRUD;
+import org.opendaylight.neutron.spi.NeutronLoadBalancerPoolMember;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronNetworkInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronNetworkInterface.java
index 45257eaae802894bedf8526f80d86c20eace9482..043766254fe41346bad5bfe9d90ba1b133dd7af8 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronNetworkInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronNetworkInterface.java
@@ -17,8 +17,8 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import org.opendaylight.neutron.neutron.spi.INeutronNetworkCRUD;
-import org.opendaylight.neutron.neutron.spi.NeutronNetwork;
+import org.opendaylight.neutron.spi.INeutronNetworkCRUD;
+import org.opendaylight.neutron.spi.NeutronNetwork;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java
index e0cf8cf4924763a652073abbcd9636c0e33bb2ff..8e709bc3a5b7575311bbcdad9e0467a91a8a2e36 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java
@@ -18,14 +18,14 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import org.opendaylight.neutron.neutron.spi.INeutronNetworkCRUD;
-import org.opendaylight.neutron.neutron.spi.INeutronPortCRUD;
-import org.opendaylight.neutron.neutron.spi.INeutronSubnetCRUD;
-import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
-import org.opendaylight.neutron.neutron.spi.NeutronNetwork;
-import org.opendaylight.neutron.neutron.spi.NeutronPort;
-import org.opendaylight.neutron.neutron.spi.NeutronSubnet;
-import org.opendaylight.neutron.neutron.spi.Neutron_IPs;
+import org.opendaylight.neutron.spi.INeutronNetworkCRUD;
+import org.opendaylight.neutron.spi.INeutronPortCRUD;
+import org.opendaylight.neutron.spi.INeutronSubnetCRUD;
+import org.opendaylight.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.spi.NeutronNetwork;
+import org.opendaylight.neutron.spi.NeutronPort;
+import org.opendaylight.neutron.spi.NeutronSubnet;
+import org.opendaylight.neutron.spi.Neutron_IPs;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronRouterInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronRouterInterface.java
index 8767f99a2b7eba1e9593d27355792866b8dce000..0dc168d0e3d6ae33f422a465cbf7467643a8d5da 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronRouterInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronRouterInterface.java
@@ -17,8 +17,8 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import org.opendaylight.neutron.neutron.spi.INeutronRouterCRUD;
-import org.opendaylight.neutron.neutron.spi.NeutronRouter;
+import org.opendaylight.neutron.spi.INeutronRouterCRUD;
+import org.opendaylight.neutron.spi.NeutronRouter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityGroupInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityGroupInterface.java
index d3da70c108db670bee27de20b1cdcf7924c8ff27..4f20a7262a640d3712d1c388d8305b150bfc7247 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityGroupInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityGroupInterface.java
@@ -18,8 +18,8 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import org.opendaylight.neutron.neutron.spi.INeutronSecurityGroupCRUD;
-import org.opendaylight.neutron.neutron.spi.NeutronSecurityGroup;
+import org.opendaylight.neutron.spi.INeutronSecurityGroupCRUD;
+import org.opendaylight.neutron.spi.NeutronSecurityGroup;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityRuleInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityRuleInterface.java
index d9c7b5735bd37834aa625ccaab0871b3712dacc3..f0b171ffe3a8c6cbce9f5369dd59adeba10ada4e 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityRuleInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityRuleInterface.java
@@ -18,8 +18,8 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import org.opendaylight.neutron.neutron.spi.INeutronSecurityRuleCRUD;
-import org.opendaylight.neutron.neutron.spi.NeutronSecurityRule;
+import org.opendaylight.neutron.spi.INeutronSecurityRuleCRUD;
+import org.opendaylight.neutron.spi.NeutronSecurityRule;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSubnetInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSubnetInterface.java
index 761077184e3326678d70024a2257c44856a7356c..5e8f585ad0046bffc235ba934cce011349973193 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSubnetInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSubnetInterface.java
@@ -17,11 +17,11 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import org.opendaylight.neutron.neutron.spi.INeutronNetworkCRUD;
-import org.opendaylight.neutron.neutron.spi.INeutronSubnetCRUD;
-import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
-import org.opendaylight.neutron.neutron.spi.NeutronNetwork;
-import org.opendaylight.neutron.neutron.spi.NeutronSubnet;
+import org.opendaylight.neutron.spi.INeutronNetworkCRUD;
+import org.opendaylight.neutron.spi.INeutronSubnetCRUD;
+import org.opendaylight.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.spi.NeutronNetwork;
+import org.opendaylight.neutron.spi.NeutronSubnet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;