You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ha...@apache.org on 2015/03/06 14:20:54 UTC
directory-kerberos git commit: Improve the way of installation
packaging.
Repository: directory-kerberos
Updated Branches:
refs/heads/installation 1bd99d7e0 -> f64f7f821
Improve the way of installation packaging.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerberos/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerberos/commit/f64f7f82
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerberos/tree/f64f7f82
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerberos/diff/f64f7f82
Branch: refs/heads/installation
Commit: f64f7f821f151c9a8fe9b3d9d910d87865bd4f49
Parents: 1bd99d7
Author: Lin <li...@foxmail.com>
Authored: Fri Mar 6 21:20:25 2015 +0800
Committer: Lin <li...@foxmail.com>
Committed: Fri Mar 6 21:20:25 2015 +0800
----------------------------------------------------------------------
kerby-dist/README.txt | 7 ++--
kerby-dist/conf/wrapper.conf | 4 +--
kerby-kerb/kerb-server/pom.xml | 19 +----------
pom.xml | 65 ++-----------------------------------
4 files changed, 8 insertions(+), 87 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/f64f7f82/kerby-dist/README.txt
----------------------------------------------------------------------
diff --git a/kerby-dist/README.txt b/kerby-dist/README.txt
index 7c84aa5..48a5486 100644
--- a/kerby-dist/README.txt
+++ b/kerby-dist/README.txt
@@ -20,13 +20,12 @@ How to install kerby-server?
1. Set the absolute path of the directory:kerby-dist\kerby-server in kerby-dist\conf\wrapper.conf:
Change the value of wrapper.working.dir.(in the line 28)
e.g.
-wrapper.working.dir=C:\\Users\\hazel\\workspace\\directory-kerberos\\kerby-dist\\kerby-server\\
+wrapper.working.dir=C:\\Users\\hazel\\workspace\\directory-kerberos\\kerby-dist\\target\\
or
-wrapper.working.dir=/hazel/workspace/directory-kerberos/kerby-dist/kerby-server
+wrapper.working.dir=/home/hazel/workspace/directory-kerberos/kerby-dist/target
2.Every time you want to reinstall, just run:
-mvn package -Pdependency
-mvn antrun:run
+mvn install
3.Then you can run or manage the service via the following scripts.
On windows:
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/f64f7f82/kerby-dist/conf/wrapper.conf
----------------------------------------------------------------------
diff --git a/kerby-dist/conf/wrapper.conf b/kerby-dist/conf/wrapper.conf
index 9d5f019..3171e98 100644
--- a/kerby-dist/conf/wrapper.conf
+++ b/kerby-dist/conf/wrapper.conf
@@ -42,7 +42,7 @@
#********************************************************************
# working directory
#********************************************************************
-wrapper.working.dir=/home/drankye/workspace/kerby/kerby-dist/kerby-server
+wrapper.working.dir=/home/hazel/workspace/directory-kerberos/kerby-dist/target
# Java Main class.
# YAJSW: default is "org.rzo.yajsw.app.WrapperJVMMain"
@@ -299,7 +299,7 @@ that the JVM shuts down.
# genConfig: further Properties generated by genConfig
#********************************************************************
placeHolderSoGenPropsComeHere=
-wrapper.java.app.jar = kerb-server-1.0-SNAPSHOT.jar
+wrapper.java.app.jar = kerby-dist-1.0-SNAPSHOT-jar-with-dependencies.jar
wrapper.java.command = java
wrapper.java.classpath.1 = .
#wrapper.java.classpath.2 = C:\\Program Files\\Java\\jdk1.8.0_25\\lib
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/f64f7f82/kerby-kerb/kerb-server/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server/pom.xml b/kerby-kerb/kerb-server/pom.xml
index 11848c0..f421ef6 100644
--- a/kerby-kerb/kerb-server/pom.xml
+++ b/kerby-kerb/kerb-server/pom.xml
@@ -12,7 +12,7 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
-<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">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -58,21 +58,4 @@
<version>${project.version}</version>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- <mainClass>org.apache.kerby.kerberos.kerb.server.KdcServer</mainClass>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/f64f7f82/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0934c1e..3d08524 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
-<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">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.kerby</groupId>
@@ -29,8 +29,6 @@
<junit.version>4.12</junit.version>
<slf4j.version>1.7.10</slf4j.version>
<assertj.version>1.7.1</assertj.version>
- <dependency.directory>target/dependencies</dependency.directory>
- <server.dist.directory>kerby-dist/kerby-server</server.dist.directory>
</properties>
<prerequisites>
@@ -46,6 +44,7 @@
<module>tool</module>
<module>kdc-backend</module>
<module>benchmark</module>
+ <module>kerby-dist</module>
</modules>
<dependencyManagement>
@@ -171,35 +170,6 @@
<artifactId>maven-clean-plugin</artifactId>
<version>2.6.1</version>
</plugin>
-
- <plugin>
- <!--installation-->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <inherited>false</inherited>
- <version>1.8</version>
- <executions>
- <execution>
- <id>default-cli</id>
- <phase>package</phase>
- <configuration>
- <tasks>
- <!--copy libs about kerby-server to dist directory-->
- <copy todir="${server.dist.directory}">
- <fileset dir="kerby-kerb/kerb-server/${dependency.directory}">
- <include name="*" />
- </fileset>
- </copy>
- <copy file="kerby-kerb/kerb-server/target/kerb-server-${project.version}.jar"
- tofile="${server.dist.directory}/kerb-server-${project.version}.jar"/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</pluginManagement>
@@ -223,35 +193,4 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>dependency</id>
- <!-- Profile for generating dependent jars preparing for installation. -->
- <!-- For installation, call mvn antrun:run. -->
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>${dependency.directory}</outputDirectory>
- <overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>false</overWriteSnapshots>
- <overWriteIfNewer>true</overWriteIfNewer>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>