Return-Path: 
 <commits-return-41217-apmail-directory-commits-archive=directory.apache.org@directory.apache.org>
X-Original-To: apmail-directory-commits-archive@www.apache.org
Delivered-To: apmail-directory-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 5276A175F5
	for <apmail-directory-commits-archive@www.apache.org>;
 Mon, 23 Mar 2015 12:04:29 +0000 (UTC)
Received: (qmail 78602 invoked by uid 500); 23 Mar 2015 12:04:29 -0000
Delivered-To: apmail-directory-commits-archive@directory.apache.org
Received: (qmail 78556 invoked by uid 500); 23 Mar 2015 12:04:29 -0000
Mailing-List: contact commits-help@directory.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@directory.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@directory.apache.org>
List-Post: <mailto:commits@directory.apache.org>
List-Id: <commits.directory.apache.org>
Reply-To: dev@directory.apache.org
Delivered-To: mailing list commits@directory.apache.org
Received: (qmail 78547 invoked by uid 99); 23 Mar 2015 12:04:29 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Mar 2015 12:04:29 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 06D19E0FB5; Mon, 23 Mar 2015 12:04:29 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: hazel@apache.org
To: commits@directory.apache.org
Message-Id: <8c74e855da714a87aba5a9dac1760ddc@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: directory-kerby git commit: Optimizing some maven configuration.
Date: Mon, 23 Mar 2015 12:04:29 +0000 (UTC)

Repository: directory-kerby
Updated Branches:
  refs/heads/master ba42439fc -> 9c6fd7371


Optimizing some maven configuration.


Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/9c6fd737
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/9c6fd737
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/9c6fd737

Branch: refs/heads/master
Commit: 9c6fd73714fad49fa4792f03e7998f8c808e25ab
Parents: ba42439
Author: hazel <linchen7@foxmail.com>
Authored: Mon Mar 23 20:04:21 2015 +0800
Committer: hazel <linchen7@foxmail.com>
Committed: Mon Mar 23 20:04:21 2015 +0800

----------------------------------------------------------------------
 kerby-dist/pom.xml                 | 15 +++++++++++++++
 kerby-dist/tool-dist/bin/kadmin.sh |  3 +--
 kerby-dist/tool-dist/pom.xml       |  3 +--
 kerby-tool/kdc-tool/pom.xml        | 29 +++++++++++++++++++++++++++++
 4 files changed, 46 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/9c6fd737/kerby-dist/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-dist/pom.xml b/kerby-dist/pom.xml
index df20508..5c3bd31 100644
--- a/kerby-dist/pom.xml
+++ b/kerby-dist/pom.xml
@@ -33,4 +33,19 @@
     <module>tool-dist</module>
   </modules>
 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-clean-plugin</artifactId>
+        <configuration>
+          <filesets>
+            <fileset>
+              <directory>lib</directory>
+            </fileset>
+          </filesets>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/9c6fd737/kerby-dist/tool-dist/bin/kadmin.sh
----------------------------------------------------------------------
diff --git a/kerby-dist/tool-dist/bin/kadmin.sh b/kerby-dist/tool-dist/bin/kadmin.sh
index b4938ed..85e54cd 100644
--- a/kerby-dist/tool-dist/bin/kadmin.sh
+++ b/kerby-dist/tool-dist/bin/kadmin.sh
@@ -3,5 +3,4 @@ java -Xdebug -Xrunjdwp:transport=dt_socket,address=1046,server=y,suspend=n \
 -cp ../lib/json-backend-1.0-SNAPSHOT-jar-with-dependencies.jar:\
 ../lib/ldap-backend-1.0-SNAPSHOT-jar-with-dependencies.jar:\
 ../lib/zookeeper-backend-1.0-SNAPSHOT-jar-with-dependencies.jar:\
-../lib/kerb-server-1.0-SNAPSHOT-jar-with-dependencies.jar:\
-../lib/server-tool-1.0-SNAPSHOT.jar org.apache.kerby.kerberos.tool.kadmin.Kadmin $@
\ No newline at end of file
+../lib/server-tool-1.0-SNAPSHOT-jar-with-dependencies.jar org.apache.kerby.kerberos.tool.kadmin.Kadmin $@
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/9c6fd737/kerby-dist/tool-dist/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-dist/tool-dist/pom.xml b/kerby-dist/tool-dist/pom.xml
index 641e2aa..860b826 100644
--- a/kerby-dist/tool-dist/pom.xml
+++ b/kerby-dist/tool-dist/pom.xml
@@ -59,8 +59,7 @@
                     <copy file="../../kerby-provider/token-provider/target/token-provider-${project.version}-jar-with-dependencies.jar" tofile="lib/token-provider-tool-${project.version}-jar-with-dependencies.jar"/>
 
                     <!--kadmin tool-->
-                    <copy file="../../kerby-tool/kdc-tool/target/server-tool-${project.version}.jar" tofile="lib/server-tool-${project.version}.jar"/>
-                    <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-tool/kdc-tool/target/server-tool-${project.version}-jar-with-dependencies.jar" tofile="lib/server-tool-${project.version}-jar-with-dependencies.jar"/>
                     <copy file="../../kerby-backend/json-backend/target/json-backend-${project.version}-jar-with-dependencies.jar" tofile="lib/json-backend-${project.version}-jar-with-dependencies.jar"/>
                     <copy file="../../kerby-backend/ldap-backend/target/ldap-backend-${project.version}-jar-with-dependencies.jar" tofile="lib/ldap-backend-${project.version}-jar-with-dependencies.jar"/>
                     <copy file="../../kerby-backend/zookeeper-backend/target/zookeeper-backend-${project.version}-jar-with-dependencies.jar" tofile="lib/zookeeper-backend-${project.version}-jar-with-dependencies.jar"/>

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/9c6fd737/kerby-tool/kdc-tool/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-tool/kdc-tool/pom.xml b/kerby-tool/kdc-tool/pom.xml
index 8ebd250..de1f5e7 100644
--- a/kerby-tool/kdc-tool/pom.xml
+++ b/kerby-tool/kdc-tool/pom.xml
@@ -43,4 +43,33 @@
       </dependency>
     </dependencies>
 
+    <profiles>
+      <profile>
+        <id>dist</id>
+        <build>
+          <plugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-assembly-plugin</artifactId>
+              <version>2.2</version>
+              <executions>
+                <execution>
+                  <id>package-all</id>
+                  <phase>package</phase>
+                  <goals>
+                    <goal>single</goal>
+                  </goals>
+                  <configuration>
+                    <descriptorRefs>
+                      <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                  </configuration>
+                </execution>
+              </executions>
+            </plugin>
+          </plugins>
+        </build>
+      </profile>
+    </profiles>
+
 </project>