Remove shiro.ini conversion script

[aaa.git] / aaa-shiro / impl / pom.xml

diff --git a/aaa-shiro/impl/pom.xml b/aaa-shiro/impl/pom.xml
index 946fbdd3cb30fe382ee528195af6aa31a4ea760d..43d0774171f75ad563ebc4c5153ae348e73a4552 100644 (file)
--- a/aaa-shiro/impl/pom.xml
+++ b/aaa-shiro/impl/pom.xml
@@ -64,10 +64,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <groupId>org.apache.oltu.oauth2</groupId>
             <artifactId>org.apache.oltu.oauth2.resourceserver</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.jaxrs</groupId>
-            <artifactId>jackson-jaxrs-json-provider</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>aaa-cert</artifactId>
@@ -88,6 +84,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <version>3.2.2</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.dependencymanager</artifactId>
@@ -115,21 +116,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.dependencymanager</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>
         <!-- JSON JAXB Stuff -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -165,12 +159,29 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <scope>provided</scope>
         </dependency>
 
-        <!-- Testing Dependencies -->
-        <dependency>
-            <groupId>com.sun.jersey.jersey-test-framework</groupId>
-            <artifactId>jersey-test-framework-grizzly2</artifactId>
-            <scope>test</scope>
-        </dependency>
+    <!-- Testing Dependencies -->
+        <dependency>
+      <groupId>net.sf.ehcache</groupId>
+      <artifactId>ehcache</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.immutables</groupId>
+      <artifactId>value</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+
+    <!-- Testing Dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -217,6 +228,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <version>7.0.0.pre5</version>
             <scope>test</scope>
         </dependency>
+    <dependency>
+      <groupId>com.google.truth</groupId>
+      <artifactId>truth</artifactId>
+    </dependency>
     </dependencies>
 
     <build>
@@ -230,16 +245,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
                         <Export-Package>
                             org.opendaylight.aaa.impl.shiro,
+                            org.opendaylight.aaa.impl.shiro.idm,
                             org.opendaylight.aaa.impl.shiro.tokenauthrealm,
                             org.opendaylight.aaa.impl.shiro.tokenauthrealm.auth,
                             org.opendaylight.aaa.shiro,
                             org.opendaylight.aaa.shiro.filters,
                             org.opendaylight.aaa.shiro.realm,
-                            org.opendaylight.aaa.shiro.web.env
+              org.opendaylight.aaa.shiro.web.env,
+              org.opendaylight.aaa.impl.datastore.h2.*,
                         </Export-Package>
                         <Import-Package>
                             com.google.*,
-                            com.sun.jersey.spi.container.servlet,
+                            com.sun.jersey.*,
                             javax.servlet.http,
                             javax.servlet.*,
                             org.apache.oltu.oauth2.*,
@@ -259,8 +276,29 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
                             org.osgi.service.http.*,
                             org.apache.shiro.web.*,
                             org.apache.shiro.*,
-                            org.slf4j.*
+              org.slf4j.*,
+              net.sf.ehcache.*,
+              !javax.naming,
+              !javax.naming.spi,
+              !javax.servlet,
+              !javax.servlet.http,
+              !javax.tools,
+              !javax.transaction.xa,
+              !org.apache.lucene.analysis,
+              !org.apache.lucene.analysis.standard,
+              !org.apache.lucene.document,
+              !org.apache.lucene.index,
+              !org.apache.lucene.queryParser,
+              !org.apache.lucene.search,
+              !org.apache.lucene.store,
+              !org.apache.lucene.util,
+              !com.vividsolutions.jts.geom,
+              !com.vividsolutions.jts.io,
+              !org.osgi.service.jdbc,
+              !javax.annotation,
+              !javax.naming
                         </Import-Package>
+            <Embed-Dependency>h2;scope=compile|runtime;inline=true</Embed-Dependency>
                         <Web-ContextPath>/auth</Web-ContextPath>
                     </instructions>
                 </configuration>
@@ -283,23 +321,16 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
                                     <type>py</type>
                                     <classifier>idmtool</classifier>
                                 </artifact>
-                                <!-- attach authn.cfg as an artifact -->
-                                <artifact>
-                                    <file>${project.build.directory}/classes/authn.cfg</file>
-                                    <type>cfg</type>
-                                    <classifier>config</classifier>
-                                </artifact>
                                 <!-- attach aaa-app-config.xml as an artifact -->
                                 <artifact>
                                     <file>${project.build.directory}/classes/initial/aaa-app-config.xml</file>
                                     <type>xml</type>
                                     <classifier>aaa-app-config</classifier>
                                 </artifact>
-                                <!-- attach convert-shiro-ini-to-rest-payload.py as an artifact -->
                                 <artifact>
-                                    <file>${project.build.directory}/classes/convert-shiro-ini-to-rest-payload.py</file>
-                                    <type>py</type>
-                                    <classifier>convert-shiro-ini</classifier>
+                                    <file>${project.build.directory}/classes/initial/aaa-datastore-config.xml</file>
+                                    <type>xml</type>
+                                    <classifier>aaa-datastore-config</classifier>
                                 </artifact>
                             </artifacts>
                         </configuration>