OPENDJ-2589 Code cleanup

Gaetan Boismal

04.53.2016 8d0c9ba6b625be195e1ea4d7568026ec1507400d

OPENDJ-2589 Code cleanup

Reformat sdk toolkit descriptor
Move some descriptor informations in the toolkit pom.xml

 opendj-sdk/opendj-ldap-toolkit/pom.xml

@@ -21,7 +21,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2011-2015 ForgeRock AS.
 !      Copyright 2011-2016 ForgeRock AS.
 !    
 -->
<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">
@@ -138,6 +138,9 @@
                            <descriptors>
                                <descriptor>src/main/assembly/descriptor.xml</descriptor>
                            </descriptors>
                            <formats>
                                <format>zip</format>
                            </formats>
                        </configuration>
                    </execution>
                </executions>

 opendj-sdk/opendj-ldap-toolkit/src/main/assembly/descriptor.xml

@@ -21,7 +21,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2011-2015 ForgeRock AS
 !      Copyright 2011-2016 ForgeRock AS
 !
 -->
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
@@ -29,9 +29,15 @@
  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
                      http://maven.apache.org/xsd/assembly-1.1.2.xsd">
  <id>opendj-ldap-toolkit</id>
  <formats>
    <format>zip</format>
  </formats>

    <dependencySets>
        <dependencySet>
            <outputDirectory>lib</outputDirectory>
            <directoryMode>0755</directoryMode>
            <fileMode>0644</fileMode>
        </dependencySet>
    </dependencySets>

  <fileSets>
    <fileSet>
      <directory>${project.basedir}</directory>
@@ -66,6 +72,7 @@
        <include>THIRDPARTYREADME.txt</include>
      </includes>
    </fileSet>

  <fileSet>
    <directory>${project.parent.parent.basedir}</directory>
    <outputDirectory></outputDirectory>
@@ -75,6 +82,7 @@
      <include>*.png</include>
    </includes>
  </fileSet>

    <fileSet>
      <directory>src/main/assembly/bin</directory>
      <outputDirectory>bin</outputDirectory>
@@ -82,6 +90,7 @@
      <fileMode>0755</fileMode>
      <lineEnding>unix</lineEnding>
    </fileSet>

    <fileSet>
      <directory>src/main/assembly/bat</directory>
      <outputDirectory>bat</outputDirectory>
@@ -89,6 +98,7 @@
      <fileMode>0644</fileMode>
      <lineEnding>dos</lineEnding>
    </fileSet>

    <fileSet>
      <directory>src/main/assembly/libbin</directory>
      <outputDirectory>lib</outputDirectory>
@@ -96,6 +106,7 @@
      <fileMode>0755</fileMode>
      <lineEnding>unix</lineEnding>
    </fileSet>

    <fileSet>
      <directory>src/main/assembly/libbat</directory>
      <outputDirectory>lib</outputDirectory>
@@ -104,11 +115,4 @@
      <lineEnding>dos</lineEnding>
    </fileSet>
  </fileSets>
  <dependencySets>
    <dependencySet>
      <outputDirectory>lib</outputDirectory>
      <directoryMode>0755</directoryMode>
      <fileMode>0644</fileMode>
    </dependencySet>
  </dependencySets>
</assembly>