directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject [1/3] directory-fortress-core git commit: FC-164 - Remove ivy , rename ant script to build-config.xml, init-slapd mvn profile
Date Sat, 02 Apr 2016 14:32:32 GMT
Repository: directory-fortress-core
Updated Branches:
  refs/heads/master 4d9ccc857 -> c3c646c47


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/c3c646c4/ivy.xml
----------------------------------------------------------------------
diff --git a/ivy.xml b/ivy.xml
deleted file mode 100644
index b90c4e5..0000000
--- a/ivy.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License.
--->
-<!--<ivy-module version="2.0">-->
-<ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
-            xmlns:e="http://ant.apache.org/ivy/extra">
-
-<info organisation="org.apache" module="fortress-core"/>
-    <dependencies>
-        <!-- Fortress core is dependent on these libs: -->
-        <dependency org="commons-lang" name="commons-lang" rev="2.6" conf="default->master"/>
-        <dependency org="commons-configuration" name="commons-configuration" rev="1.10"
conf="default->master"/>
-        <dependency org="commons-collections" name="commons-collections" rev="3.2.1" conf="default->master"/>
-        <dependency org="commons-logging" name="commons-logging" rev="1.1.1" conf="default->master"/>
-        <dependency org="commons-codec" name="commons-codec" rev="1.10" conf="default->master"/>
-        <dependency org="commons-io" name="commons-io" rev="2.4" conf="default->master"/>
-        <dependency org="junit" name="junit" rev="4.12" conf="default->master"/>
-        <dependency org="org.hamcrest" name="hamcrest-core" rev="1.3" conf="default->master"/>
-        <dependency org="log4j" name="log4j" rev="1.2.17" conf="default->master"/>
-        <dependency org="org.jasypt" name="jasypt" rev="1.9.2" conf="default->master"/>
-        <dependency org="org.jgrapht" name="jgrapht-core" rev="0.9.1" conf="default->master"/>
-        <dependency org="com.sun.xml.bind" name="jaxb-xjc" rev="2.2.4-1" conf="default->master"/>
-        <dependency org="com.sun.xml.bind" name="jaxb-impl" rev="2.2.4-1" conf="default->master"/>
-        <dependency org="javax.xml.bind" name="jaxb-api" rev="2.2.11" conf="default->master"/>
-        <dependency org="org.apache.httpcomponents" name="httpclient" rev="4.5.2" conf="default->master"/>
-        <dependency org="org.apache.httpcomponents" name="httpcore" rev="4.4.4" conf="default->master"/>
-        <dependency org="org.codehaus.jackson" name="jackson-jaxrs" rev="1.9.0" conf="default->master"/>
-        <dependency org="javax" name="javaee-api" rev="7.0" conf="default->master"/>
-        <dependency org="org.apache.cxf" name="cxf-api" rev="2.7.18" conf="default->master"/>
-        <dependency org="javax.ws.rs" name="javax.ws.rs-api" rev="2.0.1" conf="default->master"/>
-        <dependency org="net.sf.ehcache" name="ehcache-core" rev="2.6.11" conf="default->master"/>
-        <dependency org="org.slf4j" name="slf4j-api" rev="1.7.12" conf="default->master"/>
-        <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.12" conf="default->master"/>
-        <dependency org="org.slf4j" name="slf4j-jcl" rev="1.7.12" conf="default->master"/>
-        <dependency org="org.apache.directory.api" name="api-all" rev="1.0.0-M33" conf="default->master"/>
-        <dependency org="org.apache.directory.server" name="apacheds-all" rev="2.0.0-M21"
conf="default->master"/>
-        <dependency org="net.sf.opencsv" name="opencsv" rev="2.3" conf="default->master"
/>
-        <dependency org="org.apache.jmeter" name="ApacheJMeter_core" rev="2.11" conf="default->master"
/>
-        <dependency org="org.apache.jmeter" name="ApacheJMeter_java" rev="2.11" conf="default->master"
/>
-
-        <!-- Fortress core source IS dependent org.openldap accelerator: -->
-        <dependency org="org.openldap" name="accelerator-impl" rev="1.0-RC40"  conf="default->master">
-            <artifact name="accelerator-impl" type="jar"/>
-        </dependency>
-
-        <dependency org="org.openldap" name="accelerator-api" rev="1.0-RC40"  conf="default->master">
-            <artifact name="accelerator-api" type="jar"/>
-        </dependency>
-
-        <!-- Fortress core source is NOT dependent on Sentry, EnMasse or Commander artifacts
rather they're required for its QUICKSTART demo apps: -->
-        <!--
-                <dependency org="org.openldap" name="sentry" rev="1.0-RC39"  conf="default->master">
-                    <artifact name="sentry" e:classifier="dist" type="jar"/>
-                </dependency>
-                <dependency org="org.openldap" name="enmasse" rev="1.0-RC39"  conf="default->master">
-                    <artifact name="enmasse" type="jar"/>
-                </dependency>
-                <dependency org="org.openldap" name="commander" rev="1.0-RC39"  conf="default->master">
-                    <artifact name="commander" type="jar"/>
-                </dependency>
-        -->
-
-    </dependencies>
-</ivy-module>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/c3c646c4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4083631..699ad13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -676,7 +676,7 @@
             </goals>
             <configuration>
               <tasks>
-                <ant antfile="${basedir}/build.xml" target="init-fortress-config" />
+                <ant antfile="${basedir}/build-config.xml" target="init-fortress-config"
/>
               </tasks>
             </configuration>
           </execution>
@@ -741,6 +741,36 @@
 
   <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>
       <id>console</id>
@@ -777,6 +807,7 @@
       </build>
     </profile>
 
+    <!-- This profile starts the Fortress Command Line Interpreter App -->
     <!-- To execute: mvn -Pcli test -->
     <profile>
       <id>cli</id>
@@ -813,6 +844,7 @@
       </build>
     </profile>
 
+    <!-- This profile starts Openldap accelerator checkAccess loadTest -->
     <!-- To execute: ./m.sh -Ploadtest-accel jmeter:jmeter -->
     <profile>
       <id>loadtest-accel</id>
@@ -860,9 +892,8 @@
       </build>
     </profile>
 
-    <!--
-    To execute: ./m.sh -Ploadtest-fortress jmeter:jmeter
-    -->
+    <!-- This profile starts Fortress core checkAccess loadTest -->
+    <!-- To execute: ./m.sh -Ploadtest-fortress jmeter:jmeter -->
     <profile>
       <id>loadtest-fortress</id>
       <build>
@@ -911,9 +942,8 @@
       </build>
     </profile>
 
-    <!--
-    To execute: ./m.sh -Ploadtest-accel-createsess jmeter:jmeter
-    -->
+    <!-- This profile starts Openldap accelerator createSession loadTest -->
+    <!-- To execute: ./m.sh -Ploadtest-accel-createsess jmeter:jmeter -->
     <profile>
       <id>loadtest-accel-createsess</id>
       <build>
@@ -962,9 +992,8 @@
       </build>
     </profile>
 
-    <!--
-    To execute: ./m.sh -Ploadtest-fortress-createsess jmeter:jmeter
-    -->
+    <!-- This profile starts Fortress core checkAccess loadTest -->
+    <!-- To execute: ./m.sh -Ploadtest-fortress-createsess jmeter:jmeter -->
     <profile>
       <id>loadtest-fortress-createsess</id>
       <build>
@@ -1013,9 +1042,8 @@
       </build>
     </profile>
 
-    <!--
-    To execute: ./m.sh -Ploadtest-fortress-sessperms jmeter:jmeter
-    -->
+    <!-- This profile starts Fortress core sessionPermissions loadTest -->
+    <!-- To execute: ./m.sh -Ploadtest-fortress-sessperms jmeter:jmeter -->
     <profile>
       <id>loadtest-fortress-sessperms</id>
       <build>
@@ -1063,6 +1091,7 @@
       </build>
     </profile>
 
+    <!-- This profile starts Fortress accelerator sessionPermissions loadTest but function
not implemented yet! -->
     <!-- To execute: ./m.sh -Ploadtest-accel-sessperms jmeter:jmeter -->
     <profile>
       <id>loadtest-accel-sessperms</id>


Mime
View raw message