Jason Rivard преди 2 години
родител
ревизия
ad5fe8d833

+ 1 - 1
webapp/src/build/assembly/ldif-schema-zip.xml → ldif/build/assembly/ldif-schema-zip.xml

@@ -30,7 +30,7 @@
     <fileSets>
     <fileSets>
         <fileSet>
         <fileSet>
             <outputDirectory>/</outputDirectory>
             <outputDirectory>/</outputDirectory>
-            <directory>${project.basedir}/src/build/ldif</directory>
+            <directory>${project.basedir}/src/main/resources/ldif</directory>
             <includes>
             <includes>
                 <include>*/**</include>
                 <include>*/**</include>
             </includes>
             </includes>

+ 75 - 0
ldif/pom.xml

@@ -0,0 +1,75 @@
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <parent>
+        <groupId>org.pwm-project</groupId>
+        <artifactId>pwm</artifactId>
+        <version>2.1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <url>https://github.com/pwm-project/pwm</url>
+    <artifactId>pwm-ldif</artifactId>
+    <packaging>jar</packaging>
+
+    <name>PWM Password Self Service: LDIF JAR</name>
+
+    <properties>
+    </properties>
+
+    <profiles>
+    </profiles>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.3.0</version>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Archive-Type>jar</Archive-Type>
+                            <Implementation-Title>${project.name}</Implementation-Title>
+                            <Implementation-Version>${project.version}</Implementation-Version>
+                            <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+                            <Implementation-URL>${project.organization.url}</Implementation-URL>
+                            <Implementation-Build-Java-Spec-Version>${java.specification.version}</Implementation-Build-Java-Spec-Version>
+                            <Implementation-Revision>${build.revision}</Implementation-Revision>
+                            <Implementation-Version-Display>v${project.version} b${build.number} r${build.revision}</Implementation-Version-Display>
+                            <SCM-Git-Branch>${git.branch}</SCM-Git-Branch>
+                            <SCM-Git-Commit-ID>${git.commit.id}</SCM-Git-Commit-ID>
+                            <SCM-Git-Commit-ID-Abbrev>${git.commit.id.abbrev}</SCM-Git-Commit-ID-Abbrev>
+                            <SCM-Git-Commit-ID-Description>${git.commit.id.describe}</SCM-Git-Commit-ID-Description>
+                            <SCM-Git-Commit-Timestamp>${git.commit.time}</SCM-Git-Commit-Timestamp>
+                            <SCM-Git-Commit-Dirty>${git.dirty}</SCM-Git-Commit-Dirty>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+    </dependencies>
+
+    <repositories>
+        <repository>
+            <id>central</id>
+            <url>https://repo1.maven.org/maven2</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>central</id>
+            <url>https://repo1.maven.org/maven2</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
+</project>

+ 0 - 0
webapp/src/build/ldif/AD-schema.ldif → ldif/src/main/resources/ldif/AD-schema.ldif


+ 0 - 0
webapp/src/build/ldif/ApacheDS-schema.ldif → ldif/src/main/resources/ldif/ApacheDS-schema.ldif


+ 0 - 0
webapp/src/build/ldif/OracleDS-schema.ldif → ldif/src/main/resources/ldif/OracleDS-schema.ldif


+ 0 - 0
webapp/src/build/ldif/edirectory-schema-update.ldif → ldif/src/main/resources/ldif/edirectory-schema-update.ldif


+ 0 - 0
webapp/src/build/ldif/edirectory-schema.ldif → ldif/src/main/resources/ldif/edirectory-schema.ldif


+ 0 - 0
webapp/src/build/ldif/edirectory-schema.sch → ldif/src/main/resources/ldif/edirectory-schema.sch


+ 0 - 0
webapp/src/build/ldif/openDJ-schema.ldif → ldif/src/main/resources/ldif/openDJ-schema.ldif


+ 0 - 0
webapp/src/build/ldif/openldap.ldif → ldif/src/main/resources/ldif/openldap.ldif


+ 0 - 0
webapp/src/build/ldif/openldap.schema → ldif/src/main/resources/ldif/openldap.schema


+ 1 - 0
pom.xml

@@ -51,6 +51,7 @@
     <modules>
     <modules>
         <module>lib-data</module>
         <module>lib-data</module>
         <module>lib-util</module>
         <module>lib-util</module>
+        <module>ldif</module>
         <module>server</module>
         <module>server</module>
         <module>client</module>
         <module>client</module>
         <module>webapp</module>
         <module>webapp</module>

+ 23 - 11
webapp/pom.xml

@@ -41,23 +41,35 @@
         <plugins>
         <plugins>
             <plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.4.2</version>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.8</version>
                 <executions>
                 <executions>
                     <execution>
                     <execution>
-                        <id>make-ldif-schema-zip</id>
+                        <id>copy-ldif-zip</id>
                         <phase>prepare-package</phase>
                         <phase>prepare-package</phase>
-                        <configuration>
-                            <finalName>${project.build.finalName}/public/reference/ldif-schema</finalName>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <descriptors>
-                                <descriptor>src/build/assembly/ldif-schema-zip.xml</descriptor>
-                            </descriptors>
-                        </configuration>
                         <goals>
                         <goals>
-                            <goal>single</goal>
+                            <goal>copy</goal>
                         </goals>
                         </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <artifactId>pwm-ldif</artifactId>
+                                    <groupId>${project.groupId}</groupId>
+                                    <version>${project.version}</version>
+                                    <type>jar</type>
+                                    <outputDirectory>${project.build.directory}/${project.build.finalName}/public/reference</outputDirectory>
+                                    <destFileName>ldif-schema.zip</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
                     </execution>
                     </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.4.2</version>
+                <executions>
                     <execution>
                     <execution>
                         <id>make-source-reference-zip</id>
                         <id>make-source-reference-zip</id>
                         <phase>prepare-package</phase>
                         <phase>prepare-package</phase>