directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject directory-fortress-core git commit: FC-164 - add start / stop-slapd profiles to mvn
Date Sat, 02 Apr 2016 14:43:25 GMT
Repository: directory-fortress-core
Updated Branches:
  refs/heads/master c3c646c47 -> 5f55215e4


 FC-164 - add start / stop-slapd profiles to mvn


Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/5f55215e
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/5f55215e
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/5f55215e

Branch: refs/heads/master
Commit: 5f55215e416c86279bfb941d1e90235251fefc41
Parents: c3c646c
Author: Shawn McKinney <smckinney@apache.org>
Authored: Sat Apr 2 09:43:20 2016 -0500
Committer: Shawn McKinney <smckinney@apache.org>
Committed: Sat Apr 2 09:43:20 2016 -0500

----------------------------------------------------------------------
 README-QUICKSTART-SLAPD.md |  14 ++++-
 pom.xml                    | 118 ++++++++++++++++++++++++++++++----------
 2 files changed, 100 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5f55215e/README-QUICKSTART-SLAPD.md
----------------------------------------------------------------------
diff --git a/README-QUICKSTART-SLAPD.md b/README-QUICKSTART-SLAPD.md
index 3cebdc4..54f482e 100644
--- a/README-QUICKSTART-SLAPD.md
+++ b/README-QUICKSTART-SLAPD.md
@@ -47,10 +47,10 @@ Minimum hardware requirements:
 Minimum software requirements:
  * Centos or Debian Machine
  * Java SDK 7++
- * Apache Ant 1.7++
  * Apache Maven3++
+ * Apache Ant 1.7++ *not needed (as separate package) fortress-core 1.0-RC43 and beyond*
 
-Everything else covered in steps that follow.  Tested on Debian & Centos systems.
+ *Everything else covered in steps that follow.*
 ___________________________________________________________________________________
 ## SECTION 2. Apache Fortress Core and OpenLDAP Setup
 
@@ -123,6 +123,8 @@ ________________________________________________________________________________
  export PATH=$PATH:$ANT_HOME/bin:$M2_HOME/bin
  ```
 
+ *Apache Ant not needed for 1.0-RC43++*
+
 9. Run the maven install:
 
  ```
@@ -137,20 +139,26 @@ ________________________________________________________________________________
   ant init-slapd
   ```
 
+ *for 1.0-RC43++ this will be 'mvn test -Pinit-slapd'*
+
 11. To start the slapd process:
 
   ```
   ant start-slapd
   ```
 
+ *for 1.0-RC43++ this will be 'mvn test -Pstart-slapd'*
+
 12. To stop the slapd process:
 
   ```
   ant stop-slapd
   ```
 
+ *for 1.0-RC43++ this will be 'mvn test -Pstop-slapd'*
+
  * must be run with either sudo or root privs
- * ant is deprecated, but still needed to run these commands.
+ * ant is deprecated, and not needed as separate package 1.0-RC43++.
 
 ___________________________________________________________________________________
 ## SECTION 3. Apache Fortress Core Integration Test

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5f55215e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 699ad13..6894bbf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -741,35 +741,6 @@
 
   <profiles>
 
-    <!-- This profile calls ant target init-slapd in build-config.xml script. -->
-    <!-- To execute: mvn -Pinit-slapd test -->
-    <profile>
-      <id>init-slapd</id>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>init-slapd-mvn</id>
-                <phase>compile</phase>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-                <configuration>
-                  <target name="init-slapd-mvn">
-                    <property name="maven.project.url" value="${project.url}"/>
-                    <ant antfile="build-config.xml" target="init-slapd"/>
-                    <echo message="init-slapd complete"/>
-                  </target>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
     <!-- This profile starts the Fortress Console App -->
     <!-- To execute: mvn -Pconsole test -->
     <profile>
@@ -1139,5 +1110,94 @@
       </build>
     </profile>
 
+    <!-- This profile calls ant target init-slapd in build-config.xml script. -->
+    <!-- To execute: mvn -Pinit-slapd test -->
+    <profile>
+      <id>init-slapd</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>init-slapd-mvn</id>
+                <phase>compile</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <target name="init-slapd-mvn">
+                    <property name="maven.project.url" value="${project.url}"/>
+                    <ant antfile="build-config.xml" target="init-slapd"/>
+                    <echo message="init-slapd complete"/>
+                  </target>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <!-- This profile calls ant target start-slapd in build-config.xml script. -->
+    <!-- To execute: mvn -Pstart-slapd test -->
+    <profile>
+      <id>start-slapd</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>start-slapd-mvn</id>
+                <phase>compile</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <target name="start-slapd-mvn">
+                    <property name="maven.project.url" value="${project.url}"/>
+                    <ant antfile="build-config.xml" target="start-slapd"/>
+                    <echo message="start-slapd complete"/>
+                  </target>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <!-- This profile calls ant target stop-slapd in build-config.xml script. -->
+    <!-- To execute: mvn -Pstop-slapd test -->
+    <profile>
+      <id>stop-slapd</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>stop-slapd-mvn</id>
+                <phase>compile</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <target name="stop-slapd-mvn">
+                    <property name="maven.project.url" value="${project.url}"/>
+                    <ant antfile="build-config.xml" target="stop-slapd"/>
+                    <echo message="stop-slapd complete"/>
+                  </target>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+
+
   </profiles>
 </project>


Mime
View raw message