You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2019/04/20 07:29:42 UTC
[directory-server] branch master updated: Add missing OSGi import
This is an automated email from the ASF dual-hosted git repository.
seelmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-server.git
The following commit(s) were added to refs/heads/master by this push:
new a49b06f Add missing OSGi import
a49b06f is described below
commit a49b06f8488ecb74a31feb8e31fcd637e71d646d
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
AuthorDate: Sat Apr 20 09:29:05 2019 +0200
Add missing OSGi import
---
...ationsOsgiTest.java => ServerAnnotationsOsgiTest.java} | 15 ++++-----------
.../server/osgi/integ/ServerCoreAnnotationsOsgiTest.java | 2 ++
.../directory/server/osgi/integ/ServerCoreOsgiTest.java | 3 ++-
server-annotations/pom.xml | 1 +
4 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/osgi-integ/src/test/java/org/apache/directory/server/osgi/integ/ServerCoreAnnotationsOsgiTest.java b/osgi-integ/src/test/java/org/apache/directory/server/osgi/integ/ServerAnnotationsOsgiTest.java
similarity index 64%
copy from osgi-integ/src/test/java/org/apache/directory/server/osgi/integ/ServerCoreAnnotationsOsgiTest.java
copy to osgi-integ/src/test/java/org/apache/directory/server/osgi/integ/ServerAnnotationsOsgiTest.java
index e6b98ed..c27deb4 100644
--- a/osgi-integ/src/test/java/org/apache/directory/server/osgi/integ/ServerCoreAnnotationsOsgiTest.java
+++ b/osgi-integ/src/test/java/org/apache/directory/server/osgi/integ/ServerAnnotationsOsgiTest.java
@@ -20,30 +20,23 @@
package org.apache.directory.server.osgi.integ;
-import static org.junit.Assert.assertNotNull;
+import org.apache.directory.server.core.security.CertificateUtil;
-import org.apache.directory.server.core.api.DirectoryService;
-import org.apache.directory.server.core.factory.DefaultDirectoryServiceFactory;
-
-public class ServerCoreAnnotationsOsgiTest extends ServerOsgiTestBase
+public class ServerAnnotationsOsgiTest extends ServerOsgiTestBase
{
@Override
protected String getBundleName()
{
- return "org.apache.directory.server.core.annotations";
+ return "org.apache.directory.server.annotations";
}
@Override
protected void useBundleClasses() throws Exception
{
- DefaultDirectoryServiceFactory factory = new DefaultDirectoryServiceFactory();
- factory.init( "foo" );
- DirectoryService ds = factory.getDirectoryService();
- assertNotNull( ds );
- assertNotNull( ds.getDnFactory() );
+ CertificateUtil.createTempKeyStore( "foo" );
}
}
diff --git a/osgi-integ/src/test/java/org/apache/directory/server/osgi/integ/ServerCoreAnnotationsOsgiTest.java b/osgi-integ/src/test/java/org/apache/directory/server/osgi/integ/ServerCoreAnnotationsOsgiTest.java
index e6b98ed..9a9dd38 100644
--- a/osgi-integ/src/test/java/org/apache/directory/server/osgi/integ/ServerCoreAnnotationsOsgiTest.java
+++ b/osgi-integ/src/test/java/org/apache/directory/server/osgi/integ/ServerCoreAnnotationsOsgiTest.java
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertNotNull;
import org.apache.directory.server.core.api.DirectoryService;
import org.apache.directory.server.core.factory.DefaultDirectoryServiceFactory;
+import org.apache.directory.server.core.security.CertificateUtil;
public class ServerCoreAnnotationsOsgiTest extends ServerOsgiTestBase
@@ -44,6 +45,7 @@ public class ServerCoreAnnotationsOsgiTest extends ServerOsgiTestBase
DirectoryService ds = factory.getDirectoryService();
assertNotNull( ds );
assertNotNull( ds.getDnFactory() );
+ CertificateUtil.createTempKeyStore( "foo" );
}
}
diff --git a/osgi-integ/src/test/java/org/apache/directory/server/osgi/integ/ServerCoreOsgiTest.java b/osgi-integ/src/test/java/org/apache/directory/server/osgi/integ/ServerCoreOsgiTest.java
index c808203..6a9fceb 100644
--- a/osgi-integ/src/test/java/org/apache/directory/server/osgi/integ/ServerCoreOsgiTest.java
+++ b/osgi-integ/src/test/java/org/apache/directory/server/osgi/integ/ServerCoreOsgiTest.java
@@ -23,7 +23,7 @@ package org.apache.directory.server.osgi.integ;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
import org.apache.directory.server.core.DefaultDirectoryService;
import org.apache.directory.server.core.DefaultOperationManager;
-import org.apache.directory.server.core.security.CoreKeyStoreSpi;
+import org.apache.directory.server.core.security.CertificateUtil;
import org.apache.directory.server.core.security.TlsKeyGenerator;
@@ -43,6 +43,7 @@ public class ServerCoreOsgiTest extends ServerOsgiTestBase
DefaultDirectoryService ds = new DefaultDirectoryService();
new DefaultOperationManager( ds );
TlsKeyGenerator.addKeyPair( new DefaultEntry() );
+ CertificateUtil.createTempKeyStore( "foo" );
}
}
diff --git a/server-annotations/pom.xml b/server-annotations/pom.xml
index a238b48..8d8a00f 100644
--- a/server-annotations/pom.xml
+++ b/server-annotations/pom.xml
@@ -145,6 +145,7 @@
org.apache.directory.server.constants;version=${project.version},
org.apache.directory.server.core.annotations;version=${project.version},
org.apache.directory.server.core.api;version=${project.version},
+ org.apache.directory.server.core.security;version=${project.version},
org.apache.directory.server.i18n;version=${project.version},
org.apache.directory.server.kerberos;version=${project.version},
org.apache.directory.server.kerberos.changepwd;version=${project.version},