You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/03/04 16:44:04 UTC
svn commit: r919029 - in /directory/installers/trunk:
apacheds-noarch/pom.xml apacheds/README apacheds/pom.xml
apacheds/src/main/installers/apacheds-fhs.conf
apacheds/src/main/installers/apacheds.conf
Author: elecharny
Date: Thu Mar 4 15:44:03 2010
New Revision: 919029
URL: http://svn.apache.org/viewvc?rev=919029&view=rev
Log:
Updated the pom.xml and various files referencing dependencies version
Modified:
directory/installers/trunk/apacheds-noarch/pom.xml
directory/installers/trunk/apacheds/README
directory/installers/trunk/apacheds/pom.xml
directory/installers/trunk/apacheds/src/main/installers/apacheds-fhs.conf
directory/installers/trunk/apacheds/src/main/installers/apacheds.conf
Modified: directory/installers/trunk/apacheds-noarch/pom.xml
URL: http://svn.apache.org/viewvc/directory/installers/trunk/apacheds-noarch/pom.xml?rev=919029&r1=919028&r2=919029&view=diff
==============================================================================
--- directory/installers/trunk/apacheds-noarch/pom.xml (original)
+++ directory/installers/trunk/apacheds-noarch/pom.xml Thu Mar 4 15:44:03 2010
@@ -103,12 +103,12 @@
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-annotations</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-api</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
</dependencies>
</project>
Modified: directory/installers/trunk/apacheds/README
URL: http://svn.apache.org/viewvc/directory/installers/trunk/apacheds/README?rev=919029&r1=919028&r2=919029&view=diff
==============================================================================
--- directory/installers/trunk/apacheds/README (original)
+++ directory/installers/trunk/apacheds/README Thu Mar 4 15:44:03 2010
@@ -27,14 +27,14 @@
On Windows the server can be started like any other service using the services
console via Microsoft Management Console. It can also be started, stopped and
configured using the procrun service manager installed for it: see
-Start->All Programs->apacheds->Service Setttings. A tray icon can also be
+Start->All Programs->apacheds->Service Settings. A tray icon can also be
launched for the application to monitor it and to control the service: see
Start->All Programs->apacheds->Tray Monitor. The server can also be started
in a special debug mode (not for IDE remote debugging though) where it dumps
output to the command line in a cmd window rather than to the log files. You
can launch the server in this mode by selecting Start->All Programs->
apacheds->Test Service. The server can also be started in test mode by
-running the apacheds.exe executable from the commandline. Likewise the
+running the apacheds.exe executable from the command line. Likewise the
service manager can be started from the command line by invoking
apachedsw.exe.
@@ -48,12 +48,12 @@
java -jar apacheds-tools.jar help
-The tool contains several commands. Here's a breif listing with description:
+The tool contains several commands. Here's a brief listing with description:
help displays help message
- notifications listens to the server for disconnect msgs
+ notifications listens to the server for disconnect messages
dump dumps partitions in LDIF format for recovery and backup
- graceful starts graceful shutdown with shutdown delay & timeoffline
+ graceful starts graceful shutdown with shutdown delay & time offline
diagnostic launches diagnostic UI for inspecting server partitions
and client sessions
import imports data to the server from a LDIF file
Modified: directory/installers/trunk/apacheds/pom.xml
URL: http://svn.apache.org/viewvc/directory/installers/trunk/apacheds/pom.xml?rev=919029&r1=919028&r2=919029&view=diff
==============================================================================
--- directory/installers/trunk/apacheds/pom.xml (original)
+++ directory/installers/trunk/apacheds/pom.xml Thu Mar 4 15:44:03 2010
@@ -42,18 +42,22 @@
<dependencies>
<dependency>
- <groupId>org.apache.directory.installers</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-noarch-installer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<dependency>
<groupId>tanukisoft</groupId>
<artifactId>wrapper</artifactId>
+ <version>${wrapper.version}</version>
<scope>runtime</scope>
</dependency>
+
<dependency>
- <groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-server-tools</artifactId>
+ <groupId>org.apache.directory.server</groupId>
+ <version>${server.version}</version>
</dependency>
</dependencies>
@@ -84,6 +88,7 @@
</execution>
</executions>
</plugin>
+
<plugin>
<groupId>org.apache.directory.daemon</groupId>
<artifactId>daemon-plugin</artifactId>
@@ -200,6 +205,7 @@
</execution>
</executions>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
@@ -225,6 +231,7 @@
</plugins>
</build>
</profile>
+
<profile>
<id>studio-installer</id>
<build>
@@ -251,6 +258,7 @@
</execution>
</executions>
</plugin>
+
<plugin>
<groupId>org.apache.directory.daemon</groupId>
<artifactId>daemon-plugin</artifactId>
@@ -350,6 +358,7 @@
</execution>
</executions>
</plugin>
+
<plugin>
<groupId>org.apache.org.maven</groupId>
<artifactId>maven-deploy-plugin</artifactId>
Modified: directory/installers/trunk/apacheds/src/main/installers/apacheds-fhs.conf
URL: http://svn.apache.org/viewvc/directory/installers/trunk/apacheds/src/main/installers/apacheds-fhs.conf?rev=919029&r1=919028&r2=919029&view=diff
==============================================================================
--- directory/installers/trunk/apacheds/src/main/installers/apacheds-fhs.conf (original)
+++ directory/installers/trunk/apacheds/src/main/installers/apacheds-fhs.conf Thu Mar 4 15:44:03 2010
@@ -23,7 +23,7 @@
# this will need to be set to a fully qualified path.
# This can also be overridden in /var/lib/apacheds/<instance_name>/conf/apacheds.conf
#
-#wrapper.java.command=/usr/local/java/jdk1.5.0_16/bin/java
+#wrapper.java.command=/usr/local/java/jdk1.5.0_22/bin/java
#
wrapper.java.command=@app.java.home@
@@ -36,8 +36,8 @@
wrapper.java.classpath.1=../lib/bootstrapper.jar
wrapper.java.classpath.2=../lib/wrapper.jar
-wrapper.java.classpath.3=../lib/slf4j-api-1.5.6.jar
-wrapper.java.classpath.4=../lib/slf4j-log4j12-1.5.6.jar
+wrapper.java.classpath.3=../lib/slf4j-api-1.5.10.jar
+wrapper.java.classpath.4=../lib/slf4j-log4j12-1.5.10.jar
wrapper.java.classpath.5=../lib/log4j-1.2.14.jar
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
Modified: directory/installers/trunk/apacheds/src/main/installers/apacheds.conf
URL: http://svn.apache.org/viewvc/directory/installers/trunk/apacheds/src/main/installers/apacheds.conf?rev=919029&r1=919028&r2=919029&view=diff
==============================================================================
--- directory/installers/trunk/apacheds/src/main/installers/apacheds.conf (original)
+++ directory/installers/trunk/apacheds/src/main/installers/apacheds.conf Thu Mar 4 15:44:03 2010
@@ -23,7 +23,7 @@
# this will need to be set to a fully qualified path.
# This can also be overridden in /var/lib/apacheds/<instance_name>/conf/apacheds.conf
#
-#wrapper.java.command=/usr/local/java/jdk1.5.0_16/bin/java
+#wrapper.java.command=/usr/local/java/jdk1.5.0_22/bin/java
#
wrapper.java.command=@app.java.home@
@@ -32,8 +32,8 @@
wrapper.java.classpath.1=../lib/bootstrapper.jar
wrapper.java.classpath.2=../lib/wrapper.jar
-wrapper.java.classpath.3=../lib/slf4j-api-1.5.6.jar
-wrapper.java.classpath.4=../lib/slf4j-log4j12-1.5.6.jar
+wrapper.java.classpath.3=../lib/slf4j-api-1.5.10.jar
+wrapper.java.classpath.4=../lib/slf4j-log4j12-1.5.10.jar
wrapper.java.classpath.5=../lib/log4j-1.2.14.jar
# Java Library Path (location of Wrapper.DLL or libwrapper.so)