From: Ed Warnicke <eaw@cisco.com>
Date: Wed, 15 Jan 2014 05:08:51 +0000 (+0000)
Subject: Merge "Add shutdown hook."
X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~92
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=58fa0dd65634800eccaa1bbe85769835a0e6e071;hp=-c

Merge "Add shutdown hook."
---

58fa0dd65634800eccaa1bbe85769835a0e6e071
diff --combined opendaylight/config/pom.xml
index 1a29046e2d,ca576824fa..acd4916a4b
--- a/opendaylight/config/pom.xml
+++ b/opendaylight/config/pom.xml
@@@ -41,8 -41,9 +41,10 @@@
          <module>netty-timer-config</module>
          <module>config-persister-directory-adapter</module>
          <module>config-persister-directory-xml-adapter</module>
 +        <module>config-persister-directory-autodetect-adapter</module>
          <module>yang-test-plugin</module>
+         <module>shutdown-api</module>
+         <module>shutdown-impl</module>
      </modules>
  
      <profiles>
@@@ -69,6 -70,7 +71,7 @@@
          <opendaylight.yang.version>0.5.9-SNAPSHOT</opendaylight.yang.version>
          <opendaylight.binding.version>0.6.0-SNAPSHOT</opendaylight.binding.version>
          <opendaylight.yangtools.version>0.1.1-SNAPSHOT</opendaylight.yangtools.version>
+         <salGeneratorPath>${project.build.directory}/generated-sources/sal</salGeneratorPath>
      </properties>
  
      <dependencies>
@@@ -157,12 -159,6 +160,12 @@@
                  <version>${config.version}</version>
              </dependency>
              <dependency>
 +                <groupId>${project.groupId}</groupId>
 +                <artifactId>config-persister-api</artifactId>
 +                <version>${config.version}</version>
 +                <type>test-jar</type>
 +            </dependency>
 +            <dependency>
                  <groupId>org.opendaylight.bgpcep</groupId>
                  <artifactId>mockito-configuration</artifactId>
                  <version>${bgpcep.version}</version>
@@@ -219,6 -215,12 +222,12 @@@
                  <version>${config.version}</version>
              </dependency>
  
+             <dependency>
+                 <groupId>org.opendaylight.controller</groupId>
+                 <artifactId>shutdown-api</artifactId>
+                 <version>${config.version}</version>
+             </dependency>
+ 
              <!-- MD-SAL -->
              <dependency>
                  <groupId>org.opendaylight.yangtools</groupId>
@@@ -276,10 -278,8 +285,8 @@@
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-surefire-plugin</artifactId>
              </plugin>
-             <plugin>
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>build-helper-maven-plugin</artifactId>
-             </plugin>
+ 
+ 
          </plugins>
  
          <pluginManagement>
@@@ -302,7 -302,7 +309,7 @@@
                                              org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl
                                          </codeGeneratorClass>
                                          <outputBaseDir>
-                                             target/generated-sources/sal
+                                             ${salGeneratorPath}
                                          </outputBaseDir>
                                      </generator>
                                      <generator>
@@@ -323,6 -323,26 +330,26 @@@
                          </dependency>
                      </dependencies>
                  </plugin>
+                 <!-- tell eclipse about generated source folders -->
+                 <plugin>
+                     <groupId>org.codehaus.mojo</groupId>
+                     <artifactId>build-helper-maven-plugin</artifactId>
+                     <version>1.8</version>
+                     <executions>
+                         <execution>
+                             <id>add-source</id>
+                             <phase>generate-sources</phase>
+                             <goals>
+                                 <goal>add-source</goal>
+                             </goals>
+                             <configuration>
+                                 <sources>
+                                     <source>${salGeneratorPath}</source>
+                                 </sources>
+                             </configuration>
+                         </execution>
+                     </executions>
+                 </plugin>
                  <plugin>
                      <groupId>org.apache.maven.plugins</groupId>
                      <artifactId>maven-jar-plugin</artifactId>
diff --combined opendaylight/distribution/opendaylight/pom.xml
index 9f3862f2ad,7a4bc4a031..5acdec834d
--- a/opendaylight/distribution/opendaylight/pom.xml
+++ b/opendaylight/distribution/opendaylight/pom.xml
@@@ -152,6 -152,7 +152,6 @@@
          <dependency>
           <groupId>org.opendaylight.yangtools.model</groupId>
           <artifactId>ietf-topology</artifactId>
 -         <version>2013.07.12.2-SNAPSHOT</version>
          </dependency>
          <dependency>
              <groupId>org.opendaylight.controller</groupId>
@@@ -262,12 -263,18 +262,23 @@@
            <artifactId>config-persister-directory-xml-adapter</artifactId>
            <version>${config.version}</version>
          </dependency>
 +        <dependency>
 +          <groupId>org.opendaylight.controller</groupId>
 +          <artifactId>config-persister-directory-autodetect-adapter</artifactId>
 +          <version>${config.version}</version>
 +        </dependency>
  
+         <dependency>
+           <groupId>org.opendaylight.controller</groupId>
+           <artifactId>shutdown-api</artifactId>
+           <version>${config.version}</version>
+         </dependency>
+         <dependency>
+           <groupId>org.opendaylight.controller</groupId>
+           <artifactId>shutdown-impl</artifactId>
+           <version>${config.version}</version>
+         </dependency>
+ 
         <!-- Netconf -->
          <dependency>
            <groupId>org.opendaylight.controller</groupId>