Use profile in binding-parent to not break without src/main/yang

Whitespace has been fixed to use 4 spaces for indent in keeping
with yangtools convention.

Change-Id: Id6f5d7459590b189086c4cc6046d8c60fafb381e
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/code-generator/binding-parent/pom.xml b/code-generator/binding-parent/pom.xml
index c6b6cf35813692a21f1a2811d1e156051544e4b3..2ff3b31375b68767084864428cc93496f45c2e90 100644 (file)
--- a/code-generator/binding-parent/pom.xml
+++ b/code-generator/binding-parent/pom.xml
@@ -9,88 +9,97 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 <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>bundle-parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>bundle-parent</artifactId>
+        <version>1.5.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.yangtools</groupId>
-  <artifactId>binding-parent</artifactId>
-  <version>0.7.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.opendaylight.yangtools</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-  <properties>
-    <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
-    <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
-  </properties>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yangtools-artifacts</artifactId>
-        <version>${yangtools.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.opendaylight.yangtools</groupId>
-          <artifactId>yang-maven-plugin</artifactId>
-          <version>${yangtools.version}</version>
-          <dependencies>
-            <dependency>
-              <groupId>org.opendaylight.yangtools</groupId>
-              <artifactId>maven-sal-api-gen-plugin</artifactId>
-              <version>${yangtools.version}</version>
-              <type>jar</type>
-            </dependency>
-          </dependencies>
-          <executions>
-            <execution>
-              <id>binding</id>
-              <goals>
-                <goal>generate-sources</goal>
-              </goals>
-              <configuration>
-                <codeGenerators>
-                  <generator>
-                    <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
-                    <outputBaseDir>${salGeneratorPath}</outputBaseDir>
-                  </generator>
-                </codeGenerators>
-                <inspectDependencies>true</inspectDependencies>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
-        <plugin>
-          <artifactId>maven-clean-plugin</artifactId>
-          <configuration>
-            <filesets>
-              <fileset>
-                <directory>${salGeneratorPath}</directory>
-                <includes>
-                  <include>**</include>
-                </includes>
-              </fileset>
-            </filesets>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    <plugins>
-      <plugin>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yang-maven-plugin</artifactId>
-        <version>${yangtools.version}</version>
-      </plugin>
-    </plugins>
-  </build>
+    <properties>
+        <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
+        <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
+    </properties>
+    <profiles>
+        <profile>
+            <activation>
+                <file>
+                    <exists>src/main/yang</exists>
+                </file>
+            </activation>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.opendaylight.yangtools</groupId>
+                        <artifactId>yangtools-artifacts</artifactId>
+                        <version>${yangtools.version}</version>
+                        <type>pom</type>
+                        <scope>import</scope>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.opendaylight.yangtools</groupId>
+                            <artifactId>yang-maven-plugin</artifactId>
+                            <version>${yangtools.version}</version>
+                            <dependencies>
+                                <dependency>
+                                    <groupId>org.opendaylight.yangtools</groupId>
+                                    <artifactId>maven-sal-api-gen-plugin</artifactId>
+                                    <version>${yangtools.version}</version>
+                                    <type>jar</type>
+                                </dependency>
+                            </dependencies>
+                            <executions>
+                                <execution>
+                                    <id>binding</id>
+                                    <goals>
+                                        <goal>generate-sources</goal>
+                                    </goals>
+                                    <configuration>
+                                        <codeGenerators>
+                                            <generator>
+                                                <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
+                                                <outputBaseDir>${salGeneratorPath}</outputBaseDir>
+                                            </generator>
+                                        </codeGenerators>
+                                        <inspectDependencies>true</inspectDependencies>
+                                    </configuration>
+                                </execution>
+                            </executions>
+                        </plugin>
+                      <plugin>
+                        <artifactId>maven-clean-plugin</artifactId>
+                        <configuration>
+                          <filesets>
+                            <fileset>
+                              <directory>${salGeneratorPath}</directory>
+                              <includes>
+                                <include>**</include>
+                              </includes>
+                            </fileset>
+                          </filesets>
+                        </configuration>
+                      </plugin>
+                    </plugins>
+                </pluginManagement>
+              <plugins>
+                <plugin>
+                  <groupId>org.opendaylight.yangtools</groupId>
+                  <artifactId>yang-maven-plugin</artifactId>
+                  <version>${yangtools.version}</version>
+                </plugin>
+              </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>

diff --git a/code-generator/binding-parent/src/main/yang/.gitignore b/code-generator/binding-parent/src/main/yang/.gitignore
deleted file mode 100644 (file)
index e50f3cf..0000000
--- a/code-generator/binding-parent/src/main/yang/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Copyright (c) 2013 Cisco Systems, 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,
-# and is available at http://www.eclipse.org/legal/epl-v10.html
-#
-