Merge "NETCONF-525: fix netconf AuthProvider packaging"

diff --git a/netconf/aaa-authn-odl-plugin/src/main/java/org/opendaylight/aaa/odl/CredentialServiceAuthProvider.java b/netconf/aaa-authn-odl-plugin/src/main/java/org/opendaylight/netconf/authprovider/CredentialServiceAuthProvider.java
similarity index 98%
rename from netconf/aaa-authn-odl-plugin/src/main/java/org/opendaylight/aaa/odl/CredentialServiceAuthProvider.java
rename to netconf/aaa-authn-odl-plugin/src/main/java/org/opendaylight/netconf/authprovider/CredentialServiceAuthProvider.java
index 30a2149456d252d61dc181a95aeda667b6243eb9..d6e1c95b4f82c144cbdec071a226f070eff1750e 100644 (file)
--- a/netconf/aaa-authn-odl-plugin/src/main/java/org/opendaylight/aaa/odl/CredentialServiceAuthProvider.java
+++ b/netconf/aaa-authn-odl-plugin/src/main/java/org/opendaylight/netconf/authprovider/CredentialServiceAuthProvider.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.aaa.odl;
+package org.opendaylight.netconf.authprovider;
 
 import org.opendaylight.aaa.api.AuthenticationException;
 import org.opendaylight.aaa.api.Claim;

diff --git a/netconf/aaa-authn-odl-plugin/src/main/resources/org/opendaylight/blueprint/aaa-authn-netconf.xml b/netconf/aaa-authn-odl-plugin/src/main/resources/org/opendaylight/blueprint/aaa-authn-netconf.xml
index 7ee51423e955381380d5d9f4b6cc00ed0e48e651..ce49a534a2c06cce28e06644c86ffde42e7236dc 100644 (file)
--- a/netconf/aaa-authn-odl-plugin/src/main/resources/org/opendaylight/blueprint/aaa-authn-netconf.xml
+++ b/netconf/aaa-authn-odl-plugin/src/main/resources/org/opendaylight/blueprint/aaa-authn-netconf.xml
@@ -12,7 +12,7 @@
 
     <reference id="credentialAuth" interface="org.opendaylight.aaa.api.CredentialAuth" odl:type="default" />
 
-    <bean id="credentialServiceAuthProvider" class="org.opendaylight.aaa.odl.CredentialServiceAuthProvider">
+    <bean id="credentialServiceAuthProvider" class="org.opendaylight.netconf.authprovider.CredentialServiceAuthProvider">
         <argument ref="credentialAuth"/>
     </bean>
     <service ref="credentialServiceAuthProvider" interface="org.opendaylight.netconf.auth.AuthProvider"

diff --git a/netconf/aaa-authn-odl-plugin/src/test/java/org/opendaylight/aaa/odl/CredentialServiceAuthProviderTest.java b/netconf/aaa-authn-odl-plugin/src/test/java/org/opendaylight/netconf/authprovider/CredentialServiceAuthProviderTest.java
similarity index 98%
rename from netconf/aaa-authn-odl-plugin/src/test/java/org/opendaylight/aaa/odl/CredentialServiceAuthProviderTest.java
rename to netconf/aaa-authn-odl-plugin/src/test/java/org/opendaylight/netconf/authprovider/CredentialServiceAuthProviderTest.java
index ea7e1e93fc2f29cbe177d65d13265c2ec89fcd93..f46adc170a0c9d03022d6b2a302219417036cb3d 100644 (file)
--- a/netconf/aaa-authn-odl-plugin/src/test/java/org/opendaylight/aaa/odl/CredentialServiceAuthProviderTest.java
+++ b/netconf/aaa-authn-odl-plugin/src/test/java/org/opendaylight/netconf/authprovider/CredentialServiceAuthProviderTest.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.aaa.odl;
+package org.opendaylight.netconf.authprovider;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;