directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ha...@apache.org
Subject directory-kerberos git commit: Refine kdc server's packaging and installation.
Date Mon, 16 Mar 2015 06:42:54 GMT
Repository: directory-kerberos
Updated Branches:
  refs/heads/master 515d3b66f -> 6e9bcdd52


Refine kdc server's packaging and installation.


Project: http://git-wip-us.apache.org/repos/asf/directory-kerberos/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerberos/commit/6e9bcdd5
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerberos/tree/6e9bcdd5
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerberos/diff/6e9bcdd5

Branch: refs/heads/master
Commit: 6e9bcdd52b2d3f3dc1ad39a69f5cd3891a18d7c2
Parents: 515d3b6
Author: hazel <linchen7@foxmail.com>
Authored: Mon Mar 16 14:42:40 2015 +0800
Committer: hazel <linchen7@foxmail.com>
Committed: Mon Mar 16 14:42:40 2015 +0800

----------------------------------------------------------------------
 kerby-dist/kdc-dist/bin/start-kdc.sh            |  2 +-
 kerby-dist/kdc-dist/pom.xml                     | 34 +++++++++++++++++++-
 .../kerberos/kdc/server/KerbyKdcServer.java     |  4 +--
 3 files changed, 35 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/6e9bcdd5/kerby-dist/kdc-dist/bin/start-kdc.sh
----------------------------------------------------------------------
diff --git a/kerby-dist/kdc-dist/bin/start-kdc.sh b/kerby-dist/kdc-dist/bin/start-kdc.sh
index 9e6ce7c..2ee1882 100644
--- a/kerby-dist/kdc-dist/bin/start-kdc.sh
+++ b/kerby-dist/kdc-dist/bin/start-kdc.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-java -jar ../kerby-kdc/kerby-kdc-1.0-SNAPSHOT-jar-with-dependencies.jar $@
\ No newline at end of file
+java -cp ../lib/kerb-server-1.0-SNAPSHOT-jar-with-dependencies.jar:../lib/Json-identity-backend-1.0-SNAPSHOT.jar:../lib/ldap-identity-backend-1.0-SNAPSHOT.jar:../lib/zookeeper-backend-1.0-SNAPSHOT.jar:../lib/kerby-kdc-1.0-SNAPSHOT.jar
org.apache.kerby.kerberos.kdc.server.KerbyKdcServer $@
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/6e9bcdd5/kerby-dist/kdc-dist/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-dist/kdc-dist/pom.xml b/kerby-dist/kdc-dist/pom.xml
index fa6be02..cfa19a7 100644
--- a/kerby-dist/kdc-dist/pom.xml
+++ b/kerby-dist/kdc-dist/pom.xml
@@ -24,13 +24,45 @@
   <artifactId>kdc-dist</artifactId>
   <name>KDC Dist</name>
   <description>KDC Dist Project</description>
+  <packaging>pom</packaging>
 
   <dependencies>
     <dependency>
       <groupId>org.apache.kerby</groupId>
-      <artifactId>kerby-kerb</artifactId>
+      <artifactId>kerby-kdc</artifactId>
       <version>${project.version}</version>
     </dependency>
   </dependencies>
 
+  <profiles>
+    <profile>
+      <id>dist</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version>1.8</version>
+            <executions>
+              <execution>
+                <phase>package</phase>
+                <configuration>
+                  <tasks>
+                    <copy file="../../kerby-kerb/kerb-server/target/kerb-server-${project.version}-jar-with-dependencies.jar"
tofile="lib/kerb-server-${project.version}-jar-with-dependencies.jar"/>
+                    <copy file="../../kerby-kdc/target/kerby-kdc-${project.version}.jar"
tofile="lib/kerby-kdc-${project.version}.jar"/>
+                    <copy file="../../kdc-backend/json-backend/target/Json-identity-backend-${project.version}.jar"
tofile="lib/Json-identity-backend-${project.version}.jar"/>
+                    <copy file="../../kdc-backend/ldap-backend/target/ldap-identity-backend-${project.version}.jar"
tofile="lib/ldap-identity-backend-${project.version}.jar"/>
+                    <copy file="../../kdc-backend/zookeeper-backend/target/zookeeper-backend-${project.version}.jar"
tofile="lib/zookeeper-backend-${project.version}.jar"/>
+                  </tasks>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/6e9bcdd5/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/server/KerbyKdcServer.java
----------------------------------------------------------------------
diff --git a/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/server/KerbyKdcServer.java
b/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/server/KerbyKdcServer.java
index bd78aef..1f6d2ee 100644
--- a/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/server/KerbyKdcServer.java
+++ b/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/server/KerbyKdcServer.java
@@ -19,7 +19,6 @@
  */
 package org.apache.kerby.kerberos.kdc.server;
 
-import org.apache.kerby.config.Conf;
 import org.apache.kerby.kerberos.kerb.KrbException;
 import org.apache.kerby.kerberos.kerb.common.EncryptionUtil;
 import org.apache.kerby.kerberos.kerb.identity.KrbIdentity;
@@ -28,7 +27,6 @@ import org.apache.kerby.kerberos.kerb.spec.common.EncryptionKey;
 import org.apache.kerby.kerberos.kerb.spec.common.EncryptionType;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.List;
 import java.util.UUID;
 
@@ -70,7 +68,7 @@ public class KerbyKdcServer extends KdcServer {
             System.out.println("KDC started.");
         } else if (args[0].equals("-stop")) {
             //server.stop();//FIXME can't get the server instance here
-            System.out.println("KDC Server stoped.");
+            System.out.println("KDC Server stopped.");
         } else {
             System.err.println(USAGE);
         }


Mime
View raw message