You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by dr...@apache.org on 2016/01/16 11:01:36 UTC
[1/2] directory-kerby git commit: Clean up. Remove benchmarking of
the old Kerberos codec
Repository: directory-kerby
Updated Branches:
refs/heads/kadmin-remote 8410c0128 -> 40782bd5c
Clean up. Remove benchmarking of the old Kerberos codec
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/100b9aa7
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/100b9aa7
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/100b9aa7
Branch: refs/heads/kadmin-remote
Commit: 100b9aa77625c6a0aae5953daa1f0acd13118d78
Parents: 9e4dbd6
Author: Drankye <dr...@gmail.com>
Authored: Sun Jan 17 18:00:54 2016 +0800
Committer: Drankye <dr...@gmail.com>
Committed: Sun Jan 17 18:00:54 2016 +0800
----------------------------------------------------------------------
benchmark/pom.xml | 82 --------------------
.../kerby/benchmark/KrbCodecBenchmark.java | 23 +-----
kerby-common/kerby-util/pom.xml | 12 ---
3 files changed, 1 insertion(+), 116 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/100b9aa7/benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index 3d5dbf9..3a8b3d7 100644
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -80,88 +80,6 @@
<artifactId>zookeeper-backend</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-core-api</artifactId>
- <version>${apache.ds.version}</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.directory.api</groupId>
- <artifactId>api-ldap-schema-data</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-interceptor-kerberos</artifactId>
- <version>${apache.ds.version}</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.directory.api</groupId>
- <artifactId>api-ldap-schema-data</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-protocol-shared</artifactId>
- <version>${apache.ds.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-protocol-kerberos</artifactId>
- <version>${apache.ds.version}</version>
- <scope>compile</scope>
- <exclusions>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-ldif-partition</artifactId>
- <version>${apache.ds.version}</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.directory.api</groupId>
- <artifactId>api-ldap-schema-data</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-mavibot-partition</artifactId>
- <version>${apache.ds.version}</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.directory.api</groupId>
- <artifactId>api-ldap-schema-data</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.api</groupId>
- <artifactId>api-all</artifactId>
- <version>${apache.ds.api.version}</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- </exclusion>
- <exclusion>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/100b9aa7/benchmark/src/main/java/org/apache/kerby/benchmark/KrbCodecBenchmark.java
----------------------------------------------------------------------
diff --git a/benchmark/src/main/java/org/apache/kerby/benchmark/KrbCodecBenchmark.java b/benchmark/src/main/java/org/apache/kerby/benchmark/KrbCodecBenchmark.java
index ab21632..56bb372 100644
--- a/benchmark/src/main/java/org/apache/kerby/benchmark/KrbCodecBenchmark.java
+++ b/benchmark/src/main/java/org/apache/kerby/benchmark/KrbCodecBenchmark.java
@@ -19,15 +19,8 @@
*/
package org.apache.kerby.benchmark;
-import org.apache.directory.api.asn1.ber.Asn1Decoder;
-import org.apache.directory.shared.kerberos.codec.apReq.ApReqContainer;
import org.apache.kerby.kerberos.kerb.type.ap.ApReq;
-import org.openjdk.jmh.annotations.Benchmark;
-import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.Fork;
-import org.openjdk.jmh.annotations.Mode;
-import org.openjdk.jmh.annotations.OutputTimeUnit;
-import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.annotations.*;
import java.io.IOException;
import java.io.InputStream;
@@ -61,18 +54,4 @@ public class KrbCodecBenchmark {
throw new RuntimeException("Decoding test failed");
}
}
-
- @Benchmark
- @Fork(1)
- @Warmup(iterations = 5)
- public void decodeWithApacheDS() throws Exception {
- ByteBuffer content = apreqToken.duplicate();
- Asn1Decoder krbDecoder = new Asn1Decoder();
- ApReqContainer apreqContainer = new ApReqContainer(content);
- krbDecoder.decode(content, apreqContainer);
- String serverName = apreqContainer.getApReq().getTicket().getSName().toString();
- if (serverName == null) {
- throw new RuntimeException("Decoding test failed");
- }
- }
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/100b9aa7/kerby-common/kerby-util/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-common/kerby-util/pom.xml b/kerby-common/kerby-util/pom.xml
index dc9e28d..d683b8c 100644
--- a/kerby-common/kerby-util/pom.xml
+++ b/kerby-common/kerby-util/pom.xml
@@ -14,18 +14,6 @@
-->
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
<parent>
<groupId>org.apache.kerby</groupId>
[2/2] directory-kerby git commit: Merge branch 'trunk' into
kadmin-remote
Posted by dr...@apache.org.
Merge branch 'trunk' into kadmin-remote
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/40782bd5
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/40782bd5
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/40782bd5
Branch: refs/heads/kadmin-remote
Commit: 40782bd5cbd769a6e04720db0a6d578536fac705
Parents: 8410c01 100b9aa
Author: Drankye <dr...@gmail.com>
Authored: Sun Jan 17 18:01:27 2016 +0800
Committer: Drankye <dr...@gmail.com>
Committed: Sun Jan 17 18:01:27 2016 +0800
----------------------------------------------------------------------
benchmark/pom.xml | 82 --------------------
.../kerby/benchmark/KrbCodecBenchmark.java | 23 +-----
kerby-common/kerby-util/pom.xml | 12 ---
3 files changed, 1 insertion(+), 116 deletions(-)
----------------------------------------------------------------------