You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by cc...@apache.org on 2007/08/24 20:46:33 UTC
svn commit: r569477 - in /directory: apacheds/trunk/
apacheds/trunk/server-installers/
apacheds/trunk/server-installers/src/main/installers/
apacheds/trunk/server-main/ apacheds/trunk/server-main/src/main/assembly/
daemon/trunk/bootstrappers/src/main/j...
Author: ccustine
Date: Fri Aug 24 11:46:32 2007
New Revision: 569477
URL: http://svn.apache.org/viewvc?rev=569477&view=rev
Log:
- DIRSERVER-1024 and DIRSERVER-1028 minor fixes to server-installers and server-main to make them work with the original fixes for the above issues.
Added:
directory/apacheds/trunk/server-installers/README
- copied, changed from r569392, directory/apacheds/trunk/server-installers/README.txt
Removed:
directory/apacheds/trunk/server-installers/README.txt
directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/wrapper/conf/apacheds.conf
Modified:
directory/apacheds/trunk/pom.xml
directory/apacheds/trunk/server-installers/pom.xml
directory/apacheds/trunk/server-installers/src/main/installers/apacheds-default.conf
directory/apacheds/trunk/server-installers/src/main/installers/apacheds-fhs.conf
directory/apacheds/trunk/server-installers/src/main/installers/apacheds-rpm.spec
directory/apacheds/trunk/server-installers/src/main/installers/apacheds-server-win.nsi
directory/apacheds/trunk/server-installers/src/main/installers/apacheds-suite-win.nsi
directory/apacheds/trunk/server-installers/src/main/installers/apacheds.conf
directory/apacheds/trunk/server-main/pom.xml
directory/apacheds/trunk/server-main/src/main/assembly/apacheds-main.xml
directory/daemon/trunk/bootstrappers/src/main/java/org/apache/directory/daemon/InstallationLayout.java
directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java
Modified: directory/apacheds/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/pom.xml?rev=569477&r1=569476&r2=569477&view=diff
==============================================================================
--- directory/apacheds/trunk/pom.xml (original)
+++ directory/apacheds/trunk/pom.xml Fri Aug 24 11:46:32 2007
@@ -139,6 +139,12 @@
</dependency>
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+
+ <dependency>
<groupId>jdbm</groupId>
<artifactId>jdbm</artifactId>
<version>1.0</version>
@@ -282,6 +288,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
Copied: directory/apacheds/trunk/server-installers/README (from r569392, directory/apacheds/trunk/server-installers/README.txt)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-installers/README?p2=directory/apacheds/trunk/server-installers/README&p1=directory/apacheds/trunk/server-installers/README.txt&r1=569392&r2=569477&rev=569477&view=diff
==============================================================================
(empty)
Modified: directory/apacheds/trunk/server-installers/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-installers/pom.xml?rev=569477&r1=569476&r2=569477&view=diff
==============================================================================
--- directory/apacheds/trunk/server-installers/pom.xml (original)
+++ directory/apacheds/trunk/server-installers/pom.xml Fri Aug 24 11:46:32 2007
@@ -49,7 +49,13 @@
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-schema-extras</artifactId>
<version>${pom.version}</version>
- </dependency>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-bootstrap-partition</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -63,7 +69,14 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>nlog4j</artifactId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
@@ -163,6 +176,7 @@
<url>http://directory.apache.org</url>
<email>users@directory.apache.org</email>
<description>Apache Directory Server</description>
+ <license>target/classes/META-INF/LICENSE</license>
<authors>
<author>Apache Directory Team</author>
<author>akarasulu@apache.org</author>
@@ -183,6 +197,12 @@
<destinationPath>bin/apacheds-tools.jar</destinationPath>
<dependency>true</dependency>
<installationBundleId>Binaries</installationBundleId>
+ </packagedFile>
+ <packagedFile>
+ <source>target/classes/META-INF/NOTICE</source>
+ <destinationPath>NOTICE</destinationPath>
+ <executable>false</executable>
+ <filtered>true</filtered>
</packagedFile>
</packagedFiles>
<!--
Modified: directory/apacheds/trunk/server-installers/src/main/installers/apacheds-default.conf
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-installers/src/main/installers/apacheds-default.conf?rev=569477&r1=569476&r2=569477&view=diff
==============================================================================
--- directory/apacheds/trunk/server-installers/src/main/installers/apacheds-default.conf (original)
+++ directory/apacheds/trunk/server-installers/src/main/installers/apacheds-default.conf Fri Aug 24 11:46:32 2007
@@ -17,3 +17,5 @@
# Maximum Java Heap Size (in MB)
# wrapper.java.maxmemory=384
+
+# apacheds.instance.start=auto
\ No newline at end of file
Modified: directory/apacheds/trunk/server-installers/src/main/installers/apacheds-fhs.conf
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-installers/src/main/installers/apacheds-fhs.conf?rev=569477&r1=569476&r2=569477&view=diff
==============================================================================
--- directory/apacheds/trunk/server-installers/src/main/installers/apacheds-fhs.conf (original)
+++ directory/apacheds/trunk/server-installers/src/main/installers/apacheds-fhs.conf Fri Aug 24 11:46:32 2007
@@ -21,7 +21,9 @@
wrapper.java.classpath.1=../lib/bootstrapper.jar
wrapper.java.classpath.2=../lib/wrapper.jar
-wrapper.java.classpath.3=../lib/logger.jar
+wrapper.java.classpath.3=../lib/slf4j-api-1.4.3.jar
+wrapper.java.classpath.4=../lib/slf4j-log4j12-1.4.3.jar
+wrapper.java.classpath.5=../lib/log4j-1.2.14.jar
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path.1=../lib
Modified: directory/apacheds/trunk/server-installers/src/main/installers/apacheds-rpm.spec
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-installers/src/main/installers/apacheds-rpm.spec?rev=569477&r1=569476&r2=569477&view=diff
==============================================================================
--- directory/apacheds/trunk/server-installers/src/main/installers/apacheds-rpm.spec (original)
+++ directory/apacheds/trunk/server-installers/src/main/installers/apacheds-rpm.spec Fri Aug 24 11:46:32 2007
@@ -46,7 +46,7 @@
install -m 644 ${image.basedir}/lib/wrapper.jar $RPM_BUILD_ROOT%{adshome}/lib/wrapper.jar
install -m 644 ${image.basedir}/lib/bootstrapper.jar $RPM_BUILD_ROOT%{adshome}/lib/bootstrapper.jar
install -m 644 ${image.basedir}/lib/libwrapper.so $RPM_BUILD_ROOT%{adshome}/lib/libwrapper.so
-install -m 644 ${image.basedir}/lib/logger.jar $RPM_BUILD_ROOT%{adshome}/lib/logger.jar
+#install -m 644 ${image.basedir}/lib/logger.jar $RPM_BUILD_ROOT%{adshome}/lib/logger.jar
install -m 644 ${image.basedir}/bin/apacheds-tools.jar $RPM_BUILD_ROOT%{adshome}/bin/apacheds-tools.jar
install -m 755 ${image.basedir}/bin/apacheds-tools.sh $RPM_BUILD_ROOT%{adshome}/bin/apacheds-tools.sh
install -m 600 ${image.basedir}/conf/server.xml $RPM_BUILD_ROOT%{adsdata}/default/conf/server.xml
@@ -96,7 +96,7 @@
%{adshome}/lib/bootstrapper.jar
%{adshome}/bin/apacheds-tools.jar
%{adshome}/bin/apacheds-tools.sh
-%{adshome}/lib/logger.jar
+#%{adshome}/lib/logger.jar
%config %{adsdata}/default/conf/log4j.properties
%config %{adsdata}/default/conf/apacheds.conf
%config %{adsdata}/default/conf/server.xml
Modified: directory/apacheds/trunk/server-installers/src/main/installers/apacheds-server-win.nsi
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-installers/src/main/installers/apacheds-server-win.nsi?rev=569477&r1=569476&r2=569477&view=diff
==============================================================================
--- directory/apacheds/trunk/server-installers/src/main/installers/apacheds-server-win.nsi (original)
+++ directory/apacheds/trunk/server-installers/src/main/installers/apacheds-server-win.nsi Fri Aug 24 11:46:32 2007
@@ -53,7 +53,7 @@
; License page
!insertmacro MUI_PAGE_WELCOME
- !insertmacro MUI_PAGE_LICENSE "../../src/main/resources/META-INF/LICENSE.txt"
+ !insertmacro MUI_PAGE_LICENSE "win32/LICENSE"
; This page checks for JRE. It displays a dialog based on JRE.ini if it needs to install JRE
; Otherwise you won't see it.
Modified: directory/apacheds/trunk/server-installers/src/main/installers/apacheds-suite-win.nsi
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-installers/src/main/installers/apacheds-suite-win.nsi?rev=569477&r1=569476&r2=569477&view=diff
==============================================================================
--- directory/apacheds/trunk/server-installers/src/main/installers/apacheds-suite-win.nsi (original)
+++ directory/apacheds/trunk/server-installers/src/main/installers/apacheds-suite-win.nsi Fri Aug 24 11:46:32 2007
@@ -55,7 +55,7 @@
; License page
!insertmacro MUI_PAGE_WELCOME
- !insertmacro MUI_PAGE_LICENSE "../../src/main/resources/META-INF/LICENSE.txt"
+ !insertmacro MUI_PAGE_LICENSE "win32/LICENSE"
; This page checks for JRE. It displays a dialog based on JRE.ini if it needs to install JRE
; Otherwise you won't see it.
Modified: directory/apacheds/trunk/server-installers/src/main/installers/apacheds.conf
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-installers/src/main/installers/apacheds.conf?rev=569477&r1=569476&r2=569477&view=diff
==============================================================================
--- directory/apacheds/trunk/server-installers/src/main/installers/apacheds.conf (original)
+++ directory/apacheds/trunk/server-installers/src/main/installers/apacheds.conf Fri Aug 24 11:46:32 2007
@@ -14,7 +14,9 @@
wrapper.java.classpath.1=../lib/bootstrapper.jar
wrapper.java.classpath.2=../lib/wrapper.jar
-wrapper.java.classpath.3=../lib/logger.jar
+wrapper.java.classpath.3=../lib/slf4j-api-1.4.3.jar
+wrapper.java.classpath.4=../lib/slf4j-log4j12-1.4.3.jar
+wrapper.java.classpath.5=../lib/log4j-1.2.14.jar
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path.1=../lib
Modified: directory/apacheds/trunk/server-main/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-main/pom.xml?rev=569477&r1=569476&r2=569477&view=diff
==============================================================================
--- directory/apacheds/trunk/server-main/pom.xml (original)
+++ directory/apacheds/trunk/server-main/pom.xml Fri Aug 24 11:46:32 2007
@@ -42,21 +42,38 @@
</dependency>
<dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-bootstrap-partition</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.directory.daemon</groupId>
<artifactId>daemon-bootstrappers</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>jcl104-over-slf4j</artifactId>
+ <scope>runtime</scope>
</dependency>
-<!--
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>runtime</scope>
</dependency>
--->
<dependency>
<groupId>org.springframework</groupId>
Modified: directory/apacheds/trunk/server-main/src/main/assembly/apacheds-main.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-main/src/main/assembly/apacheds-main.xml?rev=569477&r1=569476&r2=569477&view=diff
==============================================================================
--- directory/apacheds/trunk/server-main/src/main/assembly/apacheds-main.xml (original)
+++ directory/apacheds/trunk/server-main/src/main/assembly/apacheds-main.xml Fri Aug 24 11:46:32 2007
@@ -18,7 +18,6 @@
<excludes>
<exclude>avalon-framework:avalon-framework</exclude>
<exclude>logkit:logkit</exclude>
- <exclude>log4j:log4j</exclude>
<exclude>aopalliance:aopalliance</exclude>
<exclude>jasperreports:jasperreports</exclude>
<exclude>freemarker:freemarker</exclude>
Modified: directory/daemon/trunk/bootstrappers/src/main/java/org/apache/directory/daemon/InstallationLayout.java
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/bootstrappers/src/main/java/org/apache/directory/daemon/InstallationLayout.java?rev=569477&r1=569476&r2=569477&view=diff
==============================================================================
--- directory/daemon/trunk/bootstrappers/src/main/java/org/apache/directory/daemon/InstallationLayout.java (original)
+++ directory/daemon/trunk/bootstrappers/src/main/java/org/apache/directory/daemon/InstallationLayout.java Fri Aug 24 11:46:32 2007
@@ -224,7 +224,7 @@
public File getLicenseFile()
{
- return getLicenseFile( "LICENSE.txt" );
+ return getLicenseFile( "LICENSE" );
}
@@ -236,7 +236,7 @@
public File getReadmeFile()
{
- return getReadmeFile( "README.txt" );
+ return getReadmeFile( "README" );
}
Modified: directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java?rev=569477&r1=569476&r2=569477&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java (original)
+++ directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java Fri Aug 24 11:46:32 2007
@@ -122,12 +122,12 @@
try
{
MojoHelperUtils.copyAsciiFile( mymojo, filterProperties,
- getClass().getResourceAsStream( "LICENSE.txt" ), licenseTarget, false );
+ getClass().getResourceAsStream( "LICENSE" ), licenseTarget, false );
}
catch ( IOException e )
{
throw new MojoFailureException( "Failed to bundled ASL license file "
- + getClass().getResource( "LICENSE.txt" ) + " into position " + licenseTarget );
+ + getClass().getResource( "LICENSE" ) + " into position " + licenseTarget );
}
}
@@ -170,6 +170,7 @@
}
// copy over the REQUIRED logger artifact
+/*
try
{
FileUtils.copyFile( mymojo.getLogger().getFile(), layout.getLogger() );
@@ -179,6 +180,7 @@
throw new MojoFailureException( "Failed to copy logger.jar " + mymojo.getLogger().getFile()
+ " into position " + layout.getLogger() );
}
+*/
// copy over the REQUIRED daemon.jar file
try
Modified: directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java?rev=569477&r1=569476&r2=569477&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java (original)
+++ directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java Fri Aug 24 11:46:32 2007
@@ -62,7 +62,7 @@
{
static final String BOOTSTRAPPER_ARTIFACT_ID = "daemon-bootstrappers";
static final String BOOTSTRAPPER_GROUP_ID = "org.apache.directory.daemon";
- static final String LOGGER_ARTIFACT_ID = "nlog4j";
+ static final String LOGGER_ARTIFACT_ID = "slf4j-api";
static final String LOGGER_GROUP_ID = "org.slf4j";
static final String DAEMON_ARTIFACT_ID = "commons-daemon";
static final String DAEMON_GROUP_ID = "commons-daemon";
@@ -382,12 +382,12 @@
if ( application.getReadme() == null )
{
- application.setReadme( new File( "README.txt" ) );
+ application.setReadme( new File( "README" ) );
}
if ( application.getLicense() == null )
{
- application.setLicense( new File( "LICENSE.txt" ) );
+ application.setLicense( new File( "LICENSE" ) );
}
for ( int ii = 0; ii < allTargets.size(); ii++ )