directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dran...@apache.org
Subject directory-kerberos git commit: Some cleanup and refining
Date Mon, 09 Feb 2015 07:36:13 GMT
Repository: directory-kerberos
Updated Branches:
  refs/heads/installation 63099eb81 -> 1bd99d7e0


Some cleanup and refining


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

Branch: refs/heads/installation
Commit: 1bd99d7e076f6b02fdbd54f97383332d36ed0302
Parents: 63099eb
Author: Drankye <drankye@gmail.com>
Authored: Mon Feb 9 23:33:18 2015 +0800
Committer: Drankye <drankye@gmail.com>
Committed: Mon Feb 9 23:33:18 2015 +0800

----------------------------------------------------------------------
 .gitignore                              |  1 +
 kerby-dist/README.txt                   | 55 ++++++++++++++++++++++++++++
 kerby-dist/bin/genConfig.sh             |  0
 kerby-dist/bin/installDaemon.sh         |  0
 kerby-dist/bin/installDaemonNoPriv.sh   |  0
 kerby-dist/bin/queryDaemon.sh           |  0
 kerby-dist/bin/runConsole.sh            |  0
 kerby-dist/bin/runHelloWorld.sh         |  0
 kerby-dist/bin/setenv.sh                |  0
 kerby-dist/bin/startDaemon.sh           |  0
 kerby-dist/bin/startDaemonNoPriv.sh     |  0
 kerby-dist/bin/stopDaemon.sh            |  0
 kerby-dist/bin/stopDaemonNoPriv.sh      |  0
 kerby-dist/bin/systemTrayIcon.sh        |  0
 kerby-dist/bin/uninstallDaemon.sh       |  0
 kerby-dist/bin/uninstallDaemonNoPriv.sh |  0
 kerby-dist/bin/wrapper.sh               |  0
 kerby-dist/conf/wrapper.conf            |  9 +++--
 kerby-dist/readme.txt                   | 36 ------------------
 pom.xml                                 | 54 +++++++++++++--------------
 20 files changed, 88 insertions(+), 67 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/1bd99d7e/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 710af83..985c1c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ bc.zip
 log.txt
 *.ipr
 *.iws
+kerby-server
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/1bd99d7e/kerby-dist/README.txt
----------------------------------------------------------------------
diff --git a/kerby-dist/README.txt b/kerby-dist/README.txt
new file mode 100644
index 0000000..7c84aa5
--- /dev/null
+++ b/kerby-dist/README.txt
@@ -0,0 +1,55 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+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\\
+or
+wrapper.working.dir=/hazel/workspace/directory-kerberos/kerby-dist/kerby-server
+
+2.Every time you want to reinstall, just run:
+mvn package -Pdependency
+mvn antrun:run
+
+3.Then you can run or manage the service via the following scripts.
+On windows:
+bat/runConsole.bat,
+bat/installService.bat,
+bat/startService.bat,
+bat/stopService.bat,
+bat/uninstallService.bat in Windows.
+
+On Linux:
+bin/genConfig.sh
+bin/installDaemonNoPriv.sh
+bin/installDaemon.sh
+bin/queryDaemon.sh
+bin/runConsole.sh
+bin/runHelloWorld.sh
+bin/setenv.sh
+bin/startDaemonNoPriv.sh
+bin/startDaemon.sh
+bin/stopDaemonNoPriv.sh
+bin/stopDaemon.sh
+bin/systemTrayIcon.sh
+bin/uninstallDaemonNoPriv.sh
+bin/uninstallDaemon.sh
+bin/wrapper.sh
+

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/1bd99d7e/kerby-dist/bin/genConfig.sh
----------------------------------------------------------------------
diff --git a/kerby-dist/bin/genConfig.sh b/kerby-dist/bin/genConfig.sh
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/1bd99d7e/kerby-dist/bin/installDaemon.sh
----------------------------------------------------------------------
diff --git a/kerby-dist/bin/installDaemon.sh b/kerby-dist/bin/installDaemon.sh
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/1bd99d7e/kerby-dist/bin/installDaemonNoPriv.sh
----------------------------------------------------------------------
diff --git a/kerby-dist/bin/installDaemonNoPriv.sh b/kerby-dist/bin/installDaemonNoPriv.sh
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/1bd99d7e/kerby-dist/bin/queryDaemon.sh
----------------------------------------------------------------------
diff --git a/kerby-dist/bin/queryDaemon.sh b/kerby-dist/bin/queryDaemon.sh
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/1bd99d7e/kerby-dist/bin/runConsole.sh
----------------------------------------------------------------------
diff --git a/kerby-dist/bin/runConsole.sh b/kerby-dist/bin/runConsole.sh
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/1bd99d7e/kerby-dist/bin/runHelloWorld.sh
----------------------------------------------------------------------
diff --git a/kerby-dist/bin/runHelloWorld.sh b/kerby-dist/bin/runHelloWorld.sh
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/1bd99d7e/kerby-dist/bin/setenv.sh
----------------------------------------------------------------------
diff --git a/kerby-dist/bin/setenv.sh b/kerby-dist/bin/setenv.sh
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/1bd99d7e/kerby-dist/bin/startDaemon.sh
----------------------------------------------------------------------
diff --git a/kerby-dist/bin/startDaemon.sh b/kerby-dist/bin/startDaemon.sh
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/1bd99d7e/kerby-dist/bin/startDaemonNoPriv.sh
----------------------------------------------------------------------
diff --git a/kerby-dist/bin/startDaemonNoPriv.sh b/kerby-dist/bin/startDaemonNoPriv.sh
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/1bd99d7e/kerby-dist/bin/stopDaemon.sh
----------------------------------------------------------------------
diff --git a/kerby-dist/bin/stopDaemon.sh b/kerby-dist/bin/stopDaemon.sh
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/1bd99d7e/kerby-dist/bin/stopDaemonNoPriv.sh
----------------------------------------------------------------------
diff --git a/kerby-dist/bin/stopDaemonNoPriv.sh b/kerby-dist/bin/stopDaemonNoPriv.sh
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/1bd99d7e/kerby-dist/bin/systemTrayIcon.sh
----------------------------------------------------------------------
diff --git a/kerby-dist/bin/systemTrayIcon.sh b/kerby-dist/bin/systemTrayIcon.sh
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/1bd99d7e/kerby-dist/bin/uninstallDaemon.sh
----------------------------------------------------------------------
diff --git a/kerby-dist/bin/uninstallDaemon.sh b/kerby-dist/bin/uninstallDaemon.sh
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/1bd99d7e/kerby-dist/bin/uninstallDaemonNoPriv.sh
----------------------------------------------------------------------
diff --git a/kerby-dist/bin/uninstallDaemonNoPriv.sh b/kerby-dist/bin/uninstallDaemonNoPriv.sh
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/1bd99d7e/kerby-dist/bin/wrapper.sh
----------------------------------------------------------------------
diff --git a/kerby-dist/bin/wrapper.sh b/kerby-dist/bin/wrapper.sh
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/1bd99d7e/kerby-dist/conf/wrapper.conf
----------------------------------------------------------------------
diff --git a/kerby-dist/conf/wrapper.conf b/kerby-dist/conf/wrapper.conf
index 287512d..9d5f019 100644
--- a/kerby-dist/conf/wrapper.conf
+++ b/kerby-dist/conf/wrapper.conf
@@ -42,7 +42,7 @@
 #********************************************************************
 # working directory
 #********************************************************************
-wrapper.working.dir=C:\\Users\\hazel\\workspace\\directory-kerberos\\kerby-dist\\kerby-server\\
+wrapper.working.dir=/home/drankye/workspace/kerby/kerby-dist/kerby-server
 
 # Java Main class.  
 # YAJSW: default is "org.rzo.yajsw.app.WrapperJVMMain" 
@@ -282,7 +282,8 @@ wrapper.filter.script.0.args=Exception
 # Default: 30 seconds
 #wrapper.startup.timeout = 
 
-# Number of seconds to allow between the time that the Wrapper asks the application to shutdown
and the time that the JVM shuts down. 
+# Number of seconds to allow between the time that the Wrapper asks the application to shutdown
and the time
+that the JVM shuts down.
 # Default: 30 seconds
 #wrapper.shutdown.timeout = 
 
@@ -301,7 +302,7 @@ placeHolderSoGenPropsComeHere=
 wrapper.java.app.jar = kerb-server-1.0-SNAPSHOT.jar
 wrapper.java.command = java
 wrapper.java.classpath.1 = .
-wrapper.java.classpath.2 = C:\\Program Files\\Java\\jdk1.8.0_25\\lib
-wrapper.java.classpath.3 = C:\\Program Files\\Java\\jdk1.8.0_25\\lib\\tools.jar
+#wrapper.java.classpath.2 = C:\\Program Files\\Java\\jdk1.8.0_25\\lib
+#wrapper.java.classpath.3 = C:\\Program Files\\Java\\jdk1.8.0_25\\lib\\tools.jar
 
 wrapper.stop.conf=conf/wrapper.stop.conf
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/1bd99d7e/kerby-dist/readme.txt
----------------------------------------------------------------------
diff --git a/kerby-dist/readme.txt b/kerby-dist/readme.txt
deleted file mode 100644
index 95e98c3..0000000
--- a/kerby-dist/readme.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-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\\
-or
-wrapper.working.dir=/hazel/workspace/directory-kerberos/kerby-dist/kerby-server
-
-2.Everytime you want to reinstall, just run:
-mvn package -Pdependency
-mvn antrun:run
-
-3.Then you can run the service by
-bat/runConsole.bat,
-bat/installService.bat,
-bat/startService.bat,
-bat/stopService.bat,
-bat/uninstallService.bat in Windows. And bin/... in Linux.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/1bd99d7e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b9ba79a..0934c1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     <junit.version>4.12</junit.version>
     <slf4j.version>1.7.10</slf4j.version>
     <assertj.version>1.7.1</assertj.version>
-    <dependency.directory>target/dependences</dependency.directory>
+    <dependency.directory>target/dependencies</dependency.directory>
     <server.dist.directory>kerby-dist/kerby-server</server.dist.directory>
   </properties>
 
@@ -226,32 +226,32 @@
 
   <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>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>
+      <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>


Mime
View raw message