Added integration tests back (and cleaned up poms). Integration tests can be trigger...

mvn clean install -Paaa-it

Change-Id: Ibb3c8a7a7bbce159530effaf653d02c690324b23
Signed-off-by: Liem Nguyen <liem_m_nguyen@hp.com>

diff --git a/aaa-authn-basic/pom.xml b/aaa-authn-basic/pom.xml
index c57811692c54d2eb1630cb3916afab9973e1fa87..f4669ddf91f8397c05030465e13fc7b84eb28b4b 100644 (file)
--- a/aaa-authn-basic/pom.xml
+++ b/aaa-authn-basic/pom.xml
@@ -52,7 +52,6 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>1.7.7</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/aaa-authn-keystone/pom.xml b/aaa-authn-keystone/pom.xml
index f269a28f1803a38cdb1a75dd8ac7b74784712a64..e947bdf9c612a0a6b26b4de35b75af2c4d420054 100644 (file)
--- a/aaa-authn-keystone/pom.xml
+++ b/aaa-authn-keystone/pom.xml
@@ -35,7 +35,6 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -52,7 +51,6 @@
     <dependency>
       <groupId>com.sun.jersey.jersey-test-framework</groupId>
       <artifactId>jersey-test-framework-grizzly2</artifactId>
-      <version>1.17</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -63,7 +61,6 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>1.7.7</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/aaa-authn-odl-plugin/pom.xml b/aaa-authn-odl-plugin/pom.xml
index 2a832a62975c2191fd229fa9eed19a0fd62c5ba1..f55e75842dae2f2635f1a032f6e55c69718e0be4 100644 (file)
--- a/aaa-authn-odl-plugin/pom.xml
+++ b/aaa-authn-odl-plugin/pom.xml
@@ -25,6 +25,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>netconf-auth</artifactId>
+            <version>${netconf.version}</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
@@ -40,7 +41,6 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>1.7.7</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/aaa-authn-sssd/pom.xml b/aaa-authn-sssd/pom.xml
index 29445779c185171d2dc684d81bb88acb03578250..c2e08dfb2e6f5a82ab209de85076c3a93f7d95ca 100644 (file)
--- a/aaa-authn-sssd/pom.xml
+++ b/aaa-authn-sssd/pom.xml
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>org.glassfish</groupId>
       <artifactId>javax.json</artifactId>
-      <version>1.0.4</version>
+      <version>${glassfish.json.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.aaa</groupId>
@@ -45,7 +45,6 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -62,7 +61,6 @@
     <dependency>
       <groupId>com.sun.jersey.jersey-test-framework</groupId>
       <artifactId>jersey-test-framework-grizzly2</artifactId>
-      <version>1.17</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -73,7 +71,6 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>1.7.7</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/aaa-authn-store/pom.xml b/aaa-authn-store/pom.xml
index ca52a307274ac8f6a4acf1c2d58fcf56e2608be7..e00e84daaa6e31e71cc0dc5b9f6d7b8cce1489e1 100644 (file)
--- a/aaa-authn-store/pom.xml
+++ b/aaa-authn-store/pom.xml
@@ -17,7 +17,6 @@
         <dependency>
             <groupId>net.sf.ehcache</groupId>
             <artifactId>ehcache</artifactId>
-            <version>${ehcache.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
@@ -52,7 +51,6 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>1.7.7</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/aaa-authn-sts/pom.xml b/aaa-authn-sts/pom.xml
index e1212962273fb14fc7daf5fa1fa7773d79acd38d..b613d5c226bf5dc2fc056afc4df3fdeeb3cf9747 100644 (file)
--- a/aaa-authn-sts/pom.xml
+++ b/aaa-authn-sts/pom.xml
@@ -36,25 +36,21 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.oltu.oauth2</groupId>
             <artifactId>org.apache.oltu.oauth2.authzserver</artifactId>
-            <version>${oauth.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.oltu.oauth2</groupId>
             <artifactId>org.apache.oltu.oauth2.common</artifactId>
-            <version>${oauth.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.oltu.oauth2</groupId>
             <artifactId>org.apache.oltu.oauth2.resourceserver</artifactId>
-            <version>${oauth.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -71,13 +67,11 @@
         <dependency>
             <groupId>com.sun.jersey.jersey-test-framework</groupId>
             <artifactId>jersey-test-framework-grizzly2</artifactId>
-            <version>1.17</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-servlet-tester</artifactId>
-            <version>7.0.0.M2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -93,7 +87,6 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>1.7.7</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/aaa-authn/pom.xml b/aaa-authn/pom.xml
index 2d29094b04e7e77c1b0cca501f9b79db64aaf300..25ddea1b5737cbec45629097d7f394709e625d08 100644 (file)
--- a/aaa-authn/pom.xml
+++ b/aaa-authn/pom.xml
@@ -33,6 +33,11 @@
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.dependencymanager</artifactId>
@@ -47,7 +52,6 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>1.7.7</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/aaa-authn/src/main/java/org/opendaylight/aaa/AuthenticationManager.java b/aaa-authn/src/main/java/org/opendaylight/aaa/AuthenticationManager.java
index 25170e3cace95760d2f6623782cdfe9e25099a43..23ae4ef69ca38a5d8d7d57766abcc9d2359dd537 100644 (file)
--- a/aaa-authn/src/main/java/org/opendaylight/aaa/AuthenticationManager.java
+++ b/aaa-authn/src/main/java/org/opendaylight/aaa/AuthenticationManager.java
@@ -60,18 +60,18 @@ public class AuthenticationManager implements AuthenticationService,
     }
 
     @Override
-    public void updated(Dictionary<String, ?> props)
+    public boolean isAuthEnabled() {
+        return authEnabled;
+    }
+
+    @Override
+    public void updated(Dictionary<String, ?> properties)
             throws ConfigurationException {
         try {
-            authEnabled = Boolean.valueOf((String) props.get(AUTH_ENABLED));
+            authEnabled = Boolean.valueOf((String) properties.get(AUTH_ENABLED));
         } catch (Throwable t) {
             throw new ConfigurationException(AUTH_ENABLED, AUTH_ENABLED_ERR);
         }
     }
 
-    @Override
-    public boolean isAuthEnabled() {
-        return authEnabled;
-    }
-
 }

diff --git a/aaa-authz/aaa-authz-model/pom.xml b/aaa-authz/aaa-authz-model/pom.xml
index 02ed16e55464bd044d6fd88535fccddac9e7607a..479f5e3e7e33c77e683af089f312ef6e8e50d3b1 100644 (file)
--- a/aaa-authz/aaa-authz-model/pom.xml
+++ b/aaa-authz/aaa-authz-model/pom.xml
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-binding</artifactId>
-            <version>${yang.codegen.version}</version>
+            <version>${yangtools.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
@@ -39,13 +39,11 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.3.6</version>
                 <extensions>true</extensions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8.1</version>
                 <configuration>
                     <stylesheet>maven</stylesheet>
                 </configuration>
@@ -61,7 +59,7 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>${yang.maven.plugin.version}</version>
+                <version>${yangtools.version}</version>
                 <executions>
                     <execution>
                         <goals>
@@ -86,7 +84,7 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
-                        <version>${yang.codegen.version}</version>
+                        <version>${yangtools.version}</version>
                         <type>jar</type>
                     </dependency>
                 </dependencies>
@@ -94,7 +92,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.7</version>
                 <executions>
                     <execution>
                         <phase>generate-sources</phase>

diff --git a/aaa-authz/aaa-authz-service/.gitignore b/aaa-authz/aaa-authz-service/.gitignore
new file mode 100644 (file)
index 0000000..3edb497
--- /dev/null
+++ b/aaa-authz/aaa-authz-service/.gitignore
@@ -0,0 +1,2 @@
+yang-gen-config/
+yang-gen-sal/

diff --git a/aaa-authz/aaa-authz-service/pom.xml b/aaa-authz/aaa-authz-service/pom.xml
index 7317ccf01f6d0219e4c467b69961b999b85775de..1966cda67ce6b2d886db274eb98a9de46ce8edd9 100644 (file)
--- a/aaa-authz/aaa-authz-service/pom.xml
+++ b/aaa-authz/aaa-authz-service/pom.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
-  ~
-  ~ This program and the accompanying materials are made available under the
-  ~ terms of the Eclipse Public License v1.0 which accompanies this distribution,
-  ~ and is available at http://www.eclipse.org/legal/epl-v10.html
-  -->
+<!-- ~ Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. 
+    ~ ~ This program and the accompanying materials are made available under 
+    the ~ terms of the Eclipse Public License v1.0 which accompanies this distribution, 
+    ~ and is available at http://www.eclipse.org/legal/epl-v10.html -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>aaa-authz</artifactId>
         <groupId>org.opendaylight.aaa</groupId>
@@ -25,49 +21,51 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-util</artifactId>
-            <version>1.1-SNAPSHOT</version>
+            <version>${mdsal.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common-util</artifactId>
-            <version>1.1-SNAPSHOT</version>
+            <version>${mdsal.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-api</artifactId>
-            <version>${yang.codegen.version}</version>
+            <version>${yangtools.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.7</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
-            <version>1.1-SNAPSHOT</version>
+            <version>${mdsal.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-api</artifactId>
+            <version>${config.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-config</artifactId>
+            <version>${mdsal.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>aaa-authz-model</artifactId>
-            <version>0.1.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>aaa-authn-api</artifactId>
-            <version>0.1.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-core-api</artifactId>
+            <version>${mdsal.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -75,36 +73,34 @@
             <scope>provided</scope>
         </dependency>
 
-<!-- Test dependencies -->
-    <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <scope>test</scope>
-    </dependency>
-    <dependency>
-        <groupId>org.mockito</groupId>
-        <artifactId>mockito-all</artifactId>
-        <scope>test</scope>
-    </dependency>
-    <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-simple</artifactId>
-        <version>1.7.7</version>
-        <scope>test</scope>
-    </dependency>
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
+        </dependency>
 
-</dependencies>
+    </dependencies>
 
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.3.6</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
- <!--                       <Bundle-Activator>org.opendaylight.aaa.authz.srv.AuthzProvider</Bundle-Activator> -->
+                        <!-- <Bundle-Activator>org.opendaylight.aaa.authz.srv.AuthzProvider</Bundle-Activator> -->
                         <Export-Package>org.opendaylight.aaa.config.yang.aaa_srv,</Export-Package>
                     </instructions>
                 </configuration>
@@ -113,10 +109,13 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
+                <version>${yangtools.version}</version>
                 <executions>
                     <execution>
                         <id>config</id>
-                        <goals><goal>generate-sources</goal></goals>
+                        <goals>
+                            <goal>generate-sources</goal>
+                        </goals>
                         <configuration>
                             <codeGenerators>
                                 <generator>

diff --git a/aaa-idmlight/pom.xml b/aaa-idmlight/pom.xml
index d7b82b31d2953d4f96b3f361dcbe5375aea44b5c..e30ef8554c9d4f20fd78458b59c57c847952a2e2 100644 (file)
--- a/aaa-idmlight/pom.xml
+++ b/aaa-idmlight/pom.xml
@@ -36,7 +36,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -45,38 +44,48 @@
             <scope>provided</scope>
         </dependency>
 
-       <!-- JSON JAXB Stuff -->
+        <!-- JSON JAXB Stuff -->
         <dependency>
-           <groupId>com.sun.jersey</groupId><artifactId>jersey-json</artifactId><version>1.17</version><scope>provided</scope>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-json</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-           <groupId>org.codehaus.jackson</groupId><artifactId>jackson-core-asl</artifactId><version>1.9.2</version><scope>provided</scope>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-core-asl</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-           <groupId>org.codehaus.jackson</groupId><artifactId>jackson-mapper-asl</artifactId><version>1.9.2</version><scope>provided</scope>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-mapper-asl</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-           <groupId>org.codehaus.jackson</groupId><artifactId>jackson-jaxrs</artifactId><version>1.9.2</version><scope>provided</scope>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-jaxrs</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-           <groupId>org.codehaus.jackson</groupId><artifactId>jackson-xc</artifactId><version>1.9.2</version><scope>provided</scope>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-xc</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-           <groupId>org.codehaus.jettison</groupId><artifactId>jettison</artifactId><version>1.1</version><scope>provided</scope>
+            <groupId>org.codehaus.jettison</groupId>
+            <artifactId>jettison</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-       <!-- JDBC -->
-       <dependency>
+        <!-- JDBC -->
+        <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
-            <version>3.7.2</version>
-       </dependency>
+        </dependency>
 
         <!-- Testing Dependencies -->
         <dependency>
             <groupId>com.sun.jersey.jersey-test-framework</groupId>
             <artifactId>jersey-test-framework-grizzly2</artifactId>
-            <version>1.17</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -87,7 +96,6 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>1.7.7</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/aaa-idp-mapping/pom.xml b/aaa-idp-mapping/pom.xml
index 8dbb616a6438ef5bff18678f5a49d854b60206b8..454077451372cd8ee448bc7fd1287a14149ae89d 100644 (file)
--- a/aaa-idp-mapping/pom.xml
+++ b/aaa-idp-mapping/pom.xml
@@ -16,7 +16,6 @@
     <dependency>
       <groupId>org.glassfish</groupId>
       <artifactId>javax.json</artifactId>
-      <version>1.0.4</version>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>

diff --git a/aaa-it/pom.xml b/aaa-it/pom.xml
index 4e6f7d42e6ce5856c2487db2b0b32b7d704e78cf..7c83b3f57387220625e8a5919a5d842587871602 100644 (file)
--- a/aaa-it/pom.xml
+++ b/aaa-it/pom.xml
@@ -12,80 +12,69 @@
     <artifactId>aaa-it</artifactId>
 
     <dependencies>
+        <!-- Container -->
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
-            <artifactId>distribution.opendaylight-karaf</artifactId>
-            <version>${commons.opendaylight.version}</version>
+            <artifactId>opendaylight-karaf-empty</artifactId>
+            <version>${karaf.empty.version}</version>
             <type>zip</type>
         </dependency>
+
+        <!-- AAA features -->
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>aaa-authn-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>aaa-authn</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>aaa-authn-store</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>aaa-authn-sts</artifactId>
+            <artifactId>features-aaa</artifactId>
             <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
         </dependency>
+        <!-- Dependencies for pax exam karaf container -->
         <dependency>
-            <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>aaa-authn-keystone</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>pax-exam-container-karaf</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>aaa-authn-sssd</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>pax-exam-junit4</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>aaa-idmlight</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>pax-exam</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>aaa-authz-model</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>pax-exam-link-mvn</artifactId>
+            <scope>test</scope>
         </dependency>
-
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.ops4j.pax.url</groupId>
+            <artifactId>pax-url-aether</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-junit4</artifactId>
-            <version>${exam.version}</version>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-container-karaf</artifactId>
-            <version>${exam.version}</version>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>org.apache.karaf.features.core</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-link-mvn</artifactId>
-            <version>${exam.version}</version>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.ops4j.pax.url</groupId>
-            <artifactId>pax-url-aether</artifactId>
-            <version>2.1.0</version>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- Libraries outside of feature, used for testing -->
         <dependency>
             <groupId>org.apache.oltu.oauth2</groupId>
             <artifactId>org.apache.oltu.oauth2.client</artifactId>
@@ -99,7 +88,6 @@
             <plugin>
                 <groupId>org.ops4j.pax.exam</groupId>
                 <artifactId>maven-paxexam-plugin</artifactId>
-                <version>1.2.4</version>
                 <executions>
                     <execution>
                         <id>generate-config</id>

diff --git a/aaa-it/src/test/java/org/opendaylight/aaa/AAATest.java b/aaa-it/src/test/java/org/opendaylight/aaa/AAATest.java
index 43939560651fce5924dcfe278176da864f02a658..216d6cc8dad3b7e12b7eab9511a794f4316a7c7c 100644 (file)
--- a/aaa-it/src/test/java/org/opendaylight/aaa/AAATest.java
+++ b/aaa-it/src/test/java/org/opendaylight/aaa/AAATest.java
@@ -11,13 +11,8 @@ package org.opendaylight.aaa;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.ops4j.pax.exam.CoreOptions.maven;
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.configureConsole;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
+import static org.ops4j.pax.exam.CoreOptions.*;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.*;
 
 import java.io.File;
 
@@ -82,10 +77,9 @@ public class AAATest {
                 karafDistributionConfiguration()
                         .frameworkUrl(
                                 maven().groupId("org.opendaylight.controller")
-                                        .artifactId(
-                                                "distribution.opendaylight-karaf")
+                                        .artifactId("opendaylight-karaf-empty")
                                         .type("zip").versionAsInProject())
-                        .karafVersion("3.0.1").name("OpenDaylight")
+                        .name("OpenDaylight")
                         .unpackDirectory(new File("target/pax"))
                         .useDeployFolder(false),
                 // It is really nice if the container sticks around after the
@@ -98,14 +92,11 @@ public class AAATest {
                 // Force the log level to INFO so we have more details during
                 // the test. It defaults to WARN.
                 logLevel(LogLevel.INFO),
-                // Provision the feature exercised by this test
                 features(
                         "mvn:org.opendaylight.aaa/features-aaa/0.1.0-SNAPSHOT/xml/features",
                         "odl-aaa-all"),
                 mavenBundle().groupId("org.apache.oltu.oauth2")
                         .artifactId("org.apache.oltu.oauth2.client")
-                        .versionAsInProject()
-        // debugConfiguration("5000", true),
-        };
+                        .versionAsInProject(), };
     }
 }

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index c5ec067c8f6395597716333b717b6be2347d6a09..32ba6c7d041f8bbfadffcbbddc09641a4bff94df 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -2,11 +2,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>commons.opendaylight</artifactId>
-        <version>1.4.2-SNAPSHOT</version>
-    </parent>
     <groupId>org.opendaylight.aaa</groupId>
     <artifactId>commons.aaa</artifactId>
     <version>0.1.0-SNAPSHOT</version>
@@ -14,31 +9,74 @@
     <prerequisites>
         <maven>3.0.4</maven>
     </prerequisites>
+
     <properties>
-        <!-- common -->
+        <!-- Common -->
         <java.version.source>1.7</java.version.source>
         <java.version.target>1.7</java.version.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-        <java.source.version>1.7</java.source.version>
-        <java.target.varsion>1.7</java.target.varsion>
         <slf4j.version>1.7.2</slf4j.version>
         <logback.version>1.0.9</logback.version>
+
+        <!-- Karaf -->
+        <karaf.version>3.0.1</karaf.version>
+        <karaf.branding.version>1.0.0-SNAPSHOT</karaf.branding.version>
+        <karaf.resources.version>1.4.2-SNAPSHOT</karaf.resources.version>
+        <karaf.empty.version>1.4.2-SNAPSHOT</karaf.empty.version>
+
+        <!-- Plugins -->
+        <checkstyle.version>2.12</checkstyle.version>
+        <compiler.plugin.version>3.1</compiler.plugin.version>
+        <resource.plugin.version>2.6</resource.plugin.version>
+        <helper.plugin.version>1.9.1</helper.plugin.version>
+        <surefire.plugin.version>2.15</surefire.plugin.version>
+        <paxexam.plugin.version>1.2.4</paxexam.plugin.version>
+        <bundle.plugin.version>2.5.3</bundle.plugin.version>
+        <javadoc.plugin.version>2.8.1</javadoc.plugin.version>
+
+        <!-- OSGi -->
         <osgi.core.version>5.0.0</osgi.core.version>
+        <osgi.compendium.version>5.0.0</osgi.compendium.version>
+        <osgi.dm.version>3.1.0</osgi.dm.version>
+        <osgi.metatype.version>1.0.10</osgi.metatype.version>
+
         <!-- AuthZ -->
         <ietf.inet.types.version>2010.09.24.4-SNAPSHOT</ietf.inet.types.version>
         <ietf.yang.types.version>2010.09.24.4-SNAPSHOT</ietf.yang.types.version>
         <yang.ext.version>2013.09.07.4-SNAPSHOT</yang.ext.version>
-        <sal.binding.config.version>1.1-SNAPSHOT</sal.binding.config.version>
-        <yang.maven.plugin.version>0.6.2-SNAPSHOT</yang.maven.plugin.version>
-        <yang.codegen.version>0.6.2-SNAPSHOT</yang.codegen.version>
+        <yangtools.version>0.6.2-SNAPSHOT</yangtools.version>
+        <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
+        <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
+        <mdsal.version>1.1-SNAPSHOT</mdsal.version>
+        <config.version>0.2.5-SNAPSHOT</config.version>
+        <jaxrs.version>3.0.4.Final</jaxrs.version>
         <config.authz.service.configfile>08-authz-config.xml</config.authz.service.configfile>
         <config.restconf.configfile>10-rest-connector.xml</config.restconf.configfile>
+
         <!-- AuthN -->
         <ehcache.version>2.8.3</ehcache.version>
         <oauth.version>1.0.0</oauth.version>
-        <!-- Integration Test -->
+        <jersey.version>1.17</jersey.version>
+        <servlet.version>2.5</servlet.version>
+        <jta.version>1.1.1</jta.version>
+        <oltu.version>1.0.0</oltu.version>
+
+        <!-- Netconf plugin -->
+        <netconf.version>0.2.5-SNAPSHOT</netconf.version>
+
+        <!-- IdmLight -->
+        <glassfish.json.version>1.0.4</glassfish.json.version>
+        <jackson.version>1.9.2</jackson.version>
+        <jettison.version>1.1</jettison.version>
+        <sqlite.jdbc.version>3.7.2</sqlite.jdbc.version>
+
+        <!-- Test -->
         <exam.version>4.1.0</exam.version>
+        <aether.version>2.1.0</aether.version>
+        <javax.inject.version>1</javax.inject.version>
+        <mockito.version>1.9.5</mockito.version>
+        <servlet.tester.version>7.0.0.M2</servlet.tester.version>
     </properties>
 
     <dependencyManagement>
@@ -84,9 +122,14 @@
                 <version>${logback.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.core</artifactId>
-                <version>${osgi.core.version}</version>
+                <groupId>commons-codec</groupId>
+                <artifactId>commons-codec</artifactId>
+                <version>1.7</version>
+            </dependency>
+            <dependency>
+                <groupId>org.json</groupId>
+                <artifactId>json</artifactId>
+                <version>20131018</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools.model</groupId>
@@ -104,16 +147,117 @@
                 <version>${yang.ext.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-binding-config</artifactId>
-                <version>${sal.binding.config.version}</version>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-servlet</artifactId>
+                <version>${jersey.version}</version>
             </dependency>
             <dependency>
-                <groupId>commons-codec</groupId>
-                <artifactId>commons-codec</artifactId>
-                <version>1.7</version>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-core</artifactId>
+                <version>${jersey.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-server</artifactId>
+                <version>${jersey.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-json</artifactId>
+                <version>${jersey.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.core</artifactId>
+                <version>${osgi.core.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.compendium</artifactId>
+                <version>${osgi.compendium.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.dependencymanager</artifactId>
+                <version>${osgi.dm.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.metatype</artifactId>
+                <version>${osgi.metatype.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>net.sf.ehcache</groupId>
+                <artifactId>ehcache</artifactId>
+                <version>${ehcache.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jta_1.1_spec</artifactId>
+                <version>${jta.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.oltu.oauth2</groupId>
+                <artifactId>org.apache.oltu.oauth2.common</artifactId>
+                <version>${oltu.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.oltu.oauth2</groupId>
+                <artifactId>org.apache.oltu.oauth2.authzserver</artifactId>
+                <version>${oltu.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.oltu.oauth2</groupId>
+                <artifactId>org.apache.oltu.oauth2.resourceserver</artifactId>
+                <version>${oltu.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish</groupId>
+                <artifactId>javax.json</artifactId>
+                <version>${glassfish.json.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-core-asl</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-mapper-asl</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-jaxrs</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-xc</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.jettison</groupId>
+                <artifactId>jettison</artifactId>
+                <version>${jettison.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.xerial</groupId>
+                <artifactId>sqlite-jdbc</artifactId>
+                <version>${sqlite.jdbc.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
+                <version>${servlet.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.resteasy</groupId>
+                <artifactId>jaxrs-api</artifactId>
+                <version>${jaxrs.version}</version>
             </dependency>
 
+            <!-- Test stuff -->
             <dependency>
                 <groupId>org.opendaylight.yangtools.thirdparty</groupId>
                 <artifactId>xtend-lib-osgi</artifactId>
@@ -126,6 +270,72 @@
                 <version>4.8.1</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-simple</artifactId>
+                <version>1.7.7</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-all</artifactId>
+                <version>${mockito.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>pax-exam-container-karaf</artifactId>
+                <version>${exam.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>pax-exam-junit4</artifactId>
+                <version>${exam.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>pax-exam</artifactId>
+                <version>${exam.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>pax-exam-link-mvn</artifactId>
+                <version>${exam.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.url</groupId>
+                <artifactId>pax-url-aether</artifactId>
+                <version>${aether.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>javax.inject</groupId>
+                <artifactId>javax.inject</artifactId>
+                <version>${javax.inject.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.karaf.features</groupId>
+                <artifactId>org.apache.karaf.features.core</artifactId>
+                <version>${karaf.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.jersey.jersey-test-framework</groupId>
+                <artifactId>jersey-test-framework-grizzly2</artifactId>
+                <version>${jersey.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-servlet-tester</artifactId>
+                <version>${servlet.tester.version}</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -135,22 +345,54 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
+                    <version>${compiler.plugin.version}</version>
                     <configuration>
                         <source>${java.version.source}</source>
                         <target>${java.version.target}</target>
-                        <testSource>${java.version.source}</testSource>
-                        <testTarget>${java.version.target}</testTarget>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <version>${bundle.plugin.version}</version>
+                    <extensions>true</extensions>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>build-helper-maven-plugin</artifactId>
+                    <version>${helper.plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>${resource.plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>${surefire.plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>${javadoc.plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.ops4j.pax.exam</groupId>
+                    <artifactId>maven-paxexam-plugin</artifactId>
+                    <version>${paxexam.plugin.version}</version>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>
+
     <url>https://wiki.opendaylight.org/view/AAA:Main</url>
     <scm>
         <connection>scm:git:ssh://git.opendaylight.org:29418/aaa.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/aaa.git</developerConnection>
         <tag>HEAD</tag>
     </scm>
+
     <repositories>
         <!-- Opendaylight public group -->
         <repository>
@@ -175,9 +417,9 @@
             <id>opendaylight-snapshot</id>
             <name>opendaylight-snapshot</name>
             <url>http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
         </repository>
     </repositories>
 
@@ -202,9 +444,9 @@
             <id>opendaylight-snapshot</id>
             <name>central2</name>
             <url>http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
         </pluginRepository>
     </pluginRepositories>
 

diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml
index bbf2c6e87f600bf1502345cbdbf327e6d3472c9e..9cc792306c0a78967d143b4824fcf5d0f9567af1 100644 (file)
--- a/distribution-karaf/pom.xml
+++ b/distribution-karaf/pom.xml
@@ -1,258 +1,250 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>aaa.project</artifactId>
-    <groupId>org.opendaylight.aaa</groupId>
-    <version>0.1.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <artifactId>distribution-karaf</artifactId>
-  <groupId>org.opendaylight.aaa</groupId>
-  <packaging>pom</packaging>
-  <prerequisites>
-    <maven>3.0</maven>
-  </prerequisites>
-  <properties>
-    <branding.version>1.0.0-SNAPSHOT</branding.version>
-    <karaf.resources.version>1.4.2-SNAPSHOT</karaf.resources.version>
-    <karaf.version>3.0.1</karaf.version>
-  </properties>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>aaa.project</artifactId>
+        <groupId>org.opendaylight.aaa</groupId>
+        <version>0.1.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+    <artifactId>distribution-karaf</artifactId>
+    <packaging>pom</packaging>
+    <prerequisites>
+        <maven>3.0</maven>
+    </prerequisites>
 
-  <dependencies>
-    <!-- Basic Karaf dependencies -->
-    <dependency>
-      <groupId>org.apache.karaf.features</groupId>
-      <artifactId>framework</artifactId>
-      <version>${karaf.version}</version>
-      <type>kar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.karaf.features</groupId>
-      <artifactId>standard</artifactId>
-      <version>${karaf.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
+    <dependencies>
+        <!-- Basic Karaf dependencies -->
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <version>${karaf.version}</version>
+            <type>kar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <version>${karaf.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+        </dependency>
 
-    <!-- ODL Branding -->
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>karaf.branding</artifactId>
-      <version>${branding.version}</version>
-      <scope>compile</scope>
-    </dependency>
+        <!-- ODL Branding -->
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>karaf.branding</artifactId>
+            <version>${karaf.branding.version}</version>
+            <scope>compile</scope>
+        </dependency>
 
-    <!-- ODL Resources needed for karaf -->
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>opendaylight-karaf-resources</artifactId>
-      <version>${karaf.resources.version}</version>
-    </dependency>
+        <!-- ODL Resources needed for karaf -->
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>opendaylight-karaf-resources</artifactId>
+            <version>${karaf.resources.version}</version>
+        </dependency>
 
-    <!-- Project local feautures -->
-      <dependency>
-        <groupId>org.opendaylight.aaa</groupId>
-        <artifactId>features-aaa</artifactId>
-        <classifier>features</classifier>
-        <version>${project.version}</version>
-        <type>xml</type>
-        <scope>runtime</scope>
-      </dependency>
-  </dependencies>
+        <!-- Project local feautures -->
+        <dependency>
+            <groupId>org.opendaylight.aaa</groupId>
+            <artifactId>features-aaa</artifactId>
+            <classifier>features</classifier>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
 
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.eclipse.m2e</groupId>
-          <artifactId>lifecycle-mapping</artifactId>
-          <version>1.0.0</version>
-          <configuration>
-            <lifecycleMappingMetadata>
-              <pluginExecutions>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-bundle-plugin</artifactId>
-                    <versionRange>[0,)</versionRange>
-                    <goals>
-                      <goal>cleanVersions</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore></ignore>
-                  </action>
-                </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <versionRange>[0,)</versionRange>
-                    <goals>
-                      <goal>copy</goal>
-                      <goal>unpack</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore></ignore>
-                  </action>
-                </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.karaf.tooling</groupId>
-                    <artifactId>karaf-maven-plugin</artifactId>
-                    <versionRange>[0,)</versionRange>
-                    <goals>
-                      <goal>commands-generate-help</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore></ignore>
-                  </action>
-                </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.fusesource.scalate</groupId>
-                    <artifactId>maven-scalate-plugin</artifactId>
-                    <versionRange>[0,)</versionRange>
-                    <goals>
-                      <goal>sitegen</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore></ignore>
-                  </action>
-                </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.servicemix.tooling</groupId>
-                    <artifactId>depends-maven-plugin</artifactId>
-                    <versionRange>[0,)</versionRange>
-                    <goals>
-                      <goal>generate-depends-file</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore></ignore>
-                  </action>
-                </pluginExecution>
-              </pluginExecutions>
-            </lifecycleMappingMetadata>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.karaf.tooling</groupId>
-        <artifactId>karaf-maven-plugin</artifactId>
-        <version>${karaf.version}</version>
-        <extensions>true</extensions>
-        <configuration>
-          <bootFeatures>
-            <feature>standard</feature>
-            <!--
-              Optional TODO: Add entries here for the features you want in your local distro
-              Note: odl-restconf is a separate feature from odl-mdsal-broker.  If you want
-              restconf, you need to list it here explicitely.
-              Examples:
-              <feature>odl-toaster</feature>
-              <feature>odl-restconf</feature>
-            -->
-            <!-- Final TODO: Remove TODO Comments ;) -->
-          </bootFeatures>
-        </configuration>
-        <executions>
-          <execution>
-            <id>process-resources</id>
-            <goals>
-              <goal>install-kars</goal>
-            </goals>
-            <phase>process-resources</phase>
-          </execution>
-          <execution>
-            <id>package</id>
-            <goals>
-              <goal>instance-create-archive</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.6</version>
-        <executions>
-          <execution>
-            <id>copy</id>
-            <goals>
-              <goal>copy</goal>
-            </goals>
-            <phase>generate-resources</phase>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.opendaylight.controller</groupId>
-                  <artifactId>karaf.branding</artifactId>
-                  <version>${karaf.branding.version}</version>
-                  <outputDirectory>target/assembly/lib</outputDirectory>
-                  <destFileName>karaf.branding-${branding.version}.jar</destFileName>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-          <execution>
-            <id>unpack-karaf-resources</id>
-            <goals>
-              <goal>unpack-dependencies</goal>
-            </goals>
-            <phase>prepare-package</phase>
-            <configuration>
-             <outputDirectory>${project.build.directory}/assembly</outputDirectory>
-             <groupId>org.opendaylight.controller</groupId>
-             <includeArtifactIds>opendaylight-karaf-resources</includeArtifactIds>
-             <excludes>META-INF\/**</excludes>
-             <excludeTransitive>true</excludeTransitive>
-             <ignorePermissions>false</ignorePermissions>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-            <execution>
-                <phase>prepare-package</phase>
-                <goals>
-                    <goal>run</goal>
-                </goals>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.eclipse.m2e</groupId>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>org.apache.felix</groupId>
+                                        <artifactId>maven-bundle-plugin</artifactId>
+                                        <versionRange>[0,)</versionRange>
+                                        <goals>
+                                            <goal>cleanVersions</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore></ignore>
+                                    </action>
+                                </pluginExecution>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>org.apache.maven.plugins</groupId>
+                                        <artifactId>maven-dependency-plugin</artifactId>
+                                        <versionRange>[0,)</versionRange>
+                                        <goals>
+                                            <goal>copy</goal>
+                                            <goal>unpack</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore></ignore>
+                                    </action>
+                                </pluginExecution>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>org.apache.karaf.tooling</groupId>
+                                        <artifactId>karaf-maven-plugin</artifactId>
+                                        <versionRange>[0,)</versionRange>
+                                        <goals>
+                                            <goal>commands-generate-help</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore></ignore>
+                                    </action>
+                                </pluginExecution>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>org.fusesource.scalate</groupId>
+                                        <artifactId>maven-scalate-plugin</artifactId>
+                                        <versionRange>[0,)</versionRange>
+                                        <goals>
+                                            <goal>sitegen</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore></ignore>
+                                    </action>
+                                </pluginExecution>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>org.apache.servicemix.tooling</groupId>
+                                        <artifactId>depends-maven-plugin</artifactId>
+                                        <versionRange>[0,)</versionRange>
+                                        <goals>
+                                            <goal>generate-depends-file</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore></ignore>
+                                    </action>
+                                </pluginExecution>
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.karaf.tooling</groupId>
+                <artifactId>karaf-maven-plugin</artifactId>
+                <version>${karaf.version}</version>
+                <extensions>true</extensions>
                 <configuration>
-                  <tasks>
-                    <chmod perm="755">
-                        <fileset dir="${project.build.directory}/assembly/bin">
-                          <include name="karaf" />
-                          <include name="instance" />
-                          <include name="start" />
-                          <include name="stop" />
-                          <include name="status" />
-                          <include name="client" />
-                          <include name="shell" />
-                        </fileset>
-                    </chmod>
-                  </tasks>
+                    <bootFeatures>
+                        <feature>standard</feature>
+                        <!-- Optional TODO: Add entries here for the features 
+                            you want in your local distro Note: odl-restconf is a separate feature from 
+                            odl-mdsal-broker. If you want restconf, you need to list it here explicitely. 
+                            Examples: <feature>odl-toaster</feature> <feature>odl-restconf</feature> -->
+                        <!-- Final TODO: Remove TODO Comments ;) -->
+                    </bootFeatures>
                 </configuration>
-            </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <scm>
-    <connection>scm:git:ssh://git.opendaylight.org:29418/aaa.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/aaa.git</developerConnection>
-    <tag>HEAD</tag>
-    <url>https://git.opendaylight.org/gerrit/gitweb?p=aaa.git;a=summary</url>
-  </scm>
+                <executions>
+                    <execution>
+                        <id>process-resources</id>
+                        <goals>
+                            <goal>install-kars</goal>
+                        </goals>
+                        <phase>process-resources</phase>
+                    </execution>
+                    <execution>
+                        <id>package</id>
+                        <goals>
+                            <goal>instance-create-archive</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <id>copy</id>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.opendaylight.controller</groupId>
+                                    <artifactId>karaf.branding</artifactId>
+                                    <version>${karaf.branding.version}</version>
+                                    <outputDirectory>target/assembly/lib</outputDirectory>
+                                    <destFileName>karaf.branding-${karaf.branding.version}.jar</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>unpack-karaf-resources</id>
+                        <goals>
+                            <goal>unpack-dependencies</goal>
+                        </goals>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/assembly</outputDirectory>
+                            <groupId>org.opendaylight.controller</groupId>
+                            <includeArtifactIds>opendaylight-karaf-resources</includeArtifactIds>
+                            <excludes>META-INF\/**</excludes>
+                            <excludeTransitive>true</excludeTransitive>
+                            <ignorePermissions>false</ignorePermissions>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <chmod perm="755">
+                                    <fileset
+                                        dir="${project.build.directory}/assembly/bin">
+                                        <include name="karaf" />
+                                        <include name="instance" />
+                                        <include name="start" />
+                                        <include name="stop" />
+                                        <include name="status" />
+                                        <include name="client" />
+                                        <include name="shell" />
+                                    </fileset>
+                                </chmod>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <scm>
+        <connection>scm:git:ssh://git.opendaylight.org:29418/aaa.git</connection>
+        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/aaa.git</developerConnection>
+        <tag>HEAD</tag>
+        <url>https://git.opendaylight.org/gerrit/gitweb?p=aaa.git;a=summary</url>
+    </scm>
 </project>

diff --git a/features/pom.xml b/features/pom.xml
index d307e8a5e22ff9e4495077c4f8a5e9ca19edf0ce..df7eb544ac521ca99a9647c3f37fc9e7f65fe217 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2014 Hewlett-Packard Development Company, L.P. and others.
-    All rights reserved. This program and the accompanying materials are made
-    available under the terms of the Eclipse Public License v1.0 which accompanies
+<!-- Copyright (c) 2014 Hewlett-Packard Development Company, L.P. and others. 
+    All rights reserved. This program and the accompanying materials are made 
+    available under the terms of the Eclipse Public License v1.0 which accompanies 
     this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -18,12 +18,6 @@
 
     <properties>
         <features.file>features.xml</features.file>
-        <branding.version>1.0.0-SNAPSHOT</branding.version>
-        <karaf.resources.version>1.4.2-SNAPSHOT</karaf.resources.version>
-        <karaf.version>3.0.1</karaf.version>
-        <feature.test.version>0.6.2-SNAPSHOT</feature.test.version>
-        <karaf.empty.version>1.4.2-SNAPSHOT</karaf.empty.version>
-        <surefire.version>2.16</surefire.version>
     </properties>
 
     <dependencies>
@@ -31,102 +25,82 @@
         <dependency>
             <groupId>com.sun.jersey</groupId>
             <artifactId>jersey-servlet</artifactId>
-            <version>1.17</version>
         </dependency>
         <dependency>
             <groupId>com.sun.jersey</groupId>
             <artifactId>jersey-core</artifactId>
-            <version>1.17</version>
         </dependency>
         <dependency>
             <groupId>com.sun.jersey</groupId>
             <artifactId>jersey-server</artifactId>
-            <version>1.17</version>
         </dependency>
+        <dependency>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-json</artifactId>
+        </dependency>       
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.dependencymanager</artifactId>
-            <version>3.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.metatype</artifactId>
-            <version>1.0.10</version>
         </dependency>
         <dependency>
             <groupId>net.sf.ehcache</groupId>
             <artifactId>ehcache</artifactId>
-            <version>2.8.3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jta_1.1_spec</artifactId>
-            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.oltu.oauth2</groupId>
             <artifactId>org.apache.oltu.oauth2.common</artifactId>
-            <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.oltu.oauth2</groupId>
             <artifactId>org.apache.oltu.oauth2.authzserver</artifactId>
-            <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.oltu.oauth2</groupId>
             <artifactId>org.apache.oltu.oauth2.resourceserver</artifactId>
-            <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.8</version>
         </dependency>
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20131018</version>
         </dependency>
         <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-json</artifactId>
-            <version>1.17</version>
-        </dependency>
-        <dependency>
-          <groupId>org.glassfish</groupId>
-          <artifactId>javax.json</artifactId>
-          <version>1.0.4</version>
+            <groupId>org.glassfish</groupId>
+            <artifactId>javax.json</artifactId>
         </dependency>
         <dependency>
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-core-asl</artifactId>
-            <version>1.9.2</version>
         </dependency>
         <dependency>
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-mapper-asl</artifactId>
-            <version>1.9.2</version>
         </dependency>
         <dependency>
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-jaxrs</artifactId>
-            <version>1.9.2</version>
         </dependency>
         <dependency>
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-xc</artifactId>
-            <version>1.9.2</version>
         </dependency>
         <dependency>
             <groupId>org.codehaus.jettison</groupId>
             <artifactId>jettison</artifactId>
-            <version>1.1</version>
         </dependency>
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
-            <version>3.7.2</version>
         </dependency>
 
         <dependency>
@@ -235,7 +209,6 @@
             <type>xml</type>
         </dependency>
 
-
         <!-- odl-aaa-authn-plugin -->
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
@@ -259,7 +232,7 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>features-test</artifactId>
-            <version>${feature.test.version}</version>
+            <version>${yangtools.version}</version>
             <scope>test</scope>
         </dependency>
         <!-- dependency for opendaylight-karaf-empty for use by testing -->
@@ -316,7 +289,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire.version}</version>
                 <configuration>
                     <systemPropertyVariables>
                         <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>

diff --git a/pom.xml b/pom.xml
index dec3da6e9b6ed22c93223e4b7ef3d54c3f96c008..7610e69d1f3e03dab386524e215b7e36e3d1b8fb 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -30,11 +30,17 @@
     <module>aaa-authn-odl-plugin</module>
     <module>features</module>
     <module>distribution-karaf</module>
-    <!-- FIXME: Add integration tests back in
-    <module>aaa-it</module>
-    -->
   </modules>
 
+  <profiles>
+    <profile>
+       <id>aaa-it</id>
+       <modules>
+          <module>aaa-it</module>
+       </modules>
+    </profile>
+  </profiles>
+
   <build>
     <plugins>
       <plugin>