mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Gaetan Boismal
18.42.2015 f9c82988a7f3deb4351309aabda5d1ba8d391e76
OPENDJ-1813: Add ant task to concat snmp config

To do this we need to copy the config.ldif file in build directory.
2 files modified
51 ■■■■■ changed files
opendj-server-legacy/pom.xml 38 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/assembly/opendj-archive-component.xml 13 ●●●● patch | view | raw | blame | history
opendj-server-legacy/pom.xml
@@ -1013,6 +1013,21 @@
              <goal>run</goal>
            </goals>
          </execution>
          <execution>
            <!-- Copy config.ldif in build dir (needed if snmp config merge is needed) -->
            <id>copy-config-ldif</id>
            <phase>generate-resources</phase>
            <configuration>
              <target>
                <copy todir="${project.build.directory}/template/config" file="${basedir}/resource/config/config.ldif"/>
              </target>
            </configuration>
            <goals>
              <goal>run</goal>
            </goals>
          </execution>
          <!-- Generate final zip and attach artefact -->
          <execution>
            <id>attach-artifact</id>
@@ -1325,8 +1340,9 @@
      </activation>
      <properties>
        <snmp.gen.dir>${basedir}/src/snmp/generated</snmp.gen.dir>
        <snmp.mib.dir>${basedir}/src/snmp/resource/mib</snmp.mib.dir>
        <snmp.dir>${basedir}/src/snmp</snmp.dir>
        <snmp.gen.dir>${snmp.dir}/generated</snmp.gen.dir>
        <snmp.mib.dir>${snmp.dir}/resource/mib</snmp.mib.dir>
      </properties>
      <dependencies>
@@ -1394,8 +1410,24 @@
                  <goal>run</goal>
                </goals>
              </execution>
              <execution>
                <!-- Append snmp config to the config.ldif -->
                <id>generate-config-ldif</id>
                <phase>prepare-package</phase>
                <configuration>
                  <target>
                    <concat destfile="${project.build.directory}/template/config/config.ldif" append="true">
                      <filelist dir="${snmp.dir}/resource/config" files="config.snmp.ldif"/>
                    </concat>
                  </target>
                </configuration>
                <goals>
                  <goal>run</goal>
                </goals>
              </execution>
            </executions>
          </plugin>
          <!-- MIB generation -->
          <plugin>
            <groupId>org.codehaus.mojo</groupId>
@@ -1462,6 +1494,7 @@
              </execution>
            </executions>
          </plugin>
          <!-- Package the final zip -->
          <plugin>
            <artifactId>maven-assembly-plugin</artifactId>
@@ -1489,6 +1522,7 @@
              </execution>
            </executions>
          </plugin>
        </plugins>
      </build>
    </profile>
opendj-server-legacy/src/main/assembly/opendj-archive-component.xml
@@ -195,9 +195,9 @@
    <fileSet>
      <directory>${basedir}/resource/config</directory>
      <outputDirectory>template/config</outputDirectory>
      <includes>
        <include>*.*</include>
      </includes>
      <excludes>
        <exclude>config.ldif</exclude>
      </excludes>
    </fileSet>
    <!-- Adds MakeLDIF configuration template resources -->
@@ -282,6 +282,13 @@
    </fileSet>
  </fileSets>
  <files>
    <!-- Adds Generated config.ldif file -->
    <file>
      <source>${project.build.directory}/template/config/config.ldif</source>
      <outputDirectory>template/config</outputDirectory>
    </file>
    <!-- Adds logo png to root directory -->
    <file>
      <source>${basedir}/resource/images/opendj_logo.png</source>