remove features-base and features-adsal

Change-Id: I7d5d82f38690fa392b9f2d40649b6129ce4785db
Signed-off-by: dongshu <dongs2011@gmail.com>

diff --git a/alto-commons/pom.xml b/alto-commons/pom.xml
index ba83c78819c979acc5bba3638e439f732adbdc77..17e75d5525733a219556018950c7e7326f6ee85b 100644 (file)
--- a/alto-commons/pom.xml
+++ b/alto-commons/pom.xml
@@ -23,6 +23,7 @@
             <Import-Package>*</Import-Package>
             <Export-Package>
               org.opendaylight.alto.commons.*;
+              org.opendaylight.alto.commons.helper.*;
               org.opendaylight.alto.commons.types.*;
               org.opendaylight.alto.commons.types.rfc7285.*;
             </Export-Package>

diff --git a/alto-northbound/pom.xml b/alto-northbound/pom.xml
index 86766b5062af602254bed2f64d81a54df1af8afe..1bf8b00e3a5cd7aa7305bbd641e2ef2d34bf00d6 100644 (file)
--- a/alto-northbound/pom.xml
+++ b/alto-northbound/pom.xml
@@ -32,17 +32,13 @@
               org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924,
               org.apache.commons.logging,
               com.sun.jersey.spi.container.servlet,
-              org.opendaylight.controller.sal.authorization,
-              org.opendaylight.controller.sal.packet.address,
               javax.ws.rs,
               javax.ws.rs.core,
               javax.xml.bind.annotation,
               javax.xml.bind,
               org.slf4j,
               org.apache.catalina.filters,
-              com.fasterxml.jackson.jaxrs.base,
-              com.fasterxml.jackson.jaxrs.json,
-              !org.codehaus.enunciate.jaxrs
+              !org.codehaus.enunciate.jaxrs,
             </Import-Package>
             <Web-ContextPath>/controller/nb/v2/alto</Web-ContextPath>
           </instructions>
@@ -58,26 +54,11 @@
       <artifactId>com.sun.jersey.jersey-servlet</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-common-util</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.codehaus.enunciate</groupId>
       <artifactId>enunciate-core-annotations</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>alto-model</artifactId>

diff --git a/features/pom.xml b/features/pom.xml
index 43392e7f4b1938dc36b7adb95597c41a25d3adb7..3b9b55ddcb63cd1938f3619e9d109feacae142ae 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -53,15 +53,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <type>xml</type>
     </dependency>
 
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-base</artifactId>
-      <version>${odl.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-mdsal</artifactId>
@@ -70,15 +61,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <scope>runtime</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-adsal</artifactId>
-      <version>${sal.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-restconf</artifactId>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 9920ea9335cbf2a831a58c00a1c9299090833e09..06caf98faebbf1deeeaadf3a28e008efde6363df 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -10,10 +10,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
   <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.controller/features-adsal/${sal.version}/xml/features</repository>
   <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
   <repository>mvn:org.opendaylight.controller/features-restconf/${mdsal.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.controller/features-base/${odl.version}/xml/features</repository>
   <repository>mvn:org.opendaylight.l2switch/features-l2switch/${l2switch.version}/xml/features</repository>
 
   <feature name='odl-alto-all' version='${project.version}' description='OpenDaylight :: alto :: All '>
@@ -32,8 +30,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <feature name='odl-alto-commons' version='${project.version}' description='OpenDaylight :: alto :: utils'>
     <feature version='${project.version}'>odl-alto-model</feature>
-    <feature version='${jackson.version}'>odl-base-jackson</feature>
-    <feature version='7.0.53'>odl-base-tomcat</feature>
+    <bundle start="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle>
+    <bundle start="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
+    <bundle start="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
+    <bundle>mvn:org.osgi/org.osgi.core/${osgi.core.version}</bundle>
     <bundle>mvn:org.opendaylight.alto/alto-commons/${project.version}</bundle>
   </feature>
 
@@ -72,25 +72,34 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <feature version='${project.version}'>odl-alto-commons</feature>
     <feature version='${mdsal.version}'>odl-mdsal-common</feature>
     <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
-    <feature version='${jackson.version}'>odl-base-jackson</feature>
     <feature version='${project.version}'>odl-alto-commons</feature>
     <bundle>mvn:org.opendaylight.alto/alto-services/${project.version}</bundle>
   </feature>
 
   <feature name='odl-alto-simple' version='${project.version}' description='OpenDaylight :: alto :: Simple'>
-    <feature version='${project.version}'>odl-alto-commons</feature>
     <feature version='${mdsal.version}'>odl-mdsal-common</feature>
     <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
-    <feature version='${sal.version}'>odl-adsal-core</feature>
-    <bundle>mvn:org.opendaylight.alto/service-api-rfc7285/${project.version}</bundle>
+    <feature version='${project.version}'>odl-alto-commons</feature>
     <configfile finalname='${configfile.directory}/alto-simple.xml'>mvn:org.opendaylight.alto/simple-impl/${project.version}/xml/config</configfile>
+    <bundle>mvn:org.opendaylight.alto/service-api-rfc7285/${project.version}</bundle>
     <bundle>mvn:org.opendaylight.alto/simple-impl/${project.version}</bundle>
   </feature>
 
+  <feature name='odl-alto-tomcat' version='${project.version}' description='Opendaylight :: alto :: Tomcat'>
+    <bundle start="true">mvn:orbit/javax.ejb/3.1.1.v201204261316</bundle>
+    <bundle start="true">mvn:orbit/javax.xml.rpc/1.1.0.v201005080400</bundle>
+    <bundle start="true">mvn:eclipselink/javax.persistence/2.0.4.v201112161009</bundle>
+    <bundle start="true">mvn:orbit/org.apache.catalina/${commons.catalina.version}</bundle>
+    <bundle start="true">mvn:orbit/org.apache.coyote/${commons.coyote.version}</bundle>
+    <bundle start="true">mvn:orbit/org.apache.juli.extras/${commons.juli.version}</bundle>
+    <bundle start="true">mvn:orbit/org.apache.tomcat.api/${commons.tomcat.api.version}</bundle>
+    <bundle start="true">mvn:orbit/org.apache.tomcat.util/${commons.tomcat.util.version}</bundle>
+  </feature>
+
   <feature name='odl-alto-northbound' version='${project.version}' description='Opendaylight :: alto :: Northbound'>
-    <feature version='${jersey.version}'>odl-base-jersey</feature>
     <feature>war</feature>
-    <feature version='${project.version}'>odl-alto-commons</feature>
+    <bundle>mvn:com.sun.jersey/jersey-servlet/${jersey.version}</bundle>
+    <feature version='${project.version}'>odl-alto-tomcat</feature>
     <feature version='${project.version}'>odl-alto-simple</feature>
     <bundle>mvn:org.opendaylight.alto/alto-northbound/${project.version}</bundle>
   </feature>

diff --git a/pom.xml b/pom.xml
index aa7226530f4380f84778108eae7a9c719ff6d934..d3ee411ff22795d00bb0d9180500433a3a20e84e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -65,6 +65,10 @@
     <l2switch.version>0.3.0-SNAPSHOT</l2switch.version>
     <ietf.topology.version>2013.10.21.8-SNAPSHOT</ietf.topology.version>
     <commons.catalina.version>7.0.53.v201406061610</commons.catalina.version>
+    <commons.coyote.version>7.0.53.v201406070630</commons.coyote.version>
+    <commons.juli.version>7.0.53.v201406060720</commons.juli.version>
+    <commons.tomcat.api.version>7.0.53.v201406060720</commons.tomcat.api.version>
+    <commons.tomcat.util.version>7.0.53.v201406070630</commons.tomcat.util.version>
   </properties>
 
   <dependencyManagement>