Formatting cleanup of POM files 63/363/1
authorDavid Erickson <daviderickson@cs.stanford.edu>
Sat, 18 May 2013 22:50:54 +0000 (15:50 -0700)
committerDavid Erickson <daviderickson@cs.stanford.edu>
Sat, 18 May 2013 22:50:54 +0000 (15:50 -0700)
Replaced tabs with two spaces and removed
some extraneous lines and tail whitespace.

Change-Id: I3dbc766b3ffabf76a17a04454beb69933f67f8a0
Signed-off-by: David Erickson <daviderickson@cs.stanford.edu>
38 files changed:
opendaylight/arphandler/pom.xml
opendaylight/clustering/services/pom.xml
opendaylight/clustering/services_implementation/pom.xml
opendaylight/clustering/test/pom.xml
opendaylight/configuration/api/pom.xml
opendaylight/configuration/implementation/pom.xml
opendaylight/containermanager/api/pom.xml
opendaylight/distribution/opendaylight/pom.xml
opendaylight/forwarding/staticrouting/pom.xml
opendaylight/forwardingrulesmanager/api/pom.xml
opendaylight/hosttracker/api/pom.xml
opendaylight/hosttracker/implementation/pom.xml
opendaylight/hosttracker/integrationtest/pom.xml
opendaylight/northbound/commons/pom.xml
opendaylight/northbound/hosttracker/pom.xml
opendaylight/northbound/staticrouting/pom.xml
opendaylight/northbound/statistics/pom.xml
opendaylight/northbound/subnets/pom.xml
opendaylight/northbound/switchmanager/pom.xml
opendaylight/northbound/topology/pom.xml
opendaylight/protocol_plugins/openflow/pom.xml
opendaylight/routing/dijkstra_implementation/pom.xml
opendaylight/sal/api/pom.xml
opendaylight/sal/implementation/pom.xml
opendaylight/samples/loadbalancer/pom.xml
opendaylight/samples/northbound/loadbalancer/pom.xml
opendaylight/samples/simpleforwarding/pom.xml
opendaylight/security/pom.xml
opendaylight/switchmanager/api/pom.xml
opendaylight/switchmanager/implementation/pom.xml
opendaylight/topologymanager/pom.xml
opendaylight/usermanager/pom.xml
opendaylight/web/devices/pom.xml
opendaylight/web/flows/pom.xml
opendaylight/web/root/pom.xml
opendaylight/web/topology/pom.xml
opendaylight/web/troubleshoot/pom.xml
third-party/openflowj/pom.xml

index e95512d..62f93b2 100644 (file)
   <build>
     <plugins>
       <plugin>
-       <groupId>org.apache.felix</groupId>
-       <artifactId>maven-bundle-plugin</artifactId>
-       <version>2.3.6</version>
-       <extensions>true</extensions>
-       <configuration>
-         <instructions>
-           <Import-Package>
-                 org.opendaylight.controller.sal.core,
-             org.opendaylight.controller.sal.utils,
-             org.opendaylight.controller.sal.packet,
-          org.opendaylight.controller.switchmanager,
-          org.opendaylight.controller.hosttracker,
-             org.opendaylight.controller.hosttracker.hostAware,
-          org.apache.felix.dm,
-          org.osgi.service.component,
-             org.slf4j
-           </Import-Package>
-        <Bundle-Activator>
-          org.opendaylight.controller.arphandler.internal.Activator
-               </Bundle-Activator>
-         </instructions>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.3.6</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Import-Package>
+              org.opendaylight.controller.sal.core,
+              org.opendaylight.controller.sal.utils,
+              org.opendaylight.controller.sal.packet,
+              org.opendaylight.controller.switchmanager,
+              org.opendaylight.controller.hosttracker,
+              org.opendaylight.controller.hosttracker.hostAware,
+              org.apache.felix.dm,
+              org.osgi.service.component,
+              org.slf4j
+            </Import-Package>
+            <Bundle-Activator>
+              org.opendaylight.controller.arphandler.internal.Activator
+            </Bundle-Activator>
+          </instructions>
           <manifestLocation>${project.basedir}/META-INF</manifestLocation>
-       </configuration>
+        </configuration>
       </plugin>
     </plugins>
   </build>
index 36462ba..628d2b1 100644 (file)
   <build>
     <plugins>
       <plugin>
-       <groupId>org.apache.felix</groupId>
-       <artifactId>maven-bundle-plugin</artifactId>
-       <version>2.3.6</version>
-       <extensions>true</extensions>
-       <configuration>
-         <instructions>
-           <Export-Package>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.3.6</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Export-Package>
               org.opendaylight.controller.clustering.services
             </Export-Package>
             <Import-Package>
               javax.transaction
             </Import-Package>
-         </instructions>
+          </instructions>
           <manifestLocation>${project.basedir}/META-INF</manifestLocation>
-       </configuration>
+        </configuration>
       </plugin>
     </plugins>
   </build>
index 6edb50b..d6ff7ca 100644 (file)
         </plugin>
       </plugins>
     </pluginManagement>
-    <plugins>
-      <plugin>
-       <groupId>org.apache.felix</groupId>
-       <artifactId>maven-bundle-plugin</artifactId>
-       <version>2.3.6</version>
-       <extensions>true</extensions>
-       <configuration>
-         <instructions>
-           <Import-Package>
-              org.slf4j,
-              !org.jboss.*,
-              !bsh*,
-              !net.jcip.*,
-              javax.transaction,
-              *,
-              org.opendaylight.controller.clustering.services,
-              org.opendaylight.controller.sal.core
-            </Import-Package>
-            <Bundle-Activator>
-              org.opendaylight.controller.clustering.services_implementation.internal.Activator
-            </Bundle-Activator>
-            <!-- Add in the DynamicImport-Package ONLY the packages that -->
-            <!-- contains types that MUST be unmarshalled by the -->
-            <!-- infinispan. They need to be wired at runtime even during -->
-            <!-- the bundle is already RESOLVED, but at the same time if -->
-            <!-- those are missing the bundle will still come up, this is -->
-            <!-- why those dependencies ends in the DynamicImport-Package -->
-            <!-- rather in the Import-Package  -->
-            <DynamicImport-Package>
-              *
-            </DynamicImport-Package>
-            <Embed-Dependency>
-              infinispan-core,jgroups,jboss-marshalling-river,jboss-marshalling,jboss-logging,staxmapper;type=!pom;inline=false
-            </Embed-Dependency>
-            <Embed-Transitive>
-              true
-            </Embed-Transitive>
-         </instructions>
+  <plugins>
+    <plugin>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>maven-bundle-plugin</artifactId>
+      <version>2.3.6</version>
+      <extensions>true</extensions>
+      <configuration>
+        <instructions>
+          <Import-Package>
+            org.slf4j,
+            !org.jboss.*,
+            !bsh*,
+            !net.jcip.*,
+            javax.transaction,
+            *,
+            org.opendaylight.controller.clustering.services,
+            org.opendaylight.controller.sal.core
+          </Import-Package>
+          <Bundle-Activator>
+            org.opendaylight.controller.clustering.services_implementation.internal.Activator
+          </Bundle-Activator>
+          <!-- Add in the DynamicImport-Package ONLY the packages that -->
+          <!-- contains types that MUST be unmarshalled by the -->
+          <!-- infinispan. They need to be wired at runtime even during -->
+          <!-- the bundle is already RESOLVED, but at the same time if -->
+          <!-- those are missing the bundle will still come up, this is -->
+          <!-- why those dependencies ends in the DynamicImport-Package -->
+          <!-- rather in the Import-Package -->
+          <DynamicImport-Package>
+            *
+          </DynamicImport-Package>
+          <Embed-Dependency>
+            infinispan-core,jgroups,jboss-marshalling-river,jboss-marshalling,jboss-logging,staxmapper;type=!pom;inline=false
+          </Embed-Dependency>
+          <Embed-Transitive>
+            true
+          </Embed-Transitive>
+        </instructions>
         <manifestLocation>${project.basedir}/META-INF</manifestLocation>
-       </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-        <configuration>
-          <includes>org.opendaylight.controller.*</includes>
-        </configuration>
-        <executions>
-          <execution>
-            <id>pre-test</id>
-            <goals>
-              <goal>prepare-agent</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>post-test</id>
-            <phase>test</phase>
-            <goals>
-              <goal>report</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>      
-    </plugins>
+      </configuration>
+    </plugin>
+    <plugin>
+      <groupId>org.jacoco</groupId>
+      <artifactId>jacoco-maven-plugin</artifactId>
+      <configuration>
+        <includes>org.opendaylight.controller.*</includes>
+      </configuration>
+      <executions>
+        <execution>
+          <id>pre-test</id>
+          <goals>
+            <goal>prepare-agent</goal>
+          </goals>
+        </execution>
+        <execution>
+          <id>post-test</id>
+          <phase>test</phase>
+          <goals>
+            <goal>report</goal>
+          </goals>
+        </execution>
+      </executions>
+    </plugin>
+  </plugins>
   </build>
   <dependencies>
     <dependency>
index 161e7a9..695e939 100644 (file)
   <packaging>bundle</packaging>
 
   <build>
-    <plugins>
-      <plugin>
-       <groupId>org.apache.felix</groupId>
-       <artifactId>maven-bundle-plugin</artifactId>
-       <version>2.3.6</version>
-       <extensions>true</extensions>
-       <configuration>
-         <instructions>
-           <Import-Package>
-             org.slf4j,
-              javax.transaction,
-              org.eclipse.osgi.framework.console,
-              ch.qos.logback.classic,
-              org.opendaylight.controller.clustering.services
-            </Import-Package>
-            <Service-Component>
-              OSGI-INF/component.xml
-            </Service-Component>
-         </instructions>
+  <plugins>
+    <plugin>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>maven-bundle-plugin</artifactId>
+      <version>2.3.6</version>
+      <extensions>true</extensions>
+      <configuration>
+        <instructions>
+          <Import-Package>
+            org.slf4j,
+            javax.transaction,
+            org.eclipse.osgi.framework.console,
+            ch.qos.logback.classic,
+            org.opendaylight.controller.clustering.services
+          </Import-Package>
+          <Service-Component>
+            OSGI-INF/component.xml
+          </Service-Component>
+        </instructions>
         <manifestLocation>${project.basedir}/META-INF</manifestLocation>
-       </configuration>
-      </plugin>
-    </plugins>
+      </configuration>
+    </plugin>
+  </plugins>
   </build>
   <dependencies>
     <dependency>
index c7eeb3c..ff7bbe4 100644 (file)
   <build>
     <plugins>
       <plugin>
-       <groupId>org.apache.felix</groupId>
+        <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <version>2.3.6</version>
         <extensions>true</extensions>
-       <configuration>
-         <instructions>
-           <Import-Package>
+        <configuration>
+          <instructions>
+            <Import-Package>
               org.opendaylight.controller.sal.utils,
               org.apache.commons.lang3.builder
-           </Import-Package>
-           <Export-Package>
+            </Import-Package>
+            <Export-Package>
               org.opendaylight.controller.configuration
-           </Export-Package>
-         </instructions>
+            </Export-Package>
+          </instructions>
           <manifestLocation>${project.basedir}/META-INF</manifestLocation>
-       </configuration>
+        </configuration>
       </plugin>
     </plugins>
   </build>
   <dependencies>
-       <dependency>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>sal</artifactId>
-               <version>0.5.0-SNAPSHOT</version>
-       </dependency> 
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal</artifactId>
+      <version>0.5.0-SNAPSHOT</version>
+    </dependency>
   </dependencies>
 </project>
index 78e4de8..232a505 100644 (file)
       <artifactId>configuration</artifactId>
       <version>0.4.0-SNAPSHOT</version>
     </dependency>
-       <dependency>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>sal</artifactId>
-               <version>0.5.0-SNAPSHOT</version>
-       </dependency> 
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal</artifactId>
+      <version>0.5.0-SNAPSHOT</version>
+    </dependency>
   </dependencies>
 </project>
index ac6757f..c4203bf 100644 (file)
   <build>
     <plugins>
       <plugin>
-       <groupId>org.apache.felix</groupId>
+        <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <version>2.3.6</version>
         <extensions>true</extensions>
-       <configuration>
-         <instructions>
-           <Import-Package>
-                 org.opendaylight.controller.sal.action,
-                 org.opendaylight.controller.sal.authorization,
-                 org.opendaylight.controller.sal.core,
-                 org.opendaylight.controller.sal.flowprogrammer,
-                 org.opendaylight.controller.sal.match,
+        <configuration>
+          <instructions>
+            <Import-Package>
+              org.opendaylight.controller.sal.action,
+              org.opendaylight.controller.sal.authorization,
+              org.opendaylight.controller.sal.core,
+              org.opendaylight.controller.sal.flowprogrammer,
+              org.opendaylight.controller.sal.match,
               org.opendaylight.controller.sal.reader,
               org.opendaylight.controller.sal.utils,
               org.apache.commons.lang3.builder
-           </Import-Package>
-           <Export-Package>
+            </Import-Package>
+            <Export-Package>
               org.opendaylight.controller.containermanager
-           </Export-Package>
-         </instructions>
+            </Export-Package>
+          </instructions>
           <manifestLocation>${project.basedir}/META-INF</manifestLocation>
-       </configuration>
+        </configuration>
       </plugin>
     </plugins>
   </build>
   <dependencies>
-       <dependency>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>sal</artifactId>
-               <version>0.5.0-SNAPSHOT</version>
-       </dependency> 
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal</artifactId>
+      <version>0.5.0-SNAPSHOT</version>
+    </dependency>
   </dependencies>
 </project>
index 51885fe..3ebd4c8 100644 (file)
     <module>../../topologymanager</module>
     <module>../../usermanager</module>
     <module>../../security</module>
-    
-    
+
+
     <module>../../../third-party/openflowj</module>
     <module>../../../third-party/net.sf.jung2</module>
     <module>../../../third-party/jersey-servlet</module>
-    
+
     <!-- SAL bundles -->
     <module>../../sal/api</module>
     <module>../../sal/implementation</module>
-    
+
     <!--  Web bundles -->
     <module>../../web/root</module>
     <module>../../web/flows</module>
     <module>../../web/devices</module>
     <module>../../web/troubleshoot</module>
     <module>../../web/topology</module>
-    
+
     <!-- Northbound bundles -->
-    
-     
     <module>../../northbound/commons</module>
     <module>../../northbound/topology</module>
     <module>../../northbound/staticrouting</module>
     <module>../../northbound/hosttracker</module>
     <module>../../northbound/subnets</module>
     <module>../../northbound/switchmanager</module>
-    
+
     <!-- Debug and logging -->
     <module>../../logging/bridge</module>
 
-       <!-- Southbound bundles -->
+    <!-- Southbound bundles -->
     <module>../../protocol_plugins/openflow</module>
     <module>../../protocol_plugins/stub</module>
-       
+
     <!-- Samples -->
     <module>../../samples/simpleforwarding</module>
     <module>../../samples/loadbalancer</module>
     <module>../../samples/northbound/loadbalancer</module>
   </modules>
-  
+
   <build>
     <plugins>
       <plugin>
index f874972..80eea57 100644 (file)
   <build>
     <plugins>
       <plugin>
-       <groupId>org.apache.felix</groupId>
-       <artifactId>maven-bundle-plugin</artifactId>
-       <version>2.3.6</version>
-       <extensions>true</extensions>
-       <configuration>
-         <instructions>
-           <Import-Package>
-                         org.opendaylight.controller.sal.utils,
-                         org.opendaylight.controller.sal.core,
-                         org.opendaylight.controller.configuration,
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.3.6</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Import-Package>
+              org.opendaylight.controller.sal.utils,
+              org.opendaylight.controller.sal.core,
+              org.opendaylight.controller.configuration,
               org.opendaylight.controller.forwardingrulesmanager,
               org.opendaylight.controller.hosttracker,
               org.opendaylight.controller.hosttracker.hostAware,
               org.apache.felix.dm,
               org.apache.commons.lang3.builder
             </Import-Package>
-           <Export-Package>
+            <Export-Package>
               org.opendaylight.controller.forwarding.staticrouting
             </Export-Package>
-               <Bundle-Activator>
-                 org.opendaylight.controller.forwarding.staticrouting.internal.Activator
-               </Bundle-Activator>
-         </instructions>
+            <Bundle-Activator>
+              org.opendaylight.controller.forwarding.staticrouting.internal.Activator
+            </Bundle-Activator>
+          </instructions>
           <manifestLocation>${project.basedir}/META-INF</manifestLocation>
-       </configuration>
+        </configuration>
       </plugin>
     </plugins>
   </build>
       <version>4.8.1</version>
       <scope>test</scope>
     </dependency>
-       <dependency>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>sal</artifactId>
-               <version>0.5.0-SNAPSHOT</version>
-       </dependency>    
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal</artifactId>
+      <version>0.5.0-SNAPSHOT</version>
+    </dependency>
   </dependencies>
 </project>
index 2fed2dc..b2a124b 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.controller</groupId>
   <build>
     <plugins>
       <plugin>
-       <groupId>org.apache.felix</groupId>
-       <artifactId>maven-bundle-plugin</artifactId>
-       <version>2.3.6</version>
-       <extensions>true</extensions>
-       <configuration>
-         <instructions>
-           <Include-Resource>
-           </Include-Resource>
-           <Export-Package>
-             org.opendaylight.controller.forwardingrulesmanager
-           </Export-Package>
-           <Import-Package>
-                     org.opendaylight.controller.clustering.services,
-                     org.opendaylight.controller.configuration,
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.3.6</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Include-Resource>
+            </Include-Resource>
+            <Export-Package>
+              org.opendaylight.controller.forwardingrulesmanager
+            </Export-Package>
+            <Import-Package>
+              org.opendaylight.controller.clustering.services,
+              org.opendaylight.controller.configuration,
               org.opendaylight.controller.hosttracker,
               org.opendaylight.controller.hosttracker.hostAware,
               org.opendaylight.controller.switchmanager,
@@ -37,7 +38,7 @@
               org.opendaylight.controller.sal.core,
               org.opendaylight.controller.sal.flowprogrammer,
               org.opendaylight.controller.sal.match,
-                         org.opendaylight.controller.sal.utils,
+              org.opendaylight.controller.sal.utils,
               org.opendaylight.controller.sal.packet,
               javax.xml.bind.annotation,
               javax.xml.bind,
               org.osgi.service.component,
               org.slf4j,
               org.eclipse.osgi.framework.console,
-                         org.osgi.framework
-           </Import-Package>
-        <Require-Bundle>
+              org.osgi.framework
+            </Import-Package>
+            <Require-Bundle>
               org.opendaylight.controller.hosttracker
-        </Require-Bundle>
+            </Require-Bundle>
             <Service-Component>
             </Service-Component>
           </instructions>
@@ -69,7 +70,7 @@
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>configuration</artifactId>
       <version>0.4.0-SNAPSHOT</version>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>clustering.services</artifactId>
       <artifactId>switchmanager</artifactId>
       <version>0.4.0-SNAPSHOT</version>
     </dependency>
-       <dependency>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>sal</artifactId>
-               <version>0.5.0-SNAPSHOT</version>
-       </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal</artifactId>
+      <version>0.5.0-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
index 5ed95e7..6da6483 100644 (file)
@@ -2,71 +2,71 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
   <modelVersion>4.0.0</modelVersion>\r
-       <parent>\r
-               <groupId>org.opendaylight.controller</groupId>\r
-               <artifactId>commons.opendaylight</artifactId>\r
-               <version>1.4.0-SNAPSHOT</version>\r
-               <relativePath>../../commons/opendaylight</relativePath>\r
-       </parent>\r
-       <artifactId>hosttracker</artifactId>\r
-       <version>0.4.0-SNAPSHOT</version>\r
-       <packaging>bundle</packaging>\r
+  <parent>\r
+    <groupId>org.opendaylight.controller</groupId>\r
+    <artifactId>commons.opendaylight</artifactId>\r
+    <version>1.4.0-SNAPSHOT</version>\r
+    <relativePath>../../commons/opendaylight</relativePath>\r
+  </parent>\r
+  <artifactId>hosttracker</artifactId>\r
+  <version>0.4.0-SNAPSHOT</version>\r
+  <packaging>bundle</packaging>\r
 \r
-       <build>\r
-               <plugins>\r
-                       <plugin>\r
-                               <groupId>org.apache.felix</groupId>\r
-                               <artifactId>maven-bundle-plugin</artifactId>\r
-                               <version>2.3.6</version>\r
-                               <extensions>true</extensions>\r
-                               <configuration>\r
-                                       <instructions>\r
-                                               <Export-Package>\r
-                                                       org.opendaylight.controller.hosttracker,\r
-                                                       org.opendaylight.controller.hosttracker.hostAware\r
-                                               </Export-Package>\r
-                                               <Import-Package>\r
-                                                       org.opendaylight.controller.sal.core,\r
-                                                       org.opendaylight.controller.sal.utils,\r
-                                                       org.opendaylight.controller.topologymanager,\r
-                                                       org.opendaylight.controller.sal.packet.address,\r
-                                                       org.opendaylight.controller.switchmanager,\r
-                                                       org.opendaylight.controller.clustering.services,\r
-                                                       javax.xml.bind.annotation,\r
-                                                       javax.xml.bind,\r
-                                                       org.apache.felix.dm,\r
-                                                       org.apache.commons.lang3.builder,\r
-                                                       org.osgi.service.component,\r
-                                                       org.slf4j,\r
-                                                       org.eclipse.osgi.framework.console,\r
-                                                       org.osgi.framework\r
-                                               </Import-Package>\r
-                                       </instructions>\r
+  <build>\r
+    <plugins>\r
+      <plugin>\r
+        <groupId>org.apache.felix</groupId>\r
+        <artifactId>maven-bundle-plugin</artifactId>\r
+        <version>2.3.6</version>\r
+        <extensions>true</extensions>\r
+        <configuration>\r
+          <instructions>\r
+            <Export-Package>\r
+              org.opendaylight.controller.hosttracker,\r
+              org.opendaylight.controller.hosttracker.hostAware\r
+            </Export-Package>\r
+            <Import-Package>\r
+              org.opendaylight.controller.sal.core,\r
+              org.opendaylight.controller.sal.utils,\r
+              org.opendaylight.controller.topologymanager,\r
+              org.opendaylight.controller.sal.packet.address,\r
+              org.opendaylight.controller.switchmanager,\r
+              org.opendaylight.controller.clustering.services,\r
+              javax.xml.bind.annotation,\r
+              javax.xml.bind,\r
+              org.apache.felix.dm,\r
+              org.apache.commons.lang3.builder,\r
+              org.osgi.service.component,\r
+              org.slf4j,\r
+              org.eclipse.osgi.framework.console,\r
+              org.osgi.framework\r
+            </Import-Package>\r
+          </instructions>\r
           <manifestLocation>${project.basedir}/META-INF</manifestLocation>\r
-                               </configuration>\r
-                       </plugin>\r
-               </plugins>\r
-       </build>\r
-       <dependencies>\r
-               <dependency>\r
-                       <groupId>org.opendaylight.controller</groupId>\r
-                       <artifactId>topologymanager</artifactId>\r
-                       <version>0.4.0-SNAPSHOT</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.opendaylight.controller</groupId>\r
-                       <artifactId>switchmanager</artifactId>\r
-                       <version>0.4.0-SNAPSHOT</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.opendaylight.controller</groupId>\r
-                       <artifactId>clustering.services</artifactId>\r
-                       <version>0.4.0-SNAPSHOT</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.opendaylight.controller</groupId>\r
-                       <artifactId>sal</artifactId>\r
-                       <version>0.5.0-SNAPSHOT</version>\r
-               </dependency>\r
-       </dependencies>\r
+        </configuration>\r
+      </plugin>\r
+    </plugins>\r
+  </build>\r
+  <dependencies>\r
+    <dependency>\r
+      <groupId>org.opendaylight.controller</groupId>\r
+      <artifactId>topologymanager</artifactId>\r
+      <version>0.4.0-SNAPSHOT</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.opendaylight.controller</groupId>\r
+      <artifactId>switchmanager</artifactId>\r
+      <version>0.4.0-SNAPSHOT</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.opendaylight.controller</groupId>\r
+      <artifactId>clustering.services</artifactId>\r
+      <version>0.4.0-SNAPSHOT</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.opendaylight.controller</groupId>\r
+      <artifactId>sal</artifactId>\r
+      <version>0.5.0-SNAPSHOT</version>\r
+    </dependency>\r
+  </dependencies>\r
 </project>\r
index 35a2238..a2ebf1a 100644 (file)
 <?xml version="1.0" encoding="UTF-8"?>
 <project
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-       xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>commons.opendaylight</artifactId>
-               <version>1.4.0-SNAPSHOT</version>
-               <relativePath>../../commons/opendaylight</relativePath>
-       </parent>
-       <artifactId>hosttracker.implementation</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
-       <packaging>bundle</packaging>
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.opendaylight.controller</groupId>
+    <artifactId>commons.opendaylight</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <relativePath>../../commons/opendaylight</relativePath>
+  </parent>
+  <artifactId>hosttracker.implementation</artifactId>
+  <version>0.4.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
 
-       <properties>
-               <!-- Sonar properties using jacoco to retrieve integration test results -->
-               <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
-               <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
-               <sonar.jacoco.Reportpath>target/jacoco.exec</sonar.jacoco.Reportpath>
-               <sonar.jacoco.itReportPath>target/jacoco-it.exec</sonar.jacoco.itReportPath>
-               <sonar.language>java</sonar.language>
-       </properties>
-       
-       <build>
-           <pluginManagement>
-                       <plugins>
-                               <plugin>
-                                       <groupId>org.jacoco</groupId>
-                                       <artifactId>jacoco-maven-plugin</artifactId>
-                                       <version>0.5.3.201107060350</version>
-                               </plugin>
-                       </plugins>
-               </pluginManagement>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <version>2.3.6</version>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <instructions>
-                                               <Export-Package>
-                                               </Export-Package>
-                                               <Import-Package>
-                                                       org.opendaylight.controller.sal.core,
-                                                       org.opendaylight.controller.sal.utils,
-                                                       org.opendaylight.controller.sal.topology,
-                                                       org.opendaylight.controller.hosttracker,
-                                                       org.opendaylight.controller.topologymanager,
-                                                       org.opendaylight.controller.sal.packet.address,
-                                                       org.opendaylight.controller.switchmanager,
-                                                       org.opendaylight.controller.clustering.services,
-                                                       org.opendaylight.controller.hosttracker.hostAware,
-                                                       javax.xml.bind.annotation,
-                                                       javax.xml.bind,
-                                                       org.apache.felix.dm,
-                                                       org.apache.commons.lang3.builder,
-                                                       org.osgi.service.component,
-                                                       org.slf4j,
-                                                       org.eclipse.osgi.framework.console,
-                                                       org.osgi.framework
-                                               </Import-Package>
-                                               <Bundle-Activator>
-                                                       org.opendaylight.controller.hosttracker.internal.Activator
-                                               </Bundle-Activator>
-                                               <Service-Component>
-                                               </Service-Component>
-                                       </instructions>
+  <properties>
+    <!-- Sonar properties using jacoco to retrieve integration test results -->
+    <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
+    <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
+    <sonar.jacoco.Reportpath>target/jacoco.exec</sonar.jacoco.Reportpath>
+    <sonar.jacoco.itReportPath>target/jacoco-it.exec</sonar.jacoco.itReportPath>
+    <sonar.language>java</sonar.language>
+  </properties>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.jacoco</groupId>
+          <artifactId>jacoco-maven-plugin</artifactId>
+          <version>0.5.3.201107060350</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.3.6</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Export-Package>
+            </Export-Package>
+            <Import-Package>
+              org.opendaylight.controller.sal.core,
+              org.opendaylight.controller.sal.utils,
+              org.opendaylight.controller.sal.topology,
+              org.opendaylight.controller.hosttracker,
+              org.opendaylight.controller.topologymanager,
+              org.opendaylight.controller.sal.packet.address,
+              org.opendaylight.controller.switchmanager,
+              org.opendaylight.controller.clustering.services,
+              org.opendaylight.controller.hosttracker.hostAware,
+              javax.xml.bind.annotation,
+              javax.xml.bind,
+              org.apache.felix.dm,
+              org.apache.commons.lang3.builder,
+              org.osgi.service.component,
+              org.slf4j,
+              org.eclipse.osgi.framework.console,
+              org.osgi.framework
+            </Import-Package>
+            <Bundle-Activator>
+              org.opendaylight.controller.hosttracker.internal.Activator
+            </Bundle-Activator>
+            <Service-Component>
+            </Service-Component>
+          </instructions>
           <manifestLocation>${project.basedir}/META-INF</manifestLocation>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                           <configuration>
-                               <includes>org.opendaylight.controller.*</includes>
-                           </configuration>
-                           <executions>
-                               <execution>
-                                   <id>pre-test</id>
-                                   <goals>
-                                       <goal>prepare-agent</goal>
-                                   </goals>
-                               </execution>
-                               <execution>
-                                   <id>post-test</id>
-                                   <phase>test</phase>
-                                   <goals>
-                                       <goal>report</goal>
-                                   </goals>
-                               </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>topologymanager</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>switchmanager</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>clustering.services</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>sal</artifactId>
-                       <version>0.5.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>hosttracker</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
-               </dependency>
-       </dependencies>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <configuration>
+          <includes>org.opendaylight.controller.*</includes>
+        </configuration>
+        <executions>
+          <execution>
+            <id>pre-test</id>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>post-test</id>
+            <phase>test</phase>
+            <goals>
+              <goal>report</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>topologymanager</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>switchmanager</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>clustering.services</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal</artifactId>
+      <version>0.5.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>hosttracker</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
 </project>
index e3aaad7..dd8a3ad 100644 (file)
 \r
   <artifactId>hosttracker.integrationtest</artifactId>\r
   <version>0.4.0-SNAPSHOT</version>\r
-  \r
+\r
   <dependencies>\r
     <dependency>\r
-         <groupId>org.opendaylight.controller</groupId>\r
-         <artifactId>hosttracker</artifactId>\r
-         <version>0.4.0-SNAPSHOT</version>\r
+      <groupId>org.opendaylight.controller</groupId>\r
+      <artifactId>hosttracker</artifactId>\r
+      <version>0.4.0-SNAPSHOT</version>\r
     </dependency>\r
     <dependency>\r
-         <groupId>org.opendaylight.controller</groupId>\r
-         <artifactId>hosttracker.implementation</artifactId>\r
-         <version>0.4.0-SNAPSHOT</version>\r
+      <groupId>org.opendaylight.controller</groupId>\r
+      <artifactId>hosttracker.implementation</artifactId>\r
+      <version>0.4.0-SNAPSHOT</version>\r
     </dependency>\r
-      <dependency>\r
+    <dependency>\r
       <groupId>org.opendaylight.controller</groupId>\r
       <artifactId>sal</artifactId>\r
       <version>0.5.0-SNAPSHOT</version>\r
     </dependency>\r
-     <dependency>\r
+    <dependency>\r
       <groupId>org.opendaylight.controller</groupId>\r
       <artifactId>sal.implementation</artifactId>\r
       <version>0.4.0-SNAPSHOT</version>\r
       <artifactId>containermanager</artifactId>\r
       <version>0.4.0-SNAPSHOT</version>\r
     </dependency>\r
\r
+\r
     <dependency>\r
       <groupId>org.opendaylight.controller</groupId>\r
       <artifactId>containermanager.implementation</artifactId>\r
       <version>0.4.0-SNAPSHOT</version>\r
     </dependency>\r
 \r
-     <dependency>\r
+    <dependency>\r
       <groupId>org.opendaylight.controller</groupId>\r
       <artifactId>arphandler</artifactId>\r
       <version>0.4.0-SNAPSHOT</version>\r
     </dependency>\r
-       <dependency>\r
+    <dependency>\r
       <groupId>org.opendaylight.controller</groupId>\r
       <artifactId>clustering.services</artifactId>\r
       <version>0.4.0-SNAPSHOT</version>\r
     </dependency>\r
\r
-       <dependency>\r
+\r
+    <dependency>\r
       <groupId>org.opendaylight.controller</groupId>\r
       <artifactId>clustering.stub</artifactId>\r
       <version>0.4.0-SNAPSHOT</version>\r
     </dependency>\r
 \r
-     <dependency>\r
-         <groupId>org.opendaylight.controller</groupId>\r
-         <artifactId>switchmanager</artifactId>\r
-         <version>0.4.0-SNAPSHOT</version>\r
+    <dependency>\r
+      <groupId>org.opendaylight.controller</groupId>\r
+      <artifactId>switchmanager</artifactId>\r
+      <version>0.4.0-SNAPSHOT</version>\r
     </dependency>\r
-     <dependency>\r
-         <groupId>org.opendaylight.controller</groupId>\r
-         <artifactId>switchmanager.implementation</artifactId>\r
-         <version>0.4.0-SNAPSHOT</version>\r
+    <dependency>\r
+      <groupId>org.opendaylight.controller</groupId>\r
+      <artifactId>switchmanager.implementation</artifactId>\r
+      <version>0.4.0-SNAPSHOT</version>\r
     </dependency>\r
-     <dependency>\r
-         <groupId>org.opendaylight.controller</groupId>\r
-         <artifactId>configuration</artifactId>\r
-         <version>0.4.0-SNAPSHOT</version>\r
+    <dependency>\r
+      <groupId>org.opendaylight.controller</groupId>\r
+      <artifactId>configuration</artifactId>\r
+      <version>0.4.0-SNAPSHOT</version>\r
     </dependency>\r
 \r
     <dependency>\r
-         <groupId>org.opendaylight.controller</groupId>\r
-         <artifactId>configuration.implementation</artifactId>\r
-         <version>0.4.0-SNAPSHOT</version>\r
+      <groupId>org.opendaylight.controller</groupId>\r
+      <artifactId>configuration.implementation</artifactId>\r
+      <version>0.4.0-SNAPSHOT</version>\r
     </dependency>\r
 \r
-     <dependency>\r
-         <groupId>org.opendaylight.controller</groupId>\r
-         <artifactId>topologymanager</artifactId>\r
-         <version>0.4.0-SNAPSHOT</version>\r
+    <dependency>\r
+      <groupId>org.opendaylight.controller</groupId>\r
+      <artifactId>topologymanager</artifactId>\r
+      <version>0.4.0-SNAPSHOT</version>\r
     </dependency>\r
   </dependencies>\r
   <properties>\r
-       <!-- Sonar jacoco plugin to get integration test coverage info -->\r
+    <!-- Sonar jacoco plugin to get integration test coverage info -->\r
     <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>\r
     <sonar.jacoco.reportPath>../implementation/target/jacoco.exec</sonar.jacoco.reportPath>\r
     <sonar.jacoco.itReportPath>../implementaiton/target/jacoco-it.exec</sonar.jacoco.itReportPath>\r
     <sonar.language>java</sonar.language>\r
   </properties>\r
-  \r
+\r
   <build>\r
     <pluginManagement>\r
       <plugins>\r
       </plugin>\r
     </plugins>\r
   </build>\r
-\r
 </project>\r
index 083a081..7c0835a 100644 (file)
@@ -34,7 +34,7 @@
               org.opendaylight.controller.containermanager,
               org.opendaylight.controller.usermanager,
               javax.servlet.http, 
-              org.slf4j,                              
+              org.slf4j
             </Import-Package>
           </instructions>
           <manifestLocation>${project.basedir}/META-INF</manifestLocation>
index a26bbbd..853c54e 100644 (file)
@@ -46,7 +46,7 @@
               org.opendaylight.controller.northbound.commons.exception,
               org.opendaylight.controller.northbound.commons.utils,
               org.opendaylight.controller.sal.authorization,
-                         javax.ws.rs,
+              javax.ws.rs,
               javax.ws.rs.core,
               javax.xml.bind.annotation,
               javax.xml.bind,
       <artifactId>switchmanager</artifactId>
       <version>0.4.0-SNAPSHOT</version>
     </dependency>
-       <dependency>
+    <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal</artifactId>
       <version>0.5.0-SNAPSHOT</version>
-       </dependency> 
+    </dependency>
     <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>commons.northbound</artifactId>
-         <version>0.4.0-SNAPSHOT</version>
-       </dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>commons.northbound</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>org.codehaus.enunciate</groupId>
       <artifactId>enunciate-core-annotations</artifactId>
index 823b760..f656faf 100644 (file)
@@ -45,7 +45,7 @@
               org.opendaylight.controller.northbound.commons.exception,
               org.opendaylight.controller.northbound.commons.utils,
               org.opendaylight.controller.sal.authorization,
-                         org.slf4j,              
+              org.slf4j,
               javax.ws.rs,
               javax.ws.rs.core,
               javax.xml.bind.annotation,
       <version>${enunciate.version}</version>
     </dependency>
     <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>commons.northbound</artifactId>
-         <version>0.4.0-SNAPSHOT</version>
-       </dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>commons.northbound</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller.thirdparty</groupId>
       <artifactId>com.sun.jersey.jersey-servlet</artifactId>
index 8a9799e..7ce5c43 100644 (file)
           <instructions>
             <Export-Package>
             </Export-Package>
-            <Import-Package>
-                         org.opendaylight.controller.forwardingrulesmanager,
-                         org.opendaylight.controller.sal.action,
-                         org.opendaylight.controller.sal.core,
-                         org.opendaylight.controller.sal.flowprogrammer,
-                         org.opendaylight.controller.sal.match,
-                         org.opendaylight.controller.sal.packet,
-                         org.opendaylight.controller.sal.reader,
-                         org.opendaylight.controller.sal.utils,
-                         org.opendaylight.controller.containermanager,
-                         org.opendaylight.controller.statisticsmanager,
-                         org.opendaylight.controller.usermanager,
-                         org.opendaylight.controller.switchmanager,
-                         org.opendaylight.controller.sal.authorization,
-                         org.apache.commons.logging,
-              com.sun.jersey.spi.container.servlet,
-              org.opendaylight.controller.northbound.commons,
-              org.opendaylight.controller.northbound.commons.exception,
-              org.opendaylight.controller.northbound.commons.utils,
-              javax.ws.rs,
-              javax.ws.rs.core,
-              javax.xml.bind.annotation,
-              javax.xml.bind,
-              org.slf4j,
-              !org.codehaus.enunciate.jaxrs
-            </Import-Package>
+              <Import-Package>
+                org.opendaylight.controller.forwardingrulesmanager,
+                org.opendaylight.controller.sal.action,
+                org.opendaylight.controller.sal.core,
+                org.opendaylight.controller.sal.flowprogrammer,
+                org.opendaylight.controller.sal.match,
+                org.opendaylight.controller.sal.packet,
+                org.opendaylight.controller.sal.reader,
+                org.opendaylight.controller.sal.utils,
+                org.opendaylight.controller.containermanager,
+                org.opendaylight.controller.statisticsmanager,
+                org.opendaylight.controller.usermanager,
+                org.opendaylight.controller.switchmanager,
+                org.opendaylight.controller.sal.authorization,
+                org.apache.commons.logging,
+                com.sun.jersey.spi.container.servlet,
+                org.opendaylight.controller.northbound.commons,
+                org.opendaylight.controller.northbound.commons.exception,
+                org.opendaylight.controller.northbound.commons.utils,
+                javax.ws.rs,
+                javax.ws.rs.core,
+                javax.xml.bind.annotation,
+                javax.xml.bind,
+                org.slf4j,
+                !org.codehaus.enunciate.jaxrs
+              </Import-Package>
             <Export-Package>
             </Export-Package>
             <Web-ContextPath>/controller/nb/v2/statistics</Web-ContextPath>
       <artifactId>statisticsmanager</artifactId>
       <version>0.4.0-SNAPSHOT</version>
     </dependency>
-       <dependency>
+    <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal</artifactId>
       <version>0.5.0-SNAPSHOT</version>
-       </dependency> 
-       
-       <dependency>
+    </dependency>
+    <dependency>
       <groupId>org.opendaylight.controller.thirdparty</groupId>
       <artifactId>com.sun.jersey.jersey-servlet</artifactId>
       <version>1.17-SNAPSHOT</version>
     </dependency>
-    
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>commons.northbound</artifactId>
-         <version>0.4.0-SNAPSHOT</version>
-       </dependency>
-    
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>commons.northbound</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>org.codehaus.enunciate</groupId>
       <artifactId>enunciate-core-annotations</artifactId>
       <version>${enunciate.version}</version>
     </dependency>
-       
-       
   </dependencies>
 </project>
index 2d9e20b..4a701e3 100644 (file)
             <Export-Package>
             </Export-Package>
             <Import-Package>
-                         org.opendaylight.controller.sal.core,
-                         org.opendaylight.controller.sal.utils,
-                         org.opendaylight.controller.containermanager,
-                         org.opendaylight.controller.switchmanager,
+              org.opendaylight.controller.sal.core,
+              org.opendaylight.controller.sal.utils,
+              org.opendaylight.controller.containermanager,
+              org.opendaylight.controller.switchmanager,
               org.opendaylight.controller.northbound.commons,
               org.opendaylight.controller.northbound.commons.exception,
               org.opendaylight.controller.northbound.commons.utils,
               com.sun.jersey.spi.container.servlet,
               org.opendaylight.controller.sal.authorization,
               org.opendaylight.controller.usermanager,
-                         javax.ws.rs,
+              javax.ws.rs,
               javax.ws.rs.core,
               javax.xml.bind.annotation,
               org.slf4j,
       <artifactId>com.sun.jersey.jersey-servlet</artifactId>
       <version>1.17-SNAPSHOT</version>
     </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>commons.northbound</artifactId>
-         <version>0.4.0-SNAPSHOT</version>
-       </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>commons.northbound</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>org.codehaus.enunciate</groupId>
       <artifactId>enunciate-core-annotations</artifactId>
index 358eed3..26e1b24 100644 (file)
@@ -24,8 +24,8 @@
             <version>0.5.0-SNAPSHOT</version>
           </dependency>
         </dependencies>
-      </plugin>    
-    
+      </plugin>
+
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
               org.opendaylight.controller.switchmanager,
               org.opendaylight.controller.usermanager,
               org.apache.commons.lang3.tuple,
-              org.apache.commons.logging,              
+              org.apache.commons.logging,
               com.sun.jersey.spi.container.servlet,
               org.opendaylight.controller.northbound.commons,
               org.opendaylight.controller.northbound.commons.exception,
               org.opendaylight.controller.northbound.commons.utils,
               org.opendaylight.controller.sal.authorization,
-                         javax.ws.rs,
+              javax.ws.rs,
               javax.ws.rs.core,
               javax.xml.bind.annotation,
               javax.xml.bind,
@@ -66,7 +66,7 @@
       <artifactId>com.sun.jersey.jersey-servlet</artifactId>
       <version>1.17-SNAPSHOT</version>
     </dependency>
-  
+
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>containermanager</artifactId>
       <version>0.4.0-SNAPSHOT</version>
     </dependency>
 
-       <dependency>
+    <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal</artifactId>
       <version>0.5.0-SNAPSHOT</version>
-       </dependency> 
+    </dependency>
 
     <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>commons.northbound</artifactId>
-         <version>0.4.0-SNAPSHOT</version>
-       </dependency>
-        
-       <dependency>
-               <groupId>org.springframework</groupId>
-               <artifactId>spring-web</artifactId>
-               <version>${spring.version}</version>
-               <scope>provided</scope>
-       </dependency>
-               
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>commons.northbound</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>${spring.version}</version>
+      <scope>provided</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.codehaus.enunciate</groupId>
       <artifactId>enunciate-core-annotations</artifactId>
       <version>${enunciate.version}</version>
     </dependency>
-    
+
   </dependencies>
 </project>
index 517492f..726f797 100644 (file)
               org.opendaylight.controller.sal.core,
               org.opendaylight.controller.sal.packet,
               org.opendaylight.controller.sal.authorization,
-                         org.opendaylight.controller.sal.packet.address,
+              org.opendaylight.controller.sal.packet.address,
               org.opendaylight.controller.sal.utils,
               org.opendaylight.controller.switchmanager,
               org.opendaylight.controller.usermanager,
               org.opendaylight.controller.topologymanager,
               com.sun.jersey.spi.container.servlet,
-                         javax.ws.rs,
+              javax.ws.rs,
               javax.ws.rs.core,
               javax.xml.bind,
               javax.xml.bind.annotation,
@@ -59,7 +59,7 @@
             <Web-ContextPath>/controller/nb/v2/topology</Web-ContextPath>
           </instructions>
           <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
-          </configuration>
+        </configuration>
       </plugin>
     </plugins>
   </build>
       <artifactId>enunciate-core-annotations</artifactId>
       <version>${enunciate.version}</version>
     </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>containermanager</artifactId>
-         <version>0.4.0-SNAPSHOT</version>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>commons.northbound</artifactId>
-         <version>0.4.0-SNAPSHOT</version>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>sal</artifactId>
-         <version>0.5.0-SNAPSHOT</version>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>topologymanager</artifactId>
-         <version>0.4.0-SNAPSHOT</version>
-       </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>containermanager</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>commons.northbound</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal</artifactId>
+      <version>0.5.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>topologymanager</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller.thirdparty</groupId>
       <artifactId>com.sun.jersey.jersey-servlet</artifactId>
index 98d1ecf..9d84d45 100644 (file)
               org.apache.felix.dm,
               org.slf4j,
               org.eclipse.osgi.framework.console,
-                         org.osgi.framework,
-                         javax.net.ssl
+              org.osgi.framework,
+              javax.net.ssl
             </Import-Package>
             <Export-Package>
-                         org.opendaylight.controller.protocol_plugin.openflow.internal
+              org.opendaylight.controller.protocol_plugin.openflow.internal
             </Export-Package>
             <Embed-Dependency>
               org.openflow.openflowj
index e6c831d..22036b5 100644 (file)
   <build>
     <plugins>
       <plugin>
-    <groupId>org.apache.felix</groupId>
-    <artifactId>maven-bundle-plugin</artifactId>
-    <version>2.3.6</version>
-    <extensions>true</extensions>
-    <configuration>
-      <instructions>
-        <Import-Package>
-          org.slf4j,
-          org.opendaylight.controller.sal.routing,
-          org.opendaylight.controller.sal.core,
-          org.opendaylight.controller.sal.topology,
-          org.opendaylight.controller.sal.utils,
-          org.opendaylight.controller.sal.reader,
-          org.apache.commons.collections15,
-          org.opendaylight.controller.switchmanager, 
-          org.opendaylight.controller.topologymanager, 
-          edu.uci.ics.jung.graph,
-          edu.uci.ics.jung.algorithms.shortestpath,
-          edu.uci.ics.jung.graph.util,
-          org.apache.felix.dm,
-          org.junit;resolution:=optional
-        </Import-Package>
-        <Bundle-Activator>
-          org.opendaylight.controller.routing.dijkstra_implementation.internal.Activator
-        </Bundle-Activator>
-      </instructions>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.3.6</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Import-Package>
+              org.slf4j,
+              org.opendaylight.controller.sal.routing,
+              org.opendaylight.controller.sal.core,
+              org.opendaylight.controller.sal.topology,
+              org.opendaylight.controller.sal.utils,
+              org.opendaylight.controller.sal.reader,
+              org.apache.commons.collections15,
+              org.opendaylight.controller.switchmanager,
+              org.opendaylight.controller.topologymanager,
+              edu.uci.ics.jung.graph,
+              edu.uci.ics.jung.algorithms.shortestpath,
+              edu.uci.ics.jung.graph.util,
+              org.apache.felix.dm,
+              org.junit;resolution:=optional
+            </Import-Package>
+            <Bundle-Activator>
+              org.opendaylight.controller.routing.dijkstra_implementation.internal.Activator
+            </Bundle-Activator>
+          </instructions>
           <manifestLocation>${project.basedir}/META-INF</manifestLocation>
-    </configuration>
+        </configuration>
       </plugin>
     </plugins>
   </build>
index 5551999..c9f898a 100644 (file)
@@ -32,7 +32,7 @@
             </Import-Package>\r
             <Export-Package>\r
               org.opendaylight.controller.sal.authorization,\r
-                         org.opendaylight.controller.sal.action,\r
+              org.opendaylight.controller.sal.action,\r
               org.opendaylight.controller.sal.core,\r
               org.opendaylight.controller.sal.discovery,\r
               org.opendaylight.controller.sal.topology,\r
index 8d4da22..3eb2379 100644 (file)
               org.opendaylight.controller.sal.utils,\r
               org.apache.felix.dm,\r
               org.eclipse.osgi.framework.console,\r
-                         org.osgi.framework\r
+              org.osgi.framework\r
             </Import-Package>\r
             <Export-Package>\r
             </Export-Package>\r
-               <Bundle-Activator>\r
-             org.opendaylight.controller.sal.implementation.internal.Activator\r
-               </Bundle-Activator>\r
+            <Bundle-Activator>\r
+              org.opendaylight.controller.sal.implementation.internal.Activator\r
+            </Bundle-Activator>\r
           </instructions>\r
           <manifestLocation>${project.basedir}/META-INF</manifestLocation>\r
         </configuration>\r
index ba3ee2f..ca7e93c 100644 (file)
@@ -1,97 +1,97 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-       xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>commons.opendaylight</artifactId>
-               <version>1.4.0-SNAPSHOT</version>
-               <relativePath>../../commons/opendaylight</relativePath>
-       </parent>
-       <artifactId>samples.loadbalancer</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
-       <packaging>bundle</packaging>
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.opendaylight.controller</groupId>
+    <artifactId>commons.opendaylight</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <relativePath>../../commons/opendaylight</relativePath>
+  </parent>
+  <artifactId>samples.loadbalancer</artifactId>
+  <version>0.4.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
 
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <version>2.3.6</version>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <instructions>
-                                               <Export-Package>
-                                                       org.opendaylight.controller.samples.loadbalancer,
-                                                       org.opendaylight.controller.samples.loadbalancer.entities,
-                                                       org.opendaylight.controller.samples.loadbalancer.internal,
-                                                       org.opendaylight.controller.samples.loadbalancer.policies
-                                               </Export-Package>
-                                               <Import-Package>
-                                                       org.opendaylight.controller.sal.core,
-                                                       org.opendaylight.controller.sal.utils,
-                                                       org.opendaylight.controller.sal.action,
-                                                       org.opendaylight.controller.sal.match,
-                                                       org.opendaylight.controller.sal.packet,
-                                                       org.opendaylight.controller.sal.routing,
-                                                       org.opendaylight.controller.sal.flowprogrammer,
-                                                       org.opendaylight.controller.sal.packet.address,
-                                                       org.opendaylight.controller.hosttracker,
-                                                       org.opendaylight.controller.hosttracker.hostAware,
-                                                       org.opendaylight.controller.samples.loadbalancer,
-                                                       org.opendaylight.controller.samples.loadbalancer.entities,
-                                                       org.opendaylight.controller.samples.loadbalancer.internal,
-                                                       org.opendaylight.controller.samples.loadbalancer.policies,
-                                                       org.opendaylight.controller.topologymanager,
-                                                       org.opendaylight.controller.forwardingrulesmanager,
-                                                       org.opendaylight.controller.switchmanager,
-                                                       org.opendaylight.controller.clustering.services,
-                                                       javax.xml.bind.annotation,
-                                                       javax.xml.bind,
-                                                       org.apache.felix.dm,
-                                                       org.apache.commons.lang3.builder,
-                                                       org.osgi.service.component,
-                                                       org.slf4j,
-                                                       org.eclipse.osgi.framework.console,
-                                                       org.osgi.framework
-                                               </Import-Package>
-                                               <Bundle-Activator>
-                                                       org.opendaylight.controller.samples.loadbalancer.internal.Activator
-                                               </Bundle-Activator>
-                                               <Service-Component>
-                                               </Service-Component>
-                                       </instructions>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.3.6</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Export-Package>
+              org.opendaylight.controller.samples.loadbalancer,
+              org.opendaylight.controller.samples.loadbalancer.entities,
+              org.opendaylight.controller.samples.loadbalancer.internal,
+              org.opendaylight.controller.samples.loadbalancer.policies
+            </Export-Package>
+            <Import-Package>
+              org.opendaylight.controller.sal.core,
+              org.opendaylight.controller.sal.utils,
+              org.opendaylight.controller.sal.action,
+              org.opendaylight.controller.sal.match,
+              org.opendaylight.controller.sal.packet,
+              org.opendaylight.controller.sal.routing,
+              org.opendaylight.controller.sal.flowprogrammer,
+              org.opendaylight.controller.sal.packet.address,
+              org.opendaylight.controller.hosttracker,
+              org.opendaylight.controller.hosttracker.hostAware,
+              org.opendaylight.controller.samples.loadbalancer,
+              org.opendaylight.controller.samples.loadbalancer.entities,
+              org.opendaylight.controller.samples.loadbalancer.internal,
+              org.opendaylight.controller.samples.loadbalancer.policies,
+              org.opendaylight.controller.topologymanager,
+              org.opendaylight.controller.forwardingrulesmanager,
+              org.opendaylight.controller.switchmanager,
+              org.opendaylight.controller.clustering.services,
+              javax.xml.bind.annotation,
+              javax.xml.bind,
+              org.apache.felix.dm,
+              org.apache.commons.lang3.builder,
+              org.osgi.service.component,
+              org.slf4j,
+              org.eclipse.osgi.framework.console,
+              org.osgi.framework
+            </Import-Package>
+            <Bundle-Activator>
+              org.opendaylight.controller.samples.loadbalancer.internal.Activator
+            </Bundle-Activator>
+            <Service-Component>
+            </Service-Component>
+          </instructions>
           <manifestLocation>${project.basedir}/META-INF</manifestLocation>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>topologymanager</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>switchmanager</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
-               </dependency>
-           <dependency>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>forwardingrulesmanager</artifactId>
-               <version>0.4.0-SNAPSHOT</version>
-       </dependency>
-       <dependency>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>hosttracker</artifactId>
-               <version>0.4.0-SNAPSHOT</version>
-       </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>sal</artifactId>
-                       <version>0.5.0-SNAPSHOT</version>
-               </dependency>
-       </dependencies>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>topologymanager</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>switchmanager</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>forwardingrulesmanager</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>hosttracker</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal</artifactId>
+      <version>0.5.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
 </project>
index c736d04..dc23940 100644 (file)
@@ -24,7 +24,7 @@
             <version>0.5.0-SNAPSHOT</version>
           </dependency>
         </dependencies>
-      </plugin>    
+      </plugin>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <configuration>
           <instructions>
             <Import-Package>
-                               org.opendaylight.controller.samples.loadbalancer,
-                               org.opendaylight.controller.samples.loadbalancer.entities,
-                               org.opendaylight.controller.samples.loadbalancer.internal,
-                               org.opendaylight.controller.samples.loadbalancer.policies,
-                               org.opendaylight.controller.hosttracker,
-                               org.opendaylight.controller.sal.core,
-                               org.opendaylight.controller.sal.utils,
-                               org.opendaylight.controller.containermanager,
-                               org.opendaylight.controller.switchmanager,
-                               org.apache.commons.logging,
-                               com.sun.jersey.spi.container.servlet,
-                               org.opendaylight.controller.northbound.commons,
-                               org.opendaylight.controller.northbound.commons.exception,
-                               javax.ws.rs,
-                               javax.ws.rs.core,
-                               javax.xml.bind.annotation,
-                               javax.xml.bind,
-                               org.slf4j,
-                               !org.codehaus.enunciate.jaxrs
+              org.opendaylight.controller.samples.loadbalancer,
+              org.opendaylight.controller.samples.loadbalancer.entities,
+              org.opendaylight.controller.samples.loadbalancer.internal,
+              org.opendaylight.controller.samples.loadbalancer.policies,
+              org.opendaylight.controller.hosttracker,
+              org.opendaylight.controller.sal.core,
+              org.opendaylight.controller.sal.utils,
+              org.opendaylight.controller.containermanager,
+              org.opendaylight.controller.switchmanager,
+              org.apache.commons.logging,
+              com.sun.jersey.spi.container.servlet,
+              org.opendaylight.controller.northbound.commons,
+              org.opendaylight.controller.northbound.commons.exception,
+              javax.ws.rs,
+              javax.ws.rs.core,
+              javax.xml.bind.annotation,
+              javax.xml.bind,
+              org.slf4j,
+              !org.codehaus.enunciate.jaxrs
             </Import-Package>
             <Web-ContextPath>/one/nb/v2/lb</Web-ContextPath>
           </instructions>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>samples.loadbalancer</artifactId>
       <version>0.4.0-SNAPSHOT</version>
-    </dependency>
-       <dependency>
+      </dependency>
+    <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal</artifactId>
       <version>0.5.0-SNAPSHOT</version>
-       </dependency> 
+    </dependency>
     <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>commons.northbound</artifactId>
-         <version>0.4.0-SNAPSHOT</version>
-       </dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>commons.northbound</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>org.codehaus.enunciate</groupId>
       <artifactId>enunciate-core-annotations</artifactId>
index f26f56b..fd288c7 100644 (file)
@@ -22,8 +22,8 @@
         <configuration>
           <instructions>
             <Import-Package>
-                         org.opendaylight.controller.sal.utils,
-                         org.opendaylight.controller.sal.core,
+              org.opendaylight.controller.sal.utils,
+              org.opendaylight.controller.sal.core,
               org.opendaylight.controller.forwardingrulesmanager,
               org.opendaylight.controller.hosttracker,
               org.opendaylight.controller.hosttracker.hostAware,
               org.opendaylight.controller.sal.routing,
               org.opendaylight.controller.topologymanager,
               org.apache.commons.lang3.builder,
-                 org.junit;resolution:=optional,
-                 org.slf4j,
+              org.junit;resolution:=optional,
+              org.slf4j,
               org.apache.felix.dm
             </Import-Package>
-           <Bundle-Activator>
-                 org.opendaylight.controller.samples.simpleforwarding.internal.Activator
-                       </Bundle-Activator>
+            <Bundle-Activator>
+              org.opendaylight.controller.samples.simpleforwarding.internal.Activator
+            </Bundle-Activator>
           </instructions>
           <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       <version>4.8.1</version>
       <scope>test</scope>
     </dependency>
-       <dependency>
+    <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal</artifactId>
       <version>0.5.0-SNAPSHOT</version>
-       </dependency>    
+    </dependency>
   </dependencies>
 </project>
index 6c689f1..eb818ff 100644 (file)
@@ -1,60 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-       xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>commons.opendaylight</artifactId>
-               <version>1.4.0-SNAPSHOT</version>
-               <relativePath>../commons/opendaylight</relativePath>
-       </parent>
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.opendaylight.controller</groupId>
+    <artifactId>commons.opendaylight</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <relativePath>../commons/opendaylight</relativePath>
+  </parent>
 
-       <artifactId>security</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
-       <packaging>bundle</packaging>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <version>2.3.6</version>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <instructions>
-                                           <Fragment-Host>
-                                           org.apache.catalina
-                                           </Fragment-Host>                                
-                                               <Import-Package>
-                                               org.slf4j,
-                                               javax.servlet,
-                                               org.apache.catalina,
-                                               org.apache.catalina.connector,
-                                               org.apache.catalina.valves,
-                                               org.apache.catalina.realm,
-                                               org.opendaylight.controller.sal.utils,
-                                               org.opendaylight.controller.sal.authorization,
-                                               org.opendaylight.controller.usermanager
-                                               </Import-Package>
-                                               <Export-Package>
-                                               org.opendaylight.controller.security
-                                               </Export-Package>
-                                       </instructions>
+  <artifactId>security</artifactId>
+  <version>0.4.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.3.6</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Fragment-Host>
+              org.apache.catalina
+            </Fragment-Host>
+            <Import-Package>
+              org.slf4j,
+              javax.servlet,
+              org.apache.catalina,
+              org.apache.catalina.connector,
+              org.apache.catalina.valves,
+              org.apache.catalina.realm,
+              org.opendaylight.controller.sal.utils,
+              org.opendaylight.controller.sal.authorization,
+              org.opendaylight.controller.usermanager
+            </Import-Package>
+            <Export-Package>
+              org.opendaylight.controller.security
+            </Export-Package>
+          </instructions>
           <manifestLocation>${project.basedir}/META-INF</manifestLocation>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>usermanager</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal</artifactId>
-            <version>0.5.0-SNAPSHOT</version>
-        </dependency>
-       </dependencies>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>usermanager</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal</artifactId>
+      <version>0.5.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
 </project>
index cc56d96..106ff3d 100644 (file)
     </pluginManagement>
     <plugins>
       <plugin>
-           <groupId>org.apache.felix</groupId>
-           <artifactId>maven-bundle-plugin</artifactId>
-           <version>2.3.6</version>
-           <extensions>true</extensions>
-           <configuration>
-             <instructions>
-               <Export-Package>
-                 org.opendaylight.controller.switchmanager
-               </Export-Package>
-               <Import-Package>
-                 org.opendaylight.controller.clustering.services,
-              org.opendaylight.controller.configuration,               
-                 org.opendaylight.controller.sal.core,
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.3.6</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Export-Package>
+              org.opendaylight.controller.switchmanager
+            </Export-Package>
+            <Import-Package>
+              org.opendaylight.controller.clustering.services,
+              org.opendaylight.controller.configuration,
+              org.opendaylight.controller.sal.core,
               org.opendaylight.controller.sal.utils,
               org.opendaylight.controller.sal.packet,
               org.opendaylight.controller.sal.inventory,
@@ -56,9 +56,9 @@
               javax.xml.bind.annotation,
               org.apache.commons.lang3.builder
             </Import-Package>
-             </instructions>
+          </instructions>
           <manifestLocation>${project.basedir}/META-INF</manifestLocation>
-           </configuration>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.jacoco</groupId>
     </plugins>
   </build>
   <dependencies>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>clustering.services</artifactId>
-         <version>0.4.0-SNAPSHOT</version>
-       </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>clustering.services</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>configuration</artifactId>
       <version>0.4.0-SNAPSHOT</version>
-    </dependency>      
-       <dependency>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>sal</artifactId>
-               <version>0.5.0-SNAPSHOT</version>
-       </dependency>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal</artifactId>
+      <version>0.5.0-SNAPSHOT</version>
+    </dependency>
   </dependencies>
 </project>
index 128ab25..511cab1 100644 (file)
     </pluginManagement>
     <plugins>
       <plugin>
-           <groupId>org.apache.felix</groupId>
-           <artifactId>maven-bundle-plugin</artifactId>
-           <version>2.3.6</version>
-           <extensions>true</extensions>
-           <configuration>
-             <instructions>
-               <Export-Package>
-               </Export-Package>
-               <Import-Package>
-                 org.opendaylight.controller.switchmanager,
-                 org.opendaylight.controller.clustering.services,
-              org.opendaylight.controller.configuration,               
-                 org.opendaylight.controller.sal.core,
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.3.6</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Export-Package>
+            </Export-Package>
+            <Import-Package>
+              org.opendaylight.controller.switchmanager,
+              org.opendaylight.controller.clustering.services,
+              org.opendaylight.controller.configuration,
+              org.opendaylight.controller.sal.core,
               org.opendaylight.controller.sal.utils,
               org.opendaylight.controller.sal.packet,
               org.opendaylight.controller.sal.inventory,
               org.apache.commons.lang3.builder
             </Import-Package>
             <Bundle-Activator>
-                 org.opendaylight.controller.switchmanager.internal.Activator
+              org.opendaylight.controller.switchmanager.internal.Activator
             </Bundle-Activator>
-             </instructions>
+          </instructions>
           <manifestLocation>${project.basedir}/META-INF</manifestLocation>
-           </configuration>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.jacoco</groupId>
     </plugins>
   </build>
   <dependencies>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>clustering.services</artifactId>
-         <version>0.4.0-SNAPSHOT</version>
-       </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>clustering.services</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>configuration</artifactId>
       <version>0.4.0-SNAPSHOT</version>
-    </dependency>      
-       <dependency>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>sal</artifactId>
-               <version>0.5.0-SNAPSHOT</version>
-       </dependency>
-       <dependency>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>switchmanager</artifactId>
-               <version>0.4.0-SNAPSHOT</version>
-       </dependency>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal</artifactId>
+      <version>0.5.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>switchmanager</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
   </dependencies>
 </project>
index 57a036b..65fabb1 100755 (executable)
   <build>
     <plugins>
       <plugin>
-       <groupId>org.apache.felix</groupId>
-       <artifactId>maven-bundle-plugin</artifactId>
-       <version>2.3.6</version>
-       <extensions>true</extensions>
-       <configuration>
-         <instructions>
-           <Export-Package>
-             org.opendaylight.controller.topologymanager
-           </Export-Package>
-           <Import-Package>
-          javax.xml.bind.annotation,
-             org.opendaylight.controller.sal.core,
-             org.opendaylight.controller.sal.utils,
-             org.opendaylight.controller.sal.packet,
-             org.opendaylight.controller.sal.topology,
-             org.opendaylight.controller.configuration,
-             org.opendaylight.controller.clustering.services,
-          org.osgi.service.component,
-             org.slf4j,
-          org.apache.felix.dm,
-          org.apache.commons.lang3.builder,
-          org.apache.commons.lang3.tuple,
-                 org.eclipse.osgi.framework.console,
-          org.osgi.framework
-           </Import-Package>
-        <Bundle-Activator>
-          org.opendaylight.controller.topologymanager.internal.Activator
-        </Bundle-Activator>
-         </instructions>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.3.6</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Export-Package>
+              org.opendaylight.controller.topologymanager
+            </Export-Package>
+            <Import-Package>
+              javax.xml.bind.annotation,
+              org.opendaylight.controller.sal.core,
+              org.opendaylight.controller.sal.utils,
+              org.opendaylight.controller.sal.packet,
+              org.opendaylight.controller.sal.topology,
+              org.opendaylight.controller.configuration,
+              org.opendaylight.controller.clustering.services,
+              org.osgi.service.component,
+              org.slf4j,
+              org.apache.felix.dm,
+              org.apache.commons.lang3.builder,
+              org.apache.commons.lang3.tuple,
+              org.eclipse.osgi.framework.console,
+              org.osgi.framework
+            </Import-Package>
+            <Bundle-Activator>
+              org.opendaylight.controller.topologymanager.internal.Activator
+            </Bundle-Activator>
+          </instructions>
           <manifestLocation>${project.basedir}/META-INF</manifestLocation>
-       </configuration>
+        </configuration>
       </plugin>
     </plugins>
   </build>
@@ -66,6 +66,5 @@
       <artifactId>configuration</artifactId>
       <version>0.4.0-SNAPSHOT</version>
     </dependency>
-    
   </dependencies>
 </project>
index 5e15c4c..1859e8e 100644 (file)
@@ -1,91 +1,89 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-       xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>commons.opendaylight</artifactId>
-               <version>1.4.0-SNAPSHOT</version>
-               <relativePath>../commons/opendaylight</relativePath>
-       </parent>
+<?xml version="1.0" encoding="UTF-8"?> <project
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.opendaylight.controller</groupId>
+    <artifactId>commons.opendaylight</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <relativePath>../commons/opendaylight</relativePath>
+  </parent>
 
-       <artifactId>usermanager</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
-       <packaging>bundle</packaging>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <version>2.3.6</version>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <instructions>
-                                               <Import-Package>
-                                                       org.opendaylight.controller.clustering.services,
-                                                       org.opendaylight.controller.configuration,
-                                                       org.opendaylight.controller.sal.authorization,
-                                                       org.opendaylight.controller.sal.core,
-                                                       org.opendaylight.controller.sal.packet,
-                                                       org.opendaylight.controller.sal.utils,
-                                                       org.opendaylight.controller.switchmanager,
-                                                       org.opendaylight.controller.containermanager,
-                                                       org.slf4j,
-                                                       org.eclipse.osgi.framework.console,
-                                                       org.osgi.framework,
-                                                       org.apache.felix.dm,
-                                                       org.apache.commons.lang3.builder,
-                                                       org.apache.commons.logging,
-                                                       javax.servlet,
-                                                       javax.servlet.http,
-                                                       org.springframework.security.web.context,
-                                                       org.springframework.security.core,
-                                                       org.springframework.security.core.context,
-                                                       org.apache.commons.lang3,
-                                                       org.springframework.security.authentication,
-                                                       org.springframework.security.core.authority,
-                                                       org.springframework.security.core.userdetails
-
-                                               </Import-Package>
-                                               <Export-Package>
-                                                       org.opendaylight.controller.usermanager,
-                                                       org.opendaylight.controller.usermanager.internal                                                
-                                               </Export-Package>
-                                               <Bundle-Activator>
-                                                       org.opendaylight.controller.usermanager.internal.Activator
-                                               </Bundle-Activator>
-                                       </instructions>
+  <artifactId>usermanager</artifactId>
+  <version>0.4.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.3.6</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Import-Package>
+              org.opendaylight.controller.clustering.services,
+              org.opendaylight.controller.configuration,
+              org.opendaylight.controller.sal.authorization,
+              org.opendaylight.controller.sal.core,
+              org.opendaylight.controller.sal.packet,
+              org.opendaylight.controller.sal.utils,
+              org.opendaylight.controller.switchmanager,
+              org.opendaylight.controller.containermanager,
+              org.slf4j,
+              org.eclipse.osgi.framework.console,
+              org.osgi.framework,
+              org.apache.felix.dm,
+              org.apache.commons.lang3.builder,
+              org.apache.commons.logging,
+              javax.servlet,
+              javax.servlet.http,
+              org.springframework.security.web.context,
+              org.springframework.security.core,
+              org.springframework.security.core.context,
+              org.apache.commons.lang3,
+              org.springframework.security.authentication,
+              org.springframework.security.core.authority,
+              org.springframework.security.core.userdetails
+            </Import-Package>
+            <Export-Package>
+              org.opendaylight.controller.usermanager,
+              org.opendaylight.controller.usermanager.internal
+            </Export-Package>
+            <Bundle-Activator>
+              org.opendaylight.controller.usermanager.internal.Activator
+            </Bundle-Activator>
+          </instructions>
           <manifestLocation>${project.basedir}/META-INF</manifestLocation>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>switchmanager</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>containermanager</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>clustering.services</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>configuration</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>sal</artifactId>
-                       <version>0.5.0-SNAPSHOT</version>
-               </dependency>
-       </dependencies>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>switchmanager</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>containermanager</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>clustering.services</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>configuration</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal</artifactId>
+      <version>0.5.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
 </project>
index 9807173..eb0b5d3 100644 (file)
 <?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>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>commons.opendaylight</artifactId>
-               <version>1.4.0-SNAPSHOT</version>
-               <relativePath>../../commons/opendaylight</relativePath>
-       </parent>
-       <artifactId>devices.web</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
-       <packaging>bundle</packaging>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <version>2.3.6</version>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <instructions>
-                                               <Export-Package>
-                                               </Export-Package>
-                                               <Import-Package>
-                                                       org.opendaylight.controller.forwardingrulesmanager,
-                                                       org.opendaylight.controller.sal.authorization,
-                                                       org.opendaylight.controller.sal.action,
-                                                       org.opendaylight.controller.sal.core,
-                                                       org.opendaylight.controller.sal.utils,
-                                                       org.opendaylight.controller.containermanager,
-                                                       org.opendaylight.controller.switchmanager,
-                                                       org.opendaylight.controller.forwarding.staticrouting,
-                                                       org.opendaylight.controller.usermanager,
-                                                       org.opendaylight.controller.web,
-                                                       com.google.gson,
-                                                       javax.annotation,
-                                                       javax.naming,
-                                                       javax.servlet,
-                                                       javax.servlet.annotation,
-                                                       javax.servlet.http,
-                                                       javax.servlet.jsp,
-                                                       javax.servlet.jsp.el,
-                                                       javax.servlet.jsp.jstl.core,
-                                                       javax.servlet.jsp.jstl.fmt,
-                                                       javax.servlet.jsp.jstl.tlv,
-                                                       javax.servlet.jsp.tagext,
-                                                       javax.servlet.resources,
-                                                       javax.xml.parsers,
-                                                       javax.xml.transform,
-                                                       org.apache.commons.logging,
-                                                       org.apache.taglibs.standard.functions,
-                                                       org.apache.taglibs.standard.resources,
-                                                       org.apache.taglibs.standard.tag.common.core,
-                                                       org.apache.taglibs.standard.tag.common.fmt,
-                                                       org.apache.taglibs.standard.tag.rt.core,
-                                                       org.apache.taglibs.standard.tag.rt.fmt,
-                                                       org.apache.taglibs.standard.tei,
-                                                       org.apache.taglibs.standard.tlv,
-                                                       org.codehaus.jackson,
-                                                       org.codehaus.jackson.annotate,
-                                                       org.codehaus.jackson.map,
-                                                       org.codehaus.jackson.map.annotate,
-                                                       org.osgi.framework,
-                                                       org.slf4j,
-                                                       org.springframework.beans,
-                                                       org.springframework.beans.factory.xml,
-                                                       org.springframework.context.config,
-                                                       org.springframework.stereotype,
-                                                       org.springframework.web,
-                                                       org.springframework.web.bind.annotation,
-                                                       org.springframework.web.servlet,
-                                                       org.springframework.web.servlet.config,
-                                                       org.springframework.web.servlet.view,
-                                                       org.springframework.web.filter,
-                                                       org.springframework.web.context                                                 
-                                               </Import-Package>
-                                               <Web-ContextPath>/controller/web/devices</Web-ContextPath>
-                                       </instructions>
+  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.0-SNAPSHOT</version>
+    <relativePath>../../commons/opendaylight</relativePath>
+  </parent>
+
+  <artifactId>devices.web</artifactId>
+  <version>0.4.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.3.6</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Export-Package>
+            </Export-Package>
+            <Import-Package>
+              org.opendaylight.controller.forwardingrulesmanager,
+              org.opendaylight.controller.sal.authorization,
+              org.opendaylight.controller.sal.action,
+              org.opendaylight.controller.sal.core,
+              org.opendaylight.controller.sal.utils,
+              org.opendaylight.controller.containermanager,
+              org.opendaylight.controller.switchmanager,
+              org.opendaylight.controller.forwarding.staticrouting,
+              org.opendaylight.controller.usermanager,
+              org.opendaylight.controller.web,
+              com.google.gson,
+              javax.annotation,
+              javax.naming,
+              javax.servlet,
+              javax.servlet.annotation,
+              javax.servlet.http,
+              javax.servlet.jsp,
+              javax.servlet.jsp.el,
+              javax.servlet.jsp.jstl.core,
+              javax.servlet.jsp.jstl.fmt,
+              javax.servlet.jsp.jstl.tlv,
+              javax.servlet.jsp.tagext,
+              javax.servlet.resources,
+              javax.xml.parsers,
+              javax.xml.transform,
+              org.apache.commons.logging,
+              org.apache.taglibs.standard.functions,
+              org.apache.taglibs.standard.resources,
+              org.apache.taglibs.standard.tag.common.core,
+              org.apache.taglibs.standard.tag.common.fmt,
+              org.apache.taglibs.standard.tag.rt.core,
+              org.apache.taglibs.standard.tag.rt.fmt,
+              org.apache.taglibs.standard.tei,
+              org.apache.taglibs.standard.tlv,
+              org.codehaus.jackson,
+              org.codehaus.jackson.annotate,
+              org.codehaus.jackson.map,
+              org.codehaus.jackson.map.annotate,
+              org.osgi.framework,
+              org.slf4j,
+              org.springframework.beans,
+              org.springframework.beans.factory.xml,
+              org.springframework.context.config,
+              org.springframework.stereotype,
+              org.springframework.web,
+              org.springframework.web.bind.annotation,
+              org.springframework.web.servlet,
+              org.springframework.web.servlet.config,
+              org.springframework.web.servlet.view,
+              org.springframework.web.filter,
+              org.springframework.web.context
+            </Import-Package>
+            <Web-ContextPath>/controller/web/devices</Web-ContextPath>
+          </instructions>
           <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>forwardingrulesmanager</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>containermanager</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>switchmanager</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>sal</artifactId>
-                       <version>0.5.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>web</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>forwarding.staticrouting</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
-               </dependency>
-       </dependencies>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>forwardingrulesmanager</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>containermanager</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>switchmanager</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal</artifactId>
+      <version>0.5.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>web</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>forwarding.staticrouting</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
 </project>
index eefaea3..7aa0ac9 100644 (file)
 <?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>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>commons.opendaylight</artifactId>
-               <version>1.4.0-SNAPSHOT</version>
-               <relativePath>../../commons/opendaylight</relativePath>
-       </parent>
-       <artifactId>flows.web</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
-       <packaging>bundle</packaging>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <version>2.3.6</version>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <instructions>
-                                               <Export-Package>
-                                               </Export-Package>
-                                               <Import-Package>
-                                                       org.opendaylight.controller.forwardingrulesmanager,
-                                                       org.opendaylight.controller.sal.authorization,
-                                                       org.opendaylight.controller.sal.action,
-                                                       org.opendaylight.controller.sal.core,
-                                                       org.opendaylight.controller.sal.flowprogrammer,
-                                                       org.opendaylight.controller.sal.utils,
-                                                       org.opendaylight.controller.containermanager,
-                                                       org.opendaylight.controller.switchmanager,
-                                                       org.opendaylight.controller.usermanager,
-                                                       org.opendaylight.controller.web,
-                                                       com.google.gson,
-                                                       javax.annotation,
-                                                       javax.naming,
-                                                       javax.servlet,
-                                                       javax.servlet.annotation,
-                                                       javax.servlet.http,
-                                                       javax.servlet.jsp,
-                                                       javax.servlet.jsp.el,
-                                                       javax.servlet.jsp.jstl.core,
-                                                       javax.servlet.jsp.jstl.fmt,
-                                                       javax.servlet.jsp.jstl.tlv,
-                                                       javax.servlet.jsp.tagext,
-                                                       javax.servlet.resources,
-                                                       javax.xml.parsers,
-                                                       javax.xml.transform,
-                                                       org.apache.commons.logging,
-                                                       org.apache.taglibs.standard.functions,
-                                                       org.apache.taglibs.standard.resources,
-                                                       org.apache.taglibs.standard.tag.common.core,
-                                                       org.apache.taglibs.standard.tag.common.fmt,
-                                                       org.apache.taglibs.standard.tag.rt.core,
-                                                       org.apache.taglibs.standard.tag.rt.fmt,
-                                                       org.apache.taglibs.standard.tei,
-                                                       org.apache.taglibs.standard.tlv,
-                                                       org.codehaus.jackson,
-                                                       org.codehaus.jackson.annotate,
-                                                       org.codehaus.jackson.map,
-                                                       org.codehaus.jackson.map.annotate,
-                                                       org.osgi.framework,
-                                                       org.slf4j,
-                                                       org.springframework.beans,
-                                                       org.springframework.beans.factory.xml,
-                                                       org.springframework.context.config,
-                                                       org.springframework.stereotype,
-                                                       org.springframework.web,
-                                                       org.springframework.web.bind.annotation,
-                                                       org.springframework.web.servlet,
-                                                       org.springframework.web.servlet.config,
-                                                       org.springframework.web.servlet.view,
-                                                       org.springframework.web.filter,
-                                                       org.springframework.web.context                                                 \r
-                                               </Import-Package>
-                                               <Web-ContextPath>/controller/web/flows</Web-ContextPath>
-                                       </instructions>
+  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.0-SNAPSHOT</version>
+    <relativePath>../../commons/opendaylight</relativePath>
+  </parent>
+  <artifactId>flows.web</artifactId>
+  <version>0.4.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.3.6</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Export-Package>
+            </Export-Package>
+            <Import-Package>
+              org.opendaylight.controller.forwardingrulesmanager,
+              org.opendaylight.controller.sal.authorization,
+              org.opendaylight.controller.sal.action,
+              org.opendaylight.controller.sal.core,
+              org.opendaylight.controller.sal.flowprogrammer,
+              org.opendaylight.controller.sal.utils,
+              org.opendaylight.controller.containermanager,
+              org.opendaylight.controller.switchmanager,
+              org.opendaylight.controller.usermanager,
+              org.opendaylight.controller.web,
+              com.google.gson,
+              javax.annotation,
+              javax.naming,
+              javax.servlet,
+              javax.servlet.annotation,
+              javax.servlet.http,
+              javax.servlet.jsp,
+              javax.servlet.jsp.el,
+              javax.servlet.jsp.jstl.core,
+              javax.servlet.jsp.jstl.fmt,
+              javax.servlet.jsp.jstl.tlv,
+              javax.servlet.jsp.tagext,
+              javax.servlet.resources,
+              javax.xml.parsers,
+              javax.xml.transform,
+              org.apache.commons.logging,
+              org.apache.taglibs.standard.functions,
+              org.apache.taglibs.standard.resources,
+              org.apache.taglibs.standard.tag.common.core,
+              org.apache.taglibs.standard.tag.common.fmt,
+              org.apache.taglibs.standard.tag.rt.core,
+              org.apache.taglibs.standard.tag.rt.fmt,
+              org.apache.taglibs.standard.tei,
+              org.apache.taglibs.standard.tlv,
+              org.codehaus.jackson,
+              org.codehaus.jackson.annotate,
+              org.codehaus.jackson.map,
+              org.codehaus.jackson.map.annotate,
+              org.osgi.framework,
+              org.slf4j,
+              org.springframework.beans,
+              org.springframework.beans.factory.xml,
+              org.springframework.context.config,
+              org.springframework.stereotype,
+              org.springframework.web,
+              org.springframework.web.bind.annotation,
+              org.springframework.web.servlet,
+              org.springframework.web.servlet.config,
+              org.springframework.web.servlet.view,
+              org.springframework.web.filter,
+              org.springframework.web.context\r
+            </Import-Package>
+            <Web-ContextPath>/controller/web/flows</Web-ContextPath>
+          </instructions>
           <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>forwardingrulesmanager</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>containermanager</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>usermanager</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>switchmanager</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>sal</artifactId>
-                       <version>0.5.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>web</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
-               </dependency>
-       </dependencies>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>forwardingrulesmanager</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>containermanager</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>usermanager</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>switchmanager</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal</artifactId>
+      <version>0.5.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>web</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
 </project>
index 76a7cb1..872260b 100644 (file)
 <?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>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>commons.opendaylight</artifactId>
-               <version>1.4.0-SNAPSHOT</version>
-               <relativePath>../../commons/opendaylight</relativePath>
-       </parent>
+  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.0-SNAPSHOT</version>
+    <relativePath>../../commons/opendaylight</relativePath>
+  </parent>
 
-       <artifactId>web</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
-       <packaging>bundle</packaging>
+  <artifactId>web</artifactId>
+  <version>0.4.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
 
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <version>2.3.6</version>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <instructions>
-                                               <Import-Package>
-                                                       org.opendaylight.controller.configuration,
-                                                       org.opendaylight.controller.sal.authorization,
-                                                       org.opendaylight.controller.sal.core,
-                                                       org.opendaylight.controller.sal.utils,
-                                                       org.opendaylight.controller.usermanager,
-                                                       org.opendaylight.controller.usermanager.internal,
-                                                       org.opendaylight.controller.containermanager,
-                                                       com.google.gson,
-                                                       javax.annotation,
-                                                       javax.naming,
-                                                       javax.servlet,
-                                                       javax.servlet.annotation,
-                                                       javax.servlet.http,
-                                                       javax.servlet.jsp,
-                                                       javax.servlet.jsp.el,
-                                                       javax.servlet.jsp.jstl.core,
-                                                       javax.servlet.jsp.jstl.fmt,
-                                                       javax.servlet.jsp.jstl.tlv,
-                                                       javax.servlet.jsp.tagext,
-                                                       javax.servlet.resources,
-                                                       javax.xml.parsers,
-                                                       javax.xml.transform,
-                                                       org.apache.commons.logging,
-                                                       org.apache.taglibs.standard.functions,
-                                                       org.apache.taglibs.standard.resources,
-                                                       org.apache.taglibs.standard.tag.common.core,
-                                                       org.apache.taglibs.standard.tag.common.fmt,
-                                                       org.apache.taglibs.standard.tag.rt.core,
-                                                       org.apache.taglibs.standard.tag.rt.fmt,
-                                                       org.apache.taglibs.standard.tei,
-                                                       org.apache.taglibs.standard.tlv,
-                                                       org.codehaus.jackson,
-                                                       org.codehaus.jackson.annotate,
-                                                       org.codehaus.jackson.map,
-                                                       org.codehaus.jackson.map.annotate,
-                                                       org.osgi.framework,
-                                                       org.slf4j,
-                                                       org.springframework.beans,
-                                                       org.springframework.beans.factory.xml,
-                                                       org.springframework.context.config,
-                                                       org.springframework.core,
-                                                       org.springframework.stereotype,
-                                                       org.springframework.ui,
-                                                       org.springframework.web,
-                                                       org.springframework.web.bind.annotation,
-                                                       org.springframework.web.servlet,
-                                                       org.springframework.web.servlet.config,
-                                                       org.springframework.web.servlet.view,
-                                                       org.springframework.web.servlet.view.json,
-                                                       org.springframework.web.filter,
-                                                       org.springframework.web.context,
-                                                       org.springframework.util
-                                               </Import-Package>
-                                               <Export-Package>
-                                                       org.opendaylight.controller.web
-                                               </Export-Package>
-                                               <Web-ContextPath>/</Web-ContextPath>
-                                       </instructions>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.3.6</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Import-Package>
+              org.opendaylight.controller.configuration,
+              org.opendaylight.controller.sal.authorization,
+              org.opendaylight.controller.sal.core,
+              org.opendaylight.controller.sal.utils,
+              org.opendaylight.controller.usermanager,
+              org.opendaylight.controller.usermanager.internal,
+              org.opendaylight.controller.containermanager,
+              com.google.gson,
+              javax.annotation,
+              javax.naming,
+              javax.servlet,
+              javax.servlet.annotation,
+              javax.servlet.http,
+              javax.servlet.jsp,
+              javax.servlet.jsp.el,
+              javax.servlet.jsp.jstl.core,
+              javax.servlet.jsp.jstl.fmt,
+              javax.servlet.jsp.jstl.tlv,
+              javax.servlet.jsp.tagext,
+              javax.servlet.resources,
+              javax.xml.parsers,
+              javax.xml.transform,
+              org.apache.commons.logging,
+              org.apache.taglibs.standard.functions,
+              org.apache.taglibs.standard.resources,
+              org.apache.taglibs.standard.tag.common.core,
+              org.apache.taglibs.standard.tag.common.fmt,
+              org.apache.taglibs.standard.tag.rt.core,
+              org.apache.taglibs.standard.tag.rt.fmt,
+              org.apache.taglibs.standard.tei,
+              org.apache.taglibs.standard.tlv,
+              org.codehaus.jackson,
+              org.codehaus.jackson.annotate,
+              org.codehaus.jackson.map,
+              org.codehaus.jackson.map.annotate,
+              org.osgi.framework,
+              org.slf4j,
+              org.springframework.beans,
+              org.springframework.beans.factory.xml,
+              org.springframework.context.config,
+              org.springframework.core,
+              org.springframework.stereotype,
+              org.springframework.ui,
+              org.springframework.web,
+              org.springframework.web.bind.annotation,
+              org.springframework.web.servlet,
+              org.springframework.web.servlet.config,
+              org.springframework.web.servlet.view,
+              org.springframework.web.servlet.view.json,
+              org.springframework.web.filter,
+              org.springframework.web.context,
+              org.springframework.util
+            </Import-Package>
+            <Export-Package>
+              org.opendaylight.controller.web
+            </Export-Package>
+            <Web-ContextPath>/</Web-ContextPath>
+          </instructions>
           <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>configuration</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>sal</artifactId>
-                       <version>0.5.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>usermanager</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>containermanager</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>4.8.1</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-beans</artifactId>
-                       <version>3.2.1.RELEASE</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-core</artifactId>
-                       <version>3.2.1.RELEASE</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-context</artifactId>
-                       <version>3.2.1.RELEASE</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-expression</artifactId>
-                       <version>3.2.1.RELEASE</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-web</artifactId>
-                       <version>3.2.1.RELEASE</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-webmvc</artifactId>
-                       <version>3.2.1.RELEASE</version>
-                       <scope>provided</scope>
-               </dependency>
-       </dependencies>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>configuration</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal</artifactId>
+      <version>0.5.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>usermanager</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>containermanager</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.8.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>3.2.1.RELEASE</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>3.2.1.RELEASE</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>3.2.1.RELEASE</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-expression</artifactId>
+      <version>3.2.1.RELEASE</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>3.2.1.RELEASE</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>3.2.1.RELEASE</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
 </project>
index 2a8cb9f..3dbb324 100644 (file)
 <?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>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>commons.opendaylight</artifactId>
-               <version>1.4.0-SNAPSHOT</version>
-               <relativePath>../../commons/opendaylight</relativePath>
-       </parent>
-       <artifactId>topology.web</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
-       <packaging>bundle</packaging>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <version>2.3.6</version>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <instructions>
-                                               <Export-Package>
-                                               </Export-Package>
-                                               <Import-Package>
-                                                       org.opendaylight.controller.containermanager,
-                                                       org.opendaylight.controller.configuration,
-                                                       org.opendaylight.controller.sal.authorization,
-                                                       org.opendaylight.controller.sal.packet.address,
-                                                       org.opendaylight.controller.sal.action,
-                                                       org.opendaylight.controller.sal.core,
-                                                       org.opendaylight.controller.sal.utils,
-                                                       org.opendaylight.controller.switchmanager,
-                                                       org.opendaylight.controller.topologymanager,
-                                                       org.opendaylight.controller.usermanager,
-                                                       org.opendaylight.controller.web,
-                                                       com.google.gson,
-                                                       edu.uci.ics.jung.algorithms.layout,
-                                                       edu.uci.ics.jung.graph,
-                                                       javax.annotation,
-                                                       javax.naming,
-                                                       javax.servlet,
-                                                       javax.servlet.annotation,
-                                                       javax.servlet.http,
-                                                       javax.servlet.jsp,
-                                                       javax.servlet.jsp.el,
-                                                       javax.servlet.jsp.jstl.core,
-                                                       javax.servlet.jsp.jstl.fmt,
-                                                       javax.servlet.jsp.jstl.tlv,
-                                                       javax.servlet.jsp.tagext,
-                                                       javax.servlet.resources,
-                                                       javax.xml.parsers,
-                                                       javax.xml.transform,
-                                                       org.apache.commons.logging,
-                                                       org.apache.taglibs.standard.functions,
-                                                       org.apache.taglibs.standard.resources,
-                                                       org.apache.taglibs.standard.tag.common.core,
-                                                       org.apache.taglibs.standard.tag.common.fmt,
-                                                       org.apache.taglibs.standard.tag.rt.core,
-                                                       org.apache.taglibs.standard.tag.rt.fmt,
-                                                       org.apache.taglibs.standard.tei,
-                                                       org.apache.taglibs.standard.tlv,
-                                                       org.codehaus.jackson,
-                                                       org.codehaus.jackson.annotate,
-                                                       org.codehaus.jackson.map,
-                                                       org.codehaus.jackson.map.annotate,
-                                                       org.osgi.framework,
-                                                       org.slf4j,
-                                                       org.springframework.beans,
-                                                       org.springframework.beans.factory.xml,
-                                                       org.springframework.context.config,
-                                                       org.springframework.stereotype,
-                                                       org.springframework.util,
-                                                       org.springframework.web,
-                                                       org.springframework.web.bind.annotation,
-                                                       org.springframework.web.servlet,
-                                                       org.springframework.web.servlet.config,
-                                                       org.springframework.web.servlet.view,
-                                                       org.springframework.web.filter,
-                                                       org.springframework.web.context,
-                                               </Import-Package>
-                                               <Web-ContextPath>/controller/web/topology</Web-ContextPath>
-                                       </instructions>
+  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.0-SNAPSHOT</version>
+    <relativePath>../../commons/opendaylight</relativePath>
+  </parent>
+  <artifactId>topology.web</artifactId>
+  <version>0.4.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.3.6</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Export-Package>
+            </Export-Package>
+            <Import-Package>
+              org.opendaylight.controller.containermanager,
+              org.opendaylight.controller.configuration,
+              org.opendaylight.controller.sal.authorization,
+              org.opendaylight.controller.sal.packet.address,
+              org.opendaylight.controller.sal.action,
+              org.opendaylight.controller.sal.core,
+              org.opendaylight.controller.sal.utils,
+              org.opendaylight.controller.switchmanager,
+              org.opendaylight.controller.topologymanager,
+              org.opendaylight.controller.usermanager,
+              org.opendaylight.controller.web,
+              com.google.gson,
+              edu.uci.ics.jung.algorithms.layout,
+              edu.uci.ics.jung.graph,
+              javax.annotation,
+              javax.naming,
+              javax.servlet,
+              javax.servlet.annotation,
+              javax.servlet.http,
+              javax.servlet.jsp,
+              javax.servlet.jsp.el,
+              javax.servlet.jsp.jstl.core,
+              javax.servlet.jsp.jstl.fmt,
+              javax.servlet.jsp.jstl.tlv,
+              javax.servlet.jsp.tagext,
+              javax.servlet.resources,
+              javax.xml.parsers,
+              javax.xml.transform,
+              org.apache.commons.logging,
+              org.apache.taglibs.standard.functions,
+              org.apache.taglibs.standard.resources,
+              org.apache.taglibs.standard.tag.common.core,
+              org.apache.taglibs.standard.tag.common.fmt,
+              org.apache.taglibs.standard.tag.rt.core,
+              org.apache.taglibs.standard.tag.rt.fmt,
+              org.apache.taglibs.standard.tei,
+              org.apache.taglibs.standard.tlv,
+              org.codehaus.jackson,
+              org.codehaus.jackson.annotate,
+              org.codehaus.jackson.map,
+              org.codehaus.jackson.map.annotate,
+              org.osgi.framework,
+              org.slf4j,
+              org.springframework.beans,
+              org.springframework.beans.factory.xml,
+              org.springframework.context.config,
+              org.springframework.stereotype,
+              org.springframework.util,
+              org.springframework.web,
+              org.springframework.web.bind.annotation,
+              org.springframework.web.servlet,
+              org.springframework.web.servlet.config,
+              org.springframework.web.servlet.view,
+              org.springframework.web.filter,
+              org.springframework.web.context,
+            </Import-Package>
+            <Web-ContextPath>/controller/web/topology</Web-ContextPath>
+          </instructions>
           <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <dependency>
-                       <groupId>org.opendaylight.controller.thirdparty</groupId>
-                       <artifactId>net.sf.jung2</artifactId>
-                       <version>2.0.1-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>containermanager</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>configuration</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
-               </dependency>           
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>switchmanager</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>sal</artifactId>
-                       <version>0.5.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>topologymanager</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>web</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
-               </dependency>
-       </dependencies>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.controller.thirdparty</groupId>
+      <artifactId>net.sf.jung2</artifactId>
+      <version>2.0.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>containermanager</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>configuration</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>switchmanager</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal</artifactId>
+      <version>0.5.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>topologymanager</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>web</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
 </project>
index 0d08882..26001d6 100644 (file)
 <?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>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>commons.opendaylight</artifactId>
-               <version>1.4.0-SNAPSHOT</version>
-               <relativePath>../../commons/opendaylight</relativePath>
-       </parent>
-       <artifactId>troubleshoot.web</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
-       <packaging>bundle</packaging>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <version>2.3.6</version>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <instructions>
-                                               <Export-Package>
-                                               </Export-Package>
-                                               <Import-Package>
-                                                       org.opendaylight.controller.forwardingrulesmanager,
-                                                       org.opendaylight.controller.sal.authorization,
-                                                       org.opendaylight.controller.sal.action,
-                                                       org.opendaylight.controller.sal.core,
-                                                       org.opendaylight.controller.sal.utils,
-                                                       org.opendaylight.controller.containermanager,
-                                                       org.opendaylight.controller.switchmanager,
-                                                       org.opendaylight.controller.statisticsmanager,
-                                                       org.opendaylight.controller.sal.flowprogrammer,
-                                                       org.opendaylight.controller.sal.match,
-                                                       org.opendaylight.controller.sal.reader,
-                                                       org.opendaylight.controller.web,
-                                                       com.google.gson,
-                                                       javax.annotation,
-                                                       javax.naming,
-                                                       javax.servlet,
-                                                       javax.servlet.annotation,
-                                                       javax.servlet.http,
-                                                       javax.servlet.jsp,
-                                                       javax.servlet.jsp.el,
-                                                       javax.servlet.jsp.jstl.core,
-                                                       javax.servlet.jsp.jstl.fmt,
-                                                       javax.servlet.jsp.jstl.tlv,
-                                                       javax.servlet.jsp.tagext,
-                                                       javax.servlet.resources,
-                                                       javax.xml.parsers,
-                                                       javax.xml.transform,
-                                                       org.apache.commons.logging,
-                                                       org.apache.taglibs.standard.functions,
-                                                       org.apache.taglibs.standard.resources,
-                                                       org.apache.taglibs.standard.tag.common.core,
-                                                       org.apache.taglibs.standard.tag.common.fmt,
-                                                       org.apache.taglibs.standard.tag.rt.core,
-                                                       org.apache.taglibs.standard.tag.rt.fmt,
-                                                       org.apache.taglibs.standard.tei,
-                                                       org.apache.taglibs.standard.tlv,
-                                                       org.codehaus.jackson,
-                                                       org.codehaus.jackson.annotate,
-                                                       org.codehaus.jackson.map,
-                                                       org.codehaus.jackson.map.annotate,
-                                                       org.osgi.framework,
-                                                       org.slf4j,
-                                                       org.springframework.beans,
-                                                       org.springframework.beans.factory.xml,
-                                                       org.springframework.context.config,
-                                                       org.springframework.stereotype,
-                                                       org.springframework.web,
-                                                       org.springframework.web.bind.annotation,
-                                                       org.springframework.web.servlet,
-                                                       org.springframework.web.servlet.config,
-                                                       org.springframework.web.servlet.view,
-                                                       org.springframework.web.filter,
-                                                       org.springframework.web.context                                                 
-                                               </Import-Package>
-                                               <Web-ContextPath>/controller/web/troubleshoot</Web-ContextPath>
-                                       </instructions>
+  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.0-SNAPSHOT</version>
+    <relativePath>../../commons/opendaylight</relativePath>
+  </parent>
+  <artifactId>troubleshoot.web</artifactId>
+  <version>0.4.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.3.6</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Export-Package>
+            </Export-Package>
+            <Import-Package>
+              org.opendaylight.controller.forwardingrulesmanager,
+              org.opendaylight.controller.sal.authorization,
+              org.opendaylight.controller.sal.action,
+              org.opendaylight.controller.sal.core,
+              org.opendaylight.controller.sal.utils,
+              org.opendaylight.controller.containermanager,
+              org.opendaylight.controller.switchmanager,
+              org.opendaylight.controller.statisticsmanager,
+              org.opendaylight.controller.sal.flowprogrammer,
+              org.opendaylight.controller.sal.match,
+              org.opendaylight.controller.sal.reader,
+              org.opendaylight.controller.web,
+              com.google.gson,
+              javax.annotation,
+              javax.naming,
+              javax.servlet,
+              javax.servlet.annotation,
+              javax.servlet.http,
+              javax.servlet.jsp,
+              javax.servlet.jsp.el,
+              javax.servlet.jsp.jstl.core,
+              javax.servlet.jsp.jstl.fmt,
+              javax.servlet.jsp.jstl.tlv,
+              javax.servlet.jsp.tagext,
+              javax.servlet.resources,
+              javax.xml.parsers,
+              javax.xml.transform,
+              org.apache.commons.logging,
+              org.apache.taglibs.standard.functions,
+              org.apache.taglibs.standard.resources,
+              org.apache.taglibs.standard.tag.common.core,
+              org.apache.taglibs.standard.tag.common.fmt,
+              org.apache.taglibs.standard.tag.rt.core,
+              org.apache.taglibs.standard.tag.rt.fmt,
+              org.apache.taglibs.standard.tei,
+              org.apache.taglibs.standard.tlv,
+              org.codehaus.jackson,
+              org.codehaus.jackson.annotate,
+              org.codehaus.jackson.map,
+              org.codehaus.jackson.map.annotate,
+              org.osgi.framework,
+              org.slf4j,
+              org.springframework.beans,
+              org.springframework.beans.factory.xml,
+              org.springframework.context.config,
+              org.springframework.stereotype,
+              org.springframework.web,
+              org.springframework.web.bind.annotation,
+              org.springframework.web.servlet,
+              org.springframework.web.servlet.config,
+              org.springframework.web.servlet.view,
+              org.springframework.web.filter,
+              org.springframework.web.context
+            </Import-Package>
+            <Web-ContextPath>/controller/web/troubleshoot</Web-ContextPath>
+          </instructions>
           <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>forwardingrulesmanager</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>containermanager</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>switchmanager</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>sal</artifactId>
-                       <version>0.5.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>statisticsmanager</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>web</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
-               </dependency>
-       </dependencies>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>forwardingrulesmanager</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>containermanager</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>switchmanager</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal</artifactId>
+      <version>0.5.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>statisticsmanager</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>web</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
 </project>
index 0cc0597..f927bf4 100644 (file)
   <build>
     <plugins>
       <plugin>
-       <groupId>org.apache.felix</groupId>
-       <artifactId>maven-bundle-plugin</artifactId>
-       <version>2.3.6</version>
-       <extensions>true</extensions>
-       <configuration>
-         <instructions>
-           <Export-Package>
-             org.openflow.example;version="1.0.1";
-             uses:="org.openflow.example.cli,
-             org.openflow.protocol,
-             org.openflow.io,
-             org.openflow.protocol.factory",
-             org.openflow.io;version="1.0.1";
-             uses:="org.openflow.protocol,
-             org.openflow.protocol.factory",
-             org.openflow.protocol;version="1.0.1";
-             uses:="org.openflow.protocol.statistics,
-             org.openflow.protocol,
-             org.openflow.protocol.factory",
-             org.openflow.protocol.action;version="1.0.1";
-             uses:="org.openflow.protocol",
-             org.openflow.protocol.factory;version="1.0.1";
-             uses:="org.openflow.protocol.statistics,
-             org.openflow.protocol,
-             org.openflow.protocol.action,
-             org.openflow.protocol.queue",
-             org.openflow.protocol.queue;version="1.0.2";
-             uses:="org.openflow.protocol,
-             org.openflow.protocol.factory",
-             org.openflow.protocol.statistics;version="1.0.1";
-             uses:="org.openflow.protocol,
-             org.openflow.protocol.factory",
-             org.openflow.util;version="1.0.1"
-           </Export-Package>
-         </instructions>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.3.6</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Export-Package>
+              org.openflow.example;version="1.0.1";
+              uses:="org.openflow.example.cli,
+              org.openflow.protocol,
+              org.openflow.io,
+              org.openflow.protocol.factory",
+              org.openflow.io;version="1.0.1";
+              uses:="org.openflow.protocol,
+              org.openflow.protocol.factory",
+              org.openflow.protocol;version="1.0.1";
+              uses:="org.openflow.protocol.statistics,
+              org.openflow.protocol,
+              org.openflow.protocol.factory",
+              org.openflow.protocol.action;version="1.0.1";
+              uses:="org.openflow.protocol",
+              org.openflow.protocol.factory;version="1.0.1";
+              uses:="org.openflow.protocol.statistics,
+              org.openflow.protocol,
+              org.openflow.protocol.action,
+              org.openflow.protocol.queue",
+              org.openflow.protocol.queue;version="1.0.2";
+              uses:="org.openflow.protocol,
+              org.openflow.protocol.factory",
+              org.openflow.protocol.statistics;version="1.0.1";
+              uses:="org.openflow.protocol,
+              org.openflow.protocol.factory",
+              org.openflow.util;version="1.0.1"
+            </Export-Package>
+          </instructions>
           <manifestLocation>${project.basedir}/META-INF</manifestLocation>
-       </configuration>
+        </configuration>
       </plugin>
       <plugin>
-       <groupId>org.apache.maven.plugins</groupId>
-       <artifactId>maven-compiler-plugin</artifactId>
-       <version>2.3.2</version>
-       <configuration>
-         <source>1.6</source>
-         <target>1.6</target>
-       </configuration>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.3.2</version>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
       </plugin>
     </plugins>
   </build>