Prevent new code from using the DataBroker

This introduces a new Checkstyle check to fail the build if code
*calls* the newReadWriteTransaction or newWriteOnlyTransaction methods
in DataBroker. I haven’t found a nice way to make this check
conditional, so for now it’s added via a new parent module,
managed-tx-parent, which is used instead of binding-parent in all
modules which currently support it.

This patch is self-contained, but the plan is to move the Checkstyle
implementation to infrautils and the Checkstyle configuration to
Genius or MD-SAL, alongside ManagedNewTransactionRunner. Once all the
existing code has been converted to use only
ManagedNewTransactionRunner, we’ll be able to apply the configuration
to binding-parent and do away with managed-tx-parent.

Change-Id: I27ab7f0744477606bae04bff31a2148134038bb8
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/aclservice/api/pom.xml b/aclservice/api/pom.xml
index ef11e67592349033d2a0c6b9bc19a776ce120660..e0317132876c2e2b0b864bfc269193b856353be0 100644 (file)
--- a/aclservice/api/pom.xml
+++ b/aclservice/api/pom.xml
@@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <parent>
         <groupId>org.opendaylight.netvirt</groupId>
-        <artifactId>binding-parent</artifactId>
+        <artifactId>managed-tx-parent</artifactId>
         <version>0.7.0-SNAPSHOT</version>
-        <relativePath>../../commons/binding-parent</relativePath>
+        <relativePath>../../commons/managed-tx-parent</relativePath>
     </parent>
 
     <artifactId>aclservice-api</artifactId>

diff --git a/aclservice/impl/pom.xml b/aclservice/impl/pom.xml
index 66f7fdbc7f9af652a73ed392ff2954a2a740c938..d4608dc602cabf8060551b5e203a0bb8f8e65559 100644 (file)
--- a/aclservice/impl/pom.xml
+++ b/aclservice/impl/pom.xml
@@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <parent>
         <groupId>org.opendaylight.netvirt</groupId>
-        <artifactId>binding-parent</artifactId>
+        <artifactId>managed-tx-parent</artifactId>
         <version>0.7.0-SNAPSHOT</version>
-        <relativePath>../../commons/binding-parent</relativePath>
+        <relativePath>../../commons/managed-tx-parent</relativePath>
     </parent>
 
     <artifactId>aclservice-impl</artifactId>

diff --git a/aclservice/shell/pom.xml b/aclservice/shell/pom.xml
index 7bf41c7e21ab3e2ff4efb9d569b08b89a620bf43..0d4fb5a12f2c7d5defe3ccef7f7cfe003a8379f9 100644 (file)
--- a/aclservice/shell/pom.xml
+++ b/aclservice/shell/pom.xml
@@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <parent>
         <groupId>org.opendaylight.netvirt</groupId>
-        <artifactId>binding-parent</artifactId>
+        <artifactId>managed-tx-parent</artifactId>
         <version>0.7.0-SNAPSHOT</version>
-        <relativePath>../../commons/binding-parent</relativePath>
+        <relativePath>../../commons/managed-tx-parent</relativePath>
     </parent>
 
     <artifactId>aclservice-shell</artifactId>

diff --git a/alarm/impl/pom.xml b/alarm/impl/pom.xml
index 4d2f10305c4d58f41226405664e387823f3d2aeb..86c309c2c8ac024a680d80ec0807fade2268b1d4 100644 (file)
--- a/alarm/impl/pom.xml
+++ b/alarm/impl/pom.xml
@@ -12,9 +12,9 @@
 
     <parent>
         <groupId>org.opendaylight.netvirt</groupId>
-        <artifactId>binding-parent</artifactId>
+        <artifactId>managed-tx-parent</artifactId>
         <version>0.7.0-SNAPSHOT</version>
-        <relativePath>../../commons/binding-parent</relativePath>
+        <relativePath>../../commons/managed-tx-parent</relativePath>
     </parent>
 
     <artifactId>alarm-impl</artifactId>

diff --git a/bgpmanager/api/pom.xml b/bgpmanager/api/pom.xml
index 781dd25e0281948327b49fafefcc124d00cce5f2..2b6ebcae1ee1a475a1265ca67172691eaf38b9d9 100644 (file)
--- a/bgpmanager/api/pom.xml
+++ b/bgpmanager/api/pom.xml
@@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <parent>
     <groupId>org.opendaylight.netvirt</groupId>
-    <artifactId>binding-parent</artifactId>
+    <artifactId>managed-tx-parent</artifactId>
     <version>0.7.0-SNAPSHOT</version>
-    <relativePath>../../commons/binding-parent</relativePath>
+    <relativePath>../../commons/managed-tx-parent</relativePath>
   </parent>
 
   <artifactId>bgpmanager-api</artifactId>

diff --git a/bgpmanager/impl/pom.xml b/bgpmanager/impl/pom.xml
index b5d0a211cbecbb94e948bc54db5fac8f6b5cc32a..7a234fe351d36961a5942607e846b3ed19881ec8 100644 (file)
--- a/bgpmanager/impl/pom.xml
+++ b/bgpmanager/impl/pom.xml
@@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <parent>
         <groupId>org.opendaylight.netvirt</groupId>
-        <artifactId>binding-parent</artifactId>
+        <artifactId>managed-tx-parent</artifactId>
         <version>0.7.0-SNAPSHOT</version>
-        <relativePath>../../commons/binding-parent</relativePath>
+        <relativePath>../../commons/managed-tx-parent</relativePath>
     </parent>
 
     <artifactId>bgpmanager-impl</artifactId>

diff --git a/cache/impl/pom.xml b/cache/impl/pom.xml
index a81a9d19861ca7b447e535ea4860a051b8a0f26f..eed630c8c4dab4c9082422f50c2b455084bdc84a 100644 (file)
--- a/cache/impl/pom.xml
+++ b/cache/impl/pom.xml
@@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <parent>
         <groupId>org.opendaylight.netvirt</groupId>
-        <artifactId>binding-parent</artifactId>
+        <artifactId>managed-tx-parent</artifactId>
         <version>0.7.0-SNAPSHOT</version>
-        <relativePath>../../commons/binding-parent</relativePath>
+        <relativePath>../../commons/managed-tx-parent</relativePath>
     </parent>
 
     <artifactId>cache-impl</artifactId>

diff --git a/cloud-servicechain/api/pom.xml b/cloud-servicechain/api/pom.xml
index 1c78b6c49e82c547a5237aad8449de3a0b220963..debbe1bb4d6c0ec2822d760893d240191e025c80 100644 (file)
--- a/cloud-servicechain/api/pom.xml
+++ b/cloud-servicechain/api/pom.xml
@@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <parent>
         <groupId>org.opendaylight.netvirt</groupId>
-        <artifactId>binding-parent</artifactId>
+        <artifactId>managed-tx-parent</artifactId>
         <version>0.7.0-SNAPSHOT</version>
-        <relativePath>../../commons/binding-parent</relativePath>
+        <relativePath>../../commons/managed-tx-parent</relativePath>
     </parent>
 
     <artifactId>cloud-servicechain-api</artifactId>

diff --git a/cloud-servicechain/impl/pom.xml b/cloud-servicechain/impl/pom.xml
index cb09ae061f33c7b13a8e16c7c33fa9dfb1d9a3e8..e86fc8e0513cb94d59c21f214aff616ff55fa776 100644 (file)
--- a/cloud-servicechain/impl/pom.xml
+++ b/cloud-servicechain/impl/pom.xml
@@ -8,9 +8,9 @@
 
     <parent>
         <groupId>org.opendaylight.netvirt</groupId>
-        <artifactId>binding-parent</artifactId>
+        <artifactId>managed-tx-parent</artifactId>
         <version>0.7.0-SNAPSHOT</version>
-        <relativePath>../../commons/binding-parent</relativePath>
+        <relativePath>../../commons/managed-tx-parent</relativePath>
     </parent>
 
     <artifactId>cloud-servicechain-impl</artifactId>

diff --git a/coe/api/pom.xml b/coe/api/pom.xml
index c74105b1ee5af2cd91f1dd12a5896736cbd35c2b..757b1d6b59347e8c9fc6a1520084b0e683d039e0 100644 (file)
--- a/coe/api/pom.xml
+++ b/coe/api/pom.xml
@@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <parent>
         <groupId>org.opendaylight.netvirt</groupId>
-        <artifactId>binding-parent</artifactId>
+        <artifactId>managed-tx-parent</artifactId>
         <version>0.7.0-SNAPSHOT</version>
-        <relativePath>../../commons/binding-parent</relativePath>
+        <relativePath>../../commons/managed-tx-parent</relativePath>
     </parent>
 
     <artifactId>coe-api</artifactId>

diff --git a/coe/impl/pom.xml b/coe/impl/pom.xml
index 4ced776ac2fecb09298a71d297c1332f1c14b49b..c6ca37355df3082e9985e1f8468e721a929604a9 100644 (file)
--- a/coe/impl/pom.xml
+++ b/coe/impl/pom.xml
@@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <parent>
         <groupId>org.opendaylight.netvirt</groupId>
-        <artifactId>binding-parent</artifactId>
+        <artifactId>managed-tx-parent</artifactId>
         <version>0.7.0-SNAPSHOT</version>
-        <relativePath>../../commons/binding-parent</relativePath>
+        <relativePath>../../commons/managed-tx-parent</relativePath>
     </parent>
 
     <artifactId>coe-impl</artifactId>

diff --git a/commons/checkstyle/pom.xml b/commons/checkstyle/pom.xml
new file mode 100644 (file)
index 0000000..ec6eadc
--- /dev/null
+++ b/commons/checkstyle/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright © 2018 Red Hat, Inc. and others.
+
+This program and the accompanying materials are made available under the
+terms of the Eclipse Public License v1.0 which accompanies this distribution,
+and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent</artifactId>
+        <version>3.0.2</version>
+    </parent>
+
+    <groupId>org.opendaylight.netvirt</groupId>
+    <artifactId>checkstyle</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <name>ODL :: netvirt :: ${project.artifactId}</name>
+    <modelVersion>4.0.0</modelVersion>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.puppycrawl.tools</groupId>
+            <artifactId>checkstyle</artifactId>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file

diff --git a/commons/checkstyle/src/main/java/org/opendaylight/netvirt/checkstyle/ForbiddenMethodCheck.java b/commons/checkstyle/src/main/java/org/opendaylight/netvirt/checkstyle/ForbiddenMethodCheck.java
new file mode 100644 (file)
index 0000000..47bd40e
--- /dev/null
+++ b/commons/checkstyle/src/main/java/org/opendaylight/netvirt/checkstyle/ForbiddenMethodCheck.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2018 Red Hat, Inc. and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.opendaylight.netvirt.checkstyle;
+
+import com.puppycrawl.tools.checkstyle.api.AbstractCheck;
+import com.puppycrawl.tools.checkstyle.api.DetailAST;
+import com.puppycrawl.tools.checkstyle.api.TokenTypes;
+import java.util.Objects;
+
+public class ForbiddenMethodCheck extends AbstractCheck {
+    private String methodName;
+
+    public void setMethodName(String methodName) {
+        this.methodName = methodName;
+    }
+
+    public int[] getDefaultTokens() {
+        return new int[] {TokenTypes.METHOD_CALL};
+    }
+
+    public int[] getAcceptableTokens() {
+        return new int[0];
+    }
+
+    public int[] getRequiredTokens() {
+        return new int[0];
+    }
+
+    @Override
+    public void visitToken(DetailAST ast) {
+        // Method calls appear in the AST as DOT with two children IDENTs; the second one is the one we're after
+        DetailAST dot = ast.findFirstToken(TokenTypes.DOT);
+        if (dot != null) {
+            DetailAST target = dot.findFirstToken(TokenTypes.IDENT);
+            if (target != null) {
+                DetailAST method = target.getNextSibling();
+                if (method != null && Objects.equals(methodName, method.getText())) {
+                    log(ast.getLineNo(), "method " + methodName + " must not be called");
+                }
+            }
+        }
+    }
+}

diff --git a/commons/checkstyle/src/main/resources/databroker-checks.xml b/commons/checkstyle/src/main/resources/databroker-checks.xml
new file mode 100644 (file)
index 0000000..d651cbb
--- /dev/null
+++ b/commons/checkstyle/src/main/resources/databroker-checks.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!--
+Copyright © 2018 Red Hat, Inc. and others.
+
+This program and the accompanying materials are made available under the
+terms of the Eclipse Public License v1.0 which accompanies this distribution,
+and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
+-->
+<!DOCTYPE module PUBLIC
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">
+<module name="Checker">
+    <module name="TreeWalker">
+        <module name="org.opendaylight.netvirt.checkstyle.ForbiddenMethodCheck">
+            <property name="methodName" value="newWriteOnlyTransaction" />
+        </module>
+        <module name="org.opendaylight.netvirt.checkstyle.ForbiddenMethodCheck">
+            <property name="methodName" value="newReadWriteTransaction" />
+        </module>
+    </module>
+</module>
\ No newline at end of file

diff --git a/commons/managed-tx-parent/pom.xml b/commons/managed-tx-parent/pom.xml
new file mode 100644 (file)
index 0000000..a880d15
--- /dev/null
+++ b/commons/managed-tx-parent/pom.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright © 2018 Red Hat, Inc. and others.
+
+This program and the accompanying materials are made available under the
+terms of the Eclipse Public License v1.0 which accompanies this distribution,
+and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <parent>
+        <groupId>org.opendaylight.netvirt</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>0.7.0-SNAPSHOT</version>
+        <relativePath>../binding-parent</relativePath>
+    </parent>
+
+    <!-- This is a temporary parent, enforcing checks against the use of unmanaged transactions.
+         Once all of NetVirt can enforce this, the configuration will be merged into binding-parent. -->
+    <groupId>org.opendaylight.netvirt</groupId>
+    <artifactId>managed-tx-parent</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <name>ODL :: netvirt :: ${project.artifactId}</name>
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>pom</packaging>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-checkstyle-plugin</artifactId>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.opendaylight.netvirt</groupId>
+                            <artifactId>checkstyle</artifactId>
+                            <version>0.7.0-SNAPSHOT</version>
+                        </dependency>
+                    </dependencies>
+                    <executions>
+                        <execution>
+                            <id>check-databroker</id>
+                            <goals>
+                                <goal>check</goal>
+                            </goals>
+                            <phase>process-sources</phase>
+                            <configuration>
+                                <configLocation>databroker-checks.xml</configLocation>
+                                <includeResources>false</includeResources>
+                                <includeTestSourceDirectory>false</includeTestSourceDirectory>
+                                <includeTestResources>false</includeTestResources>
+                                <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+                                <failsOnError>true</failsOnError>
+                                <consoleOutput>true</consoleOutput>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+</project>
\ No newline at end of file

diff --git a/commons/pom.xml b/commons/pom.xml
index 89e18d31d37c7ba52aabbd049255e45a44639365..54a1dbc500d62e731b6f643e138ceb5e1c8ab47b 100644 (file)
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (c) 2016 Red hat, Inc. and others. All rights reserved.
+Copyright © 2016, 2018 Red Hat, Inc. and others. All rights reserved.
 
 This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -24,6 +24,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
     <modules>
         <module>binding-parent</module>
+        <module>checkstyle</module>
+        <module>managed-tx-parent</module>
     </modules>
 
     <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->

diff --git a/dhcpservice/api/pom.xml b/dhcpservice/api/pom.xml
index 7215ce537b8063e0fb9b97ce4b18f6a250e03939..dce4831cda0bcf71f0a3990cae557c30517a728b 100644 (file)
--- a/dhcpservice/api/pom.xml
+++ b/dhcpservice/api/pom.xml
@@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <parent>
         <groupId>org.opendaylight.netvirt</groupId>
-        <artifactId>binding-parent</artifactId>
+        <artifactId>managed-tx-parent</artifactId>
         <version>0.7.0-SNAPSHOT</version>
-        <relativePath>../../commons/binding-parent</relativePath>
+        <relativePath>../../commons/managed-tx-parent</relativePath>
     </parent>
 
     <artifactId>dhcpservice-api</artifactId>

diff --git a/dhcpservice/impl/pom.xml b/dhcpservice/impl/pom.xml
index 47329e46f0fea280fb648b9a9e6fdf34295a8442..aa3e8c5b755aa29ca608eee00ccda172f2bb7ede 100644 (file)
--- a/dhcpservice/impl/pom.xml
+++ b/dhcpservice/impl/pom.xml
@@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <parent>
         <groupId>org.opendaylight.netvirt</groupId>
-        <artifactId>binding-parent</artifactId>
+        <artifactId>managed-tx-parent</artifactId>
         <version>0.7.0-SNAPSHOT</version>
-        <relativePath>../../commons/binding-parent</relativePath>
+        <relativePath>../../commons/managed-tx-parent</relativePath>
     </parent>
 
     <artifactId>dhcpservice-impl</artifactId>

diff --git a/dhcpservice/shell/pom.xml b/dhcpservice/shell/pom.xml
index 93a813e125de2f9fd4b160cd9b9fa83300390580..74d9a67496acf77b59f8ea0bf0b6283254f9b4a6 100644 (file)
--- a/dhcpservice/shell/pom.xml
+++ b/dhcpservice/shell/pom.xml
@@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <parent>
         <groupId>org.opendaylight.netvirt</groupId>
-        <artifactId>binding-parent</artifactId>
+        <artifactId>managed-tx-parent</artifactId>
         <version>0.7.0-SNAPSHOT</version>
-        <relativePath>../../commons/binding-parent</relativePath>
+        <relativePath>../../commons/managed-tx-parent</relativePath>
     </parent>
 
     <artifactId>dhcpservice-shell</artifactId>

diff --git a/elanmanager/api/pom.xml b/elanmanager/api/pom.xml
index 11c311cda4163e40005db27f3e69ea8c4f36857b..5cc1746526fc0411cf56365f7030be0afc3b5e0f 100644 (file)
--- a/elanmanager/api/pom.xml
+++ b/elanmanager/api/pom.xml
@@ -10,9 +10,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.opendaylight.netvirt</groupId>
-        <artifactId>binding-parent</artifactId>
+        <artifactId>managed-tx-parent</artifactId>
         <version>0.7.0-SNAPSHOT</version>
-        <relativePath>../../commons/binding-parent</relativePath>
+        <relativePath>../../commons/managed-tx-parent</relativePath>
     </parent>
 
     <artifactId>elanmanager-api</artifactId>

diff --git a/fibmanager/api/pom.xml b/fibmanager/api/pom.xml
index 6fadb27919007fbab3dfbb2479af4b230451ffba..7b809853b1330c3143f9005f22d15441bd67e9a6 100644 (file)
--- a/fibmanager/api/pom.xml
+++ b/fibmanager/api/pom.xml
@@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <parent>
         <groupId>org.opendaylight.netvirt</groupId>
-        <artifactId>binding-parent</artifactId>
+        <artifactId>managed-tx-parent</artifactId>
         <version>0.7.0-SNAPSHOT</version>
-        <relativePath>../../commons/binding-parent</relativePath>
+        <relativePath>../../commons/managed-tx-parent</relativePath>
     </parent>
 
     <artifactId>fibmanager-api</artifactId>

diff --git a/fibmanager/shell/pom.xml b/fibmanager/shell/pom.xml
index eba4adc45444413af9bc8dde7455ac951be94cbb..77e464fa9ea7d49488795ff40ada3d7c7ec721a3 100644 (file)
--- a/fibmanager/shell/pom.xml
+++ b/fibmanager/shell/pom.xml
@@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <parent>
         <groupId>org.opendaylight.netvirt</groupId>
-        <artifactId>binding-parent</artifactId>
+        <artifactId>managed-tx-parent</artifactId>
         <version>0.7.0-SNAPSHOT</version>
-        <relativePath>../../commons/binding-parent</relativePath>
+        <relativePath>../../commons/managed-tx-parent</relativePath>
     </parent>
 
     <artifactId>fibmanager-shell</artifactId>

diff --git a/ipv6service/api/pom.xml b/ipv6service/api/pom.xml
index 98058d6b997817db7f992ccc5a14e6f985fb9386..26c82c782798e2409f6f57f778ea53f537c0cbbf 100644 (file)
--- a/ipv6service/api/pom.xml
+++ b/ipv6service/api/pom.xml
@@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <parent>
         <groupId>org.opendaylight.netvirt</groupId>
-        <artifactId>binding-parent</artifactId>
+        <artifactId>managed-tx-parent</artifactId>
         <version>0.7.0-SNAPSHOT</version>
-        <relativePath>../../commons/binding-parent</relativePath>
+        <relativePath>../../commons/managed-tx-parent</relativePath>
     </parent>
 
     <artifactId>ipv6service-api</artifactId>

diff --git a/ipv6service/impl/pom.xml b/ipv6service/impl/pom.xml
index d4ff8adfb3b7d7bd26a4ea27f89ba75371d72eda..45d1925ae81d48ca9e599260d0885c44e3e83639 100644 (file)
--- a/ipv6service/impl/pom.xml
+++ b/ipv6service/impl/pom.xml
@@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <parent>
         <groupId>org.opendaylight.netvirt</groupId>
-        <artifactId>binding-parent</artifactId>
+        <artifactId>managed-tx-parent</artifactId>
         <version>0.7.0-SNAPSHOT</version>
-        <relativePath>../../commons/binding-parent</relativePath>
+        <relativePath>../../commons/managed-tx-parent</relativePath>
     </parent>
 
     <artifactId>ipv6service-impl</artifactId>

diff --git a/ipv6service/shell/pom.xml b/ipv6service/shell/pom.xml
index 8cd0b7bc711c84d4d9438a111b380fea2fdeaf5b..39c71461874758c19cfe209f553ca1cb7c0db4b2 100644 (file)
--- a/ipv6service/shell/pom.xml
+++ b/ipv6service/shell/pom.xml
@@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <parent>
         <groupId>org.opendaylight.netvirt</groupId>
-        <artifactId>binding-parent</artifactId>
+        <artifactId>managed-tx-parent</artifactId>
         <version>0.7.0-SNAPSHOT</version>
-        <relativePath>../../commons/binding-parent</relativePath>
+        <relativePath>../../commons/managed-tx-parent</relativePath>
     </parent>
 
     <artifactId>ipv6service-shell</artifactId>

diff --git a/model-bgp/pom.xml b/model-bgp/pom.xml
index e82da4d86a6bc5e9e941965ee85022879c1ff9b8..431ec7779b2d0efe96a29e84bbc614a62a67ac92 100644 (file)
--- a/model-bgp/pom.xml
+++ b/model-bgp/pom.xml
@@ -12,9 +12,9 @@
 
     <parent>
         <groupId>org.opendaylight.netvirt</groupId>
-        <artifactId>binding-parent</artifactId>
+        <artifactId>managed-tx-parent</artifactId>
         <version>0.7.0-SNAPSHOT</version>
-        <relativePath>../commons/binding-parent</relativePath>
+        <relativePath>../commons/managed-tx-parent</relativePath>
     </parent>
 
     <artifactId>model-bgp</artifactId>

diff --git a/natservice/api/pom.xml b/natservice/api/pom.xml
index d70c6a49ce69a2f954359ae61ca7124759c3ac42..04ee31b9ebf322d884da42a3377487521cc48bfd 100644 (file)
--- a/natservice/api/pom.xml
+++ b/natservice/api/pom.xml
@@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <parent>
         <groupId>org.opendaylight.netvirt</groupId>
-        <artifactId>binding-parent</artifactId>
+        <artifactId>managed-tx-parent</artifactId>
         <version>0.7.0-SNAPSHOT</version>
-        <relativePath>../../commons/binding-parent</relativePath>
+        <relativePath>../../commons/managed-tx-parent</relativePath>
     </parent>
 
     <artifactId>natservice-api</artifactId>

diff --git a/neutronvpn/api/pom.xml b/neutronvpn/api/pom.xml
index 467f64e92d244a2fca37822be3b2bc985b798eda..bfac01c1f054caeae17a8b31164dd798050d468d 100644 (file)
--- a/neutronvpn/api/pom.xml
+++ b/neutronvpn/api/pom.xml
@@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <parent>
         <groupId>org.opendaylight.netvirt</groupId>
-        <artifactId>binding-parent</artifactId>
+        <artifactId>managed-tx-parent</artifactId>
         <version>0.7.0-SNAPSHOT</version>
-        <relativePath>../../commons/binding-parent</relativePath>
+        <relativePath>../../commons/managed-tx-parent</relativePath>
     </parent>
 
     <artifactId>neutronvpn-api</artifactId>

diff --git a/neutronvpn/shell/pom.xml b/neutronvpn/shell/pom.xml
index 02a47b95679470bfb22df4373844e76cede80ddb..832d75315951d5d246c19418d7af2606c045275b 100644 (file)
--- a/neutronvpn/shell/pom.xml
+++ b/neutronvpn/shell/pom.xml
@@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <parent>
         <groupId>org.opendaylight.netvirt</groupId>
-        <artifactId>binding-parent</artifactId>
+        <artifactId>managed-tx-parent</artifactId>
         <version>0.7.0-SNAPSHOT</version>
-        <relativePath>../../commons/binding-parent</relativePath>
+        <relativePath>../../commons/managed-tx-parent</relativePath>
     </parent>
 
     <artifactId>neutronvpn-shell</artifactId>

diff --git a/policyservice/api/pom.xml b/policyservice/api/pom.xml
index cde265fd34727dd823879103feb9f2402ecb07bd..d233684ea3c794a057b4026e784f3646749bb081 100644 (file)
--- a/policyservice/api/pom.xml
+++ b/policyservice/api/pom.xml
@@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <parent>
         <groupId>org.opendaylight.netvirt</groupId>
-        <artifactId>binding-parent</artifactId>
+        <artifactId>managed-tx-parent</artifactId>
         <version>0.7.0-SNAPSHOT</version>
-        <relativePath>../../commons/binding-parent</relativePath>
+        <relativePath>../../commons/managed-tx-parent</relativePath>
     </parent>
 
     <artifactId>policyservice-api</artifactId>

diff --git a/policyservice/impl/pom.xml b/policyservice/impl/pom.xml
index 31aac284386da23e43d5e764092b86ebab35f043..ea9b632bb106d06f22b0674aef480f6f281a18ee 100644 (file)
--- a/policyservice/impl/pom.xml
+++ b/policyservice/impl/pom.xml
@@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <parent>
         <groupId>org.opendaylight.netvirt</groupId>
-        <artifactId>binding-parent</artifactId>
+        <artifactId>managed-tx-parent</artifactId>
         <version>0.7.0-SNAPSHOT</version>
-        <relativePath>../../commons/binding-parent</relativePath>
+        <relativePath>../../commons/managed-tx-parent</relativePath>
     </parent>
 
     <artifactId>policyservice-impl</artifactId>

diff --git a/qosservice/api/pom.xml b/qosservice/api/pom.xml
index 4f78f2c62e1c43a8693b3f090050edffa1d0273c..be93a4a48b79c104e8cdf62e4b3bdd57267f0880 100644 (file)
--- a/qosservice/api/pom.xml
+++ b/qosservice/api/pom.xml
@@ -10,9 +10,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
     <parent>
         <groupId>org.opendaylight.netvirt</groupId>
-        <artifactId>binding-parent</artifactId>
+        <artifactId>managed-tx-parent</artifactId>
         <version>0.7.0-SNAPSHOT</version>
-        <relativePath>../../commons/binding-parent</relativePath>
+        <relativePath>../../commons/managed-tx-parent</relativePath>
     </parent>
 
     <artifactId>qosservice-api</artifactId>

diff --git a/sfc/classifier/api/pom.xml b/sfc/classifier/api/pom.xml
index f1048f4c70ff883e61d518e9b28e29ee1058433d..aee66e54cbae1a0c1a877b9cedfacfef694a157e 100644 (file)
--- a/sfc/classifier/api/pom.xml
+++ b/sfc/classifier/api/pom.xml
@@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <parent>
         <groupId>org.opendaylight.netvirt</groupId>
-        <artifactId>binding-parent</artifactId>
+        <artifactId>managed-tx-parent</artifactId>
         <version>0.7.0-SNAPSHOT</version>
-        <relativePath>../../../commons/binding-parent</relativePath>
+        <relativePath>../../../commons/managed-tx-parent</relativePath>
     </parent>
 
     <artifactId>sfc.classifier-api</artifactId>

diff --git a/sfc/classifier/impl/pom.xml b/sfc/classifier/impl/pom.xml
index 27b46dfcedfafb7e0c9d9eb86a02b3911aa29102..676929b85d2608e87688171146141693a526e97c 100644 (file)
--- a/sfc/classifier/impl/pom.xml
+++ b/sfc/classifier/impl/pom.xml
@@ -12,9 +12,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <parent>
         <groupId>org.opendaylight.netvirt</groupId>
-        <artifactId>binding-parent</artifactId>
+        <artifactId>managed-tx-parent</artifactId>
         <version>0.7.0-SNAPSHOT</version>
-        <relativePath>../../../commons/binding-parent</relativePath>
+        <relativePath>../../../commons/managed-tx-parent</relativePath>
     </parent>
 
     <artifactId>sfc.classifier-impl</artifactId>

diff --git a/sfc/translator/pom.xml b/sfc/translator/pom.xml
index ecb4b445428b3eade37b5305a800452f82c9aa7b..a401a5107e328e7d4889998be6af89640dad48a0 100644 (file)
--- a/sfc/translator/pom.xml
+++ b/sfc/translator/pom.xml
@@ -12,9 +12,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <parent>
     <groupId>org.opendaylight.netvirt</groupId>
-    <artifactId>binding-parent</artifactId>
+    <artifactId>managed-tx-parent</artifactId>
     <version>0.7.0-SNAPSHOT</version>
-    <relativePath>../../commons/binding-parent</relativePath>
+    <relativePath>../../commons/managed-tx-parent</relativePath>
   </parent>
 
   <artifactId>sfc.translator</artifactId>

diff --git a/statemanager/impl/pom.xml b/statemanager/impl/pom.xml
index acb9d357466cf92652dce3ef152945533367571e..0dfb5ba51372caa1e1c49335ff528c1aec0e0546 100644 (file)
--- a/statemanager/impl/pom.xml
+++ b/statemanager/impl/pom.xml
@@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <parent>
         <groupId>org.opendaylight.netvirt</groupId>
-        <artifactId>binding-parent</artifactId>
+        <artifactId>managed-tx-parent</artifactId>
         <version>0.7.0-SNAPSHOT</version>
-        <relativePath>../../commons/binding-parent</relativePath>
+        <relativePath>../../commons/managed-tx-parent</relativePath>
     </parent>
 
     <artifactId>statemanager-impl</artifactId>

diff --git a/statistics/api/pom.xml b/statistics/api/pom.xml
index 59f302666adfb4009d7fdb5e05bbe7f1c3e5dcbf..1b451ab734d3bf518070b03cff2b19e48227b399 100644 (file)
--- a/statistics/api/pom.xml
+++ b/statistics/api/pom.xml
@@ -10,9 +10,9 @@ at http://www.eclipse.org/legal/epl-v10.html
 
     <parent>
         <groupId>org.opendaylight.netvirt</groupId>
-        <artifactId>binding-parent</artifactId>
+        <artifactId>managed-tx-parent</artifactId>
         <version>0.7.0-SNAPSHOT</version>
-        <relativePath>../../commons/binding-parent</relativePath>
+        <relativePath>../../commons/managed-tx-parent</relativePath>
     </parent>
 
     <artifactId>statistics-api</artifactId>

diff --git a/vpnmanager/api/pom.xml b/vpnmanager/api/pom.xml
index 6b62bfe03866c6936b3d0da876d8dc6c7e97ad34..5821a15cc4709f62a478ef508325f9be8ed03ef0 100644 (file)
--- a/vpnmanager/api/pom.xml
+++ b/vpnmanager/api/pom.xml
@@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <parent>
         <groupId>org.opendaylight.netvirt</groupId>
-        <artifactId>binding-parent</artifactId>
+        <artifactId>managed-tx-parent</artifactId>
         <version>0.7.0-SNAPSHOT</version>
-        <relativePath>../../commons/binding-parent</relativePath>
+        <relativePath>../../commons/managed-tx-parent</relativePath>
     </parent>
 
     <artifactId>vpnmanager-api</artifactId>

diff --git a/vpnmanager/shell/pom.xml b/vpnmanager/shell/pom.xml
index 54b5ece4d820776199812abb605805a631196462..f49a20bcb30612346669367fc44b2fa9cd8f2a98 100644 (file)
--- a/vpnmanager/shell/pom.xml
+++ b/vpnmanager/shell/pom.xml
@@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <parent>
         <groupId>org.opendaylight.netvirt</groupId>
-        <artifactId>binding-parent</artifactId>
+        <artifactId>managed-tx-parent</artifactId>
         <version>0.7.0-SNAPSHOT</version>
-        <relativePath>../../commons/binding-parent</relativePath>
+        <relativePath>../../commons/managed-tx-parent</relativePath>
     </parent>
 
     <artifactId>vpnmanager-shell</artifactId>