You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2014/12/31 17:51:45 UTC
[1/2] directory-fortress-core git commit: use 1.0.0-M27 ldap api
Repository: directory-fortress-core
Updated Branches:
refs/heads/1.0.0-RC40 4bc082ddf -> 9bd1d048b
use 1.0.0-M27 ldap api
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/42210402
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/42210402
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/42210402
Branch: refs/heads/1.0.0-RC40
Commit: 42210402f1d0dc3f49e03e126886f13930f9c56e
Parents: 7978fe0
Author: Shawn McKinney <sm...@symas.com>
Authored: Wed Dec 31 10:46:26 2014 -0600
Committer: Shawn McKinney <sm...@symas.com>
Committed: Wed Dec 31 10:46:26 2014 -0600
----------------------------------------------------------------------
b.sh | 4 ++--
build.xml | 2 +-
ivy.xml | 2 +-
pom.xml | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/42210402/b.sh
----------------------------------------------------------------------
diff --git a/b.sh b/b.sh
index d373e5d..60ee8d4 100755
--- a/b.sh
+++ b/b.sh
@@ -17,6 +17,6 @@
# specific language governing permissions and limitations
# under the License.
#
-export JAVA_HOME=/opt/jdk1.7.0_10
-export ANT_HOME=./apache-ant
+export JAVA_HOME=/opt/jdk1.7.0_71
+export ANT_HOME=../apache-ant
$ANT_HOME/bin/ant $1 $2 $3 $4
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/42210402/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 7a96b7a..32791d6 100644
--- a/build.xml
+++ b/build.xml
@@ -174,7 +174,7 @@
<property name="apacheJMeter_core.jar" value="${lib.dir}/ApacheJMeter_core-2.11.jar"/>
<property name="apacheJMeter_java.jar" value="${lib.dir}/ApacheJMeter_java-2.11.jar"/>
<property name="apacheds-all.jar" value="${lib.dir}/apacheds-all-2.0.0-M18.jar"/>
- <property name="apacheds-api-all.jar" value="${lib.dir}/api-all-1.0.0-M27-SNAPSHOT.jar"/>
+ <property name="apacheds-api-all.jar" value="${lib.dir}/api-all-1.0.0-M27.jar"/>
<!-- <property name="apacheds-api-all.jar" value="${lib.dir}/api-all-1.0.0-M25.jar"/>-->
<property name="mina-core.jar" value="${lib.dir}/mina-core-2.0.7.jar"/>
<property name="opencsv.jar" value="${lib.dir}/opencsv-2.3.jar"/>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/42210402/ivy.xml
----------------------------------------------------------------------
diff --git a/ivy.xml b/ivy.xml
index 1f4f876..22919de 100755
--- a/ivy.xml
+++ b/ivy.xml
@@ -48,7 +48,7 @@
<dependency org="org.slf4j" name="slf4j-api" rev="1.7.5" conf="default->master"/>
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.5" conf="default->master"/>
<dependency org="org.slf4j" name="slf4j-jcl" rev="1.7.5" conf="default->master"/>
-<!-- <dependency org="org.apache.directory.api" name="api-all" rev="1.0.0-M25" conf="default->master"/>-->
+ <dependency org="org.apache.directory.api" name="api-all" rev="1.0.0-M27" conf="default->master"/>
<dependency org="org.apache.directory.server" name="apacheds-all" rev="2.0.0-M18" 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" />
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/42210402/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 666b18d..9e554f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,7 @@
<version.ant.launcher>1.9.1</version.ant.launcher>
<version.antlr>2.7.7</version.antlr>
<version.apacheds>2.0.0-M18</version.apacheds>
- <version.api.all>1.0.0-M27-SNAPSHOT</version.api.all>
+ <version.api.all>1.0.0-M27</version.api.all>
<version.commons.beanutils>1.7.0</version.commons.beanutils>
<version.commons.beanutils-core>1.8.0</version.commons.beanutils-core>
<version.commons.codec>1.2</version.commons.codec>
[2/2] directory-fortress-core git commit: Merge branch '1.0.0-RC40'
of https://git-wip-us.apache.org/repos/asf/directory-fortress-core into
1.0.0-RC40
Posted by sm...@apache.org.
Merge branch '1.0.0-RC40' of https://git-wip-us.apache.org/repos/asf/directory-fortress-core into 1.0.0-RC40
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/9bd1d048
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/9bd1d048
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/9bd1d048
Branch: refs/heads/1.0.0-RC40
Commit: 9bd1d048bcc1ce5f11367f7489f134e991a67700
Parents: 4221040 4bc082d
Author: Shawn McKinney <sm...@apache.org>
Authored: Wed Dec 31 10:49:29 2014 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Wed Dec 31 10:49:29 2014 -0600
----------------------------------------------------------------------
.../core/ldap/ApacheDsDataProvider.java | 4 ++
.../fortress/core/jmeter/CheckAccess.java | 40 ++++++++++++++++++--
2 files changed, 41 insertions(+), 3 deletions(-)
----------------------------------------------------------------------