Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 25923 invoked from network); 17 Apr 2008 03:00:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 17 Apr 2008 03:00:31 -0000 Received: (qmail 40776 invoked by uid 500); 17 Apr 2008 03:00:31 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 40717 invoked by uid 500); 17 Apr 2008 03:00:31 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 40649 invoked by uid 99); 17 Apr 2008 03:00:31 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Apr 2008 20:00:30 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Apr 2008 02:59:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 22E741A9832; Wed, 16 Apr 2008 19:59:52 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r648935 - in /directory/sandbox/akarasulu/bigbang/installers: ./ apacheds-noarch/ apacheds-noarch/src/main/appended-resources/ apacheds-noarch/src/main/appended-resources/META-INF/ apacheds-noarch/src/main/assembly/ apacheds-noarch/src/main... Date: Thu, 17 Apr 2008 02:59:50 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080417025952.22E741A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: akarasulu Date: Wed Apr 16 19:59:38 2008 New Revision: 648935 URL: http://svn.apache.org/viewvc?rev=648935&view=rev Log: [MERGE] bringing changes from installers bigbang branch Added: directory/sandbox/akarasulu/bigbang/installers/README.txt - copied unchanged from r648930, directory/installers/branches/bigbang/README.txt directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/src/main/appended-resources/ - copied from r648930, directory/installers/branches/bigbang/apacheds-noarch/src/main/appended-resources/ directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/src/main/appended-resources/META-INF/ - copied from r648930, directory/installers/branches/bigbang/apacheds-noarch/src/main/appended-resources/META-INF/ directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/src/main/appended-resources/META-INF/LICENSE - copied unchanged from r648930, directory/installers/branches/bigbang/apacheds-noarch/src/main/appended-resources/META-INF/LICENSE directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/src/main/appended-resources/META-INF/NOTICE - copied unchanged from r648930, directory/installers/branches/bigbang/apacheds-noarch/src/main/appended-resources/META-INF/NOTICE directory/sandbox/akarasulu/bigbang/installers/apacheds/src/main/resources/META-INF/LICENSE - copied unchanged from r648930, directory/installers/branches/bigbang/apacheds/src/main/resources/META-INF/LICENSE directory/sandbox/akarasulu/bigbang/installers/apacheds/src/main/resources/META-INF/NOTICE - copied unchanged from r648930, directory/installers/branches/bigbang/apacheds/src/main/resources/META-INF/NOTICE Removed: directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/src/main/assembly/ directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/src/main/resources/ Modified: directory/sandbox/akarasulu/bigbang/installers/LAST_BIG_BANG_MERGE directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/apacheds.bat directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/apacheds.sh directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/log4j.properties directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/pom.xml directory/sandbox/akarasulu/bigbang/installers/apacheds/README directory/sandbox/akarasulu/bigbang/installers/apacheds/pom.xml directory/sandbox/akarasulu/bigbang/installers/pom.xml Modified: directory/sandbox/akarasulu/bigbang/installers/LAST_BIG_BANG_MERGE URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/installers/LAST_BIG_BANG_MERGE?rev=648935&r1=648934&r2=648935&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/installers/LAST_BIG_BANG_MERGE (original) +++ directory/sandbox/akarasulu/bigbang/installers/LAST_BIG_BANG_MERGE Wed Apr 16 19:59:38 2008 @@ -22,3 +22,8 @@ ---------------------------- svn merge -r 638217:642497 https://svn.apache.org/repos/asf/directory/installers/branches/bigbang . + +Wed Apr 16 23:02:26 EDT 2008 +---------------------------- +svn merge -r 642497:648930 https://svn.apache.org/repos/asf/directory/installers/branches/bigbang . + Modified: directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/apacheds.bat URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/apacheds.bat?rev=648935&r1=648934&r2=648935&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/apacheds.bat (original) +++ directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/apacheds.bat Wed Apr 16 19:59:38 2008 @@ -9,8 +9,8 @@ :MVN echo uber jar not found need to build it - call mvn clean assembly:assembly + call mvn clean install GOTO :JAVA :JAVA - java -Dlog4j.configuration="file:///%cd%/log4j.properties" -jar target/apacheds-noarch-installer-1.5.2-SNAPSHOT-app.jar server.xml + java -Dlog4j.configuration="file:///%cd%/log4j.properties" -jar target/apacheds-noarch-installer-1.5.2-SNAPSHOT-app.jar target/plan/server.xml Modified: directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/apacheds.sh URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/apacheds.sh?rev=648935&r1=648934&r2=648935&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/apacheds.sh (original) +++ directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/apacheds.sh Wed Apr 16 19:59:38 2008 @@ -3,7 +3,7 @@ echo uber jar exists else echo uber jar not found need to build it - mvn clean assembly:assembly + mvn clean install fi -java -Dlog4j.debug -Dlog4j.configuration=file:./log4j.properties -jar target/apacheds-noarch-installer-1.5.2-SNAPSHOT-app.jar server.xml +java -Dlog4j.debug -Dlog4j.configuration=file:./log4j.properties -jar target/apacheds-noarch-installer-1.5.2-SNAPSHOT-app.jar target/plan/server.xml Modified: directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/log4j.properties URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/log4j.properties?rev=648935&r1=648934&r2=648935&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/log4j.properties (original) +++ directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/log4j.properties Wed Apr 16 19:59:38 2008 @@ -37,8 +37,5 @@ log4j.logger.org.apache.directory.shared.codec=WARN log4j.logger.org.apache.directory.shared.asn1=WARN -# Remove me when the unbind problem has gone away: -# https://issues.apache.org/jira/browse/DIRSERVER-1047 -log4j.logger.org.apache.directory.server.ldap.support.UnbindHandler=OFF log4j.logger.org.apache.directory.server.schema.registries=WARN Modified: directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/pom.xml URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/pom.xml?rev=648935&r1=648934&r2=648935&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/pom.xml (original) +++ directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/pom.xml Wed Apr 16 19:59:38 2008 @@ -24,121 +24,95 @@ org.apache.directory.installers installers-parent - 1.5.2-SNAPSHOT + 1.5.3-SNAPSHOT apacheds-noarch-installer ApacheDS Architecture Independent Installer - jar - - - - org.apache.directory.server - apacheds-xbean-spring - - - - org.apache.directory.server - apacheds-server-jndi - - - - org.apache.directory.server - apacheds-protocol-ntp - - - - org.apache.directory.server - apacheds-protocol-kerberos - - - - org.apache.directory.server - apacheds-protocol-changepw - - - - org.apache.directory.server - apacheds-protocol-dns - - - - org.apache.directory.server - apacheds-server-xml - - - - org.apache.directory.server - apacheds-bootstrap-partition - - - - org.apache.directory.daemon - daemon-bootstrappers - - - - org.slf4j - slf4j-api - - - - org.slf4j - jcl104-over-slf4j - runtime - - - - org.slf4j - slf4j-log4j12 - runtime - - - - log4j - log4j - runtime - - - - org.springframework - spring-core - - - - org.springframework - spring-beans - - - - org.springframework - spring-context - - - - org.apache.xbean - xbean-spring - - + jar + + + + org.apache.maven.plugins + maven-shade-plugin + 1.0.1 + + + - maven-clean-plugin - - - - . - - *.log - server.xml - META-INF - example.com - - false - - - + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + true + app + + + + bouncycastle:bcprov-jdk15 + + + + + + + + org.apache.maven.plugins maven-jar-plugin @@ -153,20 +127,6 @@ org.apache.maven.plugins - maven-assembly-plugin - - - - org.apache.directory.server.UberjarMain - - - src/main/assembly/apacheds-main.xml - app - false - - - - org.apache.maven.plugins maven-dependency-plugin @@ -180,10 +140,10 @@ org.apache.directory.server apacheds-server-xml - 1.5.2-SNAPSHOT + 1.5.2 - ${basedir} + ${basedir}/target/plan true true Modified: directory/sandbox/akarasulu/bigbang/installers/apacheds/README URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/installers/apacheds/README?rev=648935&r1=648934&r2=648935&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/installers/apacheds/README (original) +++ directory/sandbox/akarasulu/bigbang/installers/apacheds/README Wed Apr 16 19:59:38 2008 @@ -89,3 +89,27 @@ Thanks and enjoy, Apache Directory Team +============================================================================ +This distribution includes cryptographic software. The country in + which you currently reside may have restrictions on the import, + possession, use, and/or re-export to another country, of + encryption software. BEFORE using any encryption software, please + check your country's laws, regulations and policies concerning the + import, possession, or use, and re-export of encryption software, to + see if this is permitted. See for more + information. + + The U.S. Government Department of Commerce, Bureau of Industry and + Security (BIS), has classified this software as Export Commodity + Control Number (ECCN) 5D002.C.1, which includes information security + software using or performing cryptographic functions with asymmetric + algorithms. The form and manner of this Apache Software Foundation + distribution makes it eligible for export under the License Exception + ENC Technology Software Unrestricted (TSU) exception (see the BIS + Export Administration Regulations, Section 740.13) for both object + code and source code. + + The following provides more details on the included cryptographic + software: + + http://www.bouncycastle.org/ Modified: directory/sandbox/akarasulu/bigbang/installers/apacheds/pom.xml URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/installers/apacheds/pom.xml?rev=648935&r1=648934&r2=648935&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/installers/apacheds/pom.xml (original) +++ directory/sandbox/akarasulu/bigbang/installers/apacheds/pom.xml Wed Apr 16 19:59:38 2008 @@ -1,30 +1,9 @@ - - - - 4.0.0 org.apache.directory.installers installers-parent - 1.5.2-SNAPSHOT + 1.5.3-SNAPSHOT apacheds-installers ApacheDS Installers @@ -35,8 +14,9 @@ - 1.1.0-SNAPSHOT - 1.5.2-SNAPSHOT + 1.1.0 + 1.5.3-SNAPSHOT + 1.1.0 @@ -46,76 +26,13 @@ ${pom.version} - org.apache.directory.server - mitosis - - - org.apache.directory.server - apacheds-server-jndi - - - org.apache.directory.server - apacheds-server-xml - - - org.apache.directory.daemon - daemon-bootstrappers - provided - - - org.apache.directory.server - apacheds-server-tools - - - org.apache.directory.server - apacheds-schema-extras - - - org.apache.directory.server - apacheds-bootstrap-partition - - - org.slf4j - slf4j-api - - - org.slf4j - jcl104-over-slf4j - - - org.slf4j - slf4j-log4j12 - runtime - - tanukisoft wrapper runtime - log4j - log4j - runtime - - - commons-lang - commons-lang - - - commons-cli - commons-cli - - - org.springframework - spring-core - - - org.springframework - spring-beans - - - org.springframework - spring-context + org.apache.directory.server + apacheds-server-tools @@ -131,11 +48,9 @@ process-resources - - - + + + @@ -151,7 +66,7 @@ org.apache.directory.daemon daemon-plugin - 1.1.2-SNAPSHOT + 1.1.4-SNAPSHOT suite @@ -223,7 +138,7 @@ suite-win32 /usr/local/nsis/makensis src/main/installers/apacheds-suite-win.nsi - apacheds-suite-${studio-version}-setup + apache-directory-suite-${suite-version}-setup Windows XP windows 5.1 @@ -255,6 +170,7 @@ freemarker:freemarker asm:asm-util jasperreports:jasperreports + bouncycastle:bcprov-jdk15 @@ -272,7 +188,7 @@ deploy-installer-suite-win32 deploy - target/images/apacheds-suite-${studio-version}-setup.exe + target/images/apache-directory-suite-${suite-version}-setup.exe ${pom.distributionManagement.snapshotRepository.url} ApacheDirectoryInstaller ${pom.groupId} @@ -300,11 +216,9 @@ process-resources - - - + + + @@ -320,7 +234,7 @@ org.apache.directory.daemon daemon-plugin - 1.1.2-SNAPSHOT + 1.1.4-SNAPSHOT studio @@ -374,9 +288,9 @@ studio-win32 - /usr/local/nsis/makensis + /usr/local/share/nsis/makensis src/main/installers/apacheds-studio-win.nsi - apacheds-studio-${studio-version}-setup + apache-directory-studio-${studio-version}-setup Windows XP windows 5.1 @@ -407,6 +321,7 @@ freemarker:freemarker asm:asm-util jasperreports:jasperreports + bouncycastle:bcprov-jdk15 @@ -424,7 +339,7 @@ deploy-installer-studio-win32 deploy - target/images/apacheds-studio-${studio-version}-setup.exe + target/images/apache-directory-studio-${studio-version}-setup.exe ${pom.distributionManagement.snapshotRepository.url} ApacheDirectoryInstaller ${pom.groupId} @@ -449,7 +364,7 @@ org.apache.directory.daemon daemon-plugin - 1.1.2-SNAPSHOT + 1.1.4-SNAPSHOT @@ -475,12 +390,13 @@ freemarker:freemarker asm:asm-util jasperreports:jasperreports + bouncycastle:bcprov-jdk15 apacheds src/main/resources/feather.ico - 1.5.2-SNAPSHOT + 1.5.3-SNAPSHOT 2007 1.5 http://directory.apache.org @@ -557,7 +473,7 @@ apacheds-i386-rpm src/main/installers/apacheds-rpm.spec target/rpmbuild - apacheds-server-1.5.2-SNAPSHOT-i386.rpm + apacheds-${server-version}-i386.rpm Linux unix i386 @@ -603,7 +519,7 @@ apacheds-x86_64-rpm src/main/installers/apacheds-rpm.spec target/rpmbuild - apacheds-server-1.5.2-SNAPSHOT-x86_64.rpm + apacheds-${server-version}-x86_64.rpm Linux unix x86_64 @@ -645,7 +561,7 @@ server-win32 /usr/local/nsis/makensis src/main/installers/apacheds-server-win.nsi - apacheds-server-1.5.2-SNAPSHOT-setup + apacheds-${server-version}-setup Windows XP windows 5.1 @@ -653,6 +569,59 @@ tanuki + + + + + apacheds-macosx + apacheds-${server-version}.dmg + Mac OS X + macosx + x86 + tanuki + + + + + + + apacheds-debian-i386 + apacheds-${server-version}-i386.deb + linux + linux + i386 + tanuki + + + apacheds-debian-amd64 + apacheds-${server-version}-amd64.deb + linux + linux + amd64 + tanuki + + + + + + + apacheds-bin-installer-i386 + apacheds-${server-version}-i386.bin + Linux + linux + i386 + tanuki + + + apacheds-bin-installer-x86_64 + apacheds-${server-version}-x86_64.bin + Linux + linux + x86_64 + tanuki + + + @@ -669,7 +638,7 @@ deploy-installer-server-win32 deploy - target/images/apacheds-server-${server-version}-setup.exe + target/images/apacheds-${server-version}-setup.exe ${pom.distributionManagement.snapshotRepository.url} ApacheDirectoryInstaller ${pom.groupId} @@ -737,7 +706,7 @@ org.apache.directory.server apacheds-server-xml - 1.5.2-SNAPSHOT + 1.5.3-SNAPSHOT ${basedir}/src/main/installers @@ -750,4 +719,3 @@ - Modified: directory/sandbox/akarasulu/bigbang/installers/pom.xml URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/installers/pom.xml?rev=648935&r1=648934&r2=648935&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/installers/pom.xml (original) +++ directory/sandbox/akarasulu/bigbang/installers/pom.xml Wed Apr 16 19:59:38 2008 @@ -25,15 +25,20 @@ org.apache.directory.project project - 10-SNAPSHOT + 10 org.apache.directory.installers installers-parent - 1.5.2-SNAPSHOT + 1.5.3-SNAPSHOT ApacheDS Installers pom + + Apache Directory Server + + + http://directory.apache.org/apacheds/1.5 @@ -41,97 +46,97 @@ org.apache.directory.server mitosis - 1.5.2-SNAPSHOT + 1.5.3-SNAPSHOT org.apache.directory.server apacheds-xbean-spring - 1.5.2-SNAPSHOT + 1.5.3-SNAPSHOT org.apache.directory.server apacheds-server-xml - 1.5.2-SNAPSHOT + 1.5.3-SNAPSHOT org.apache.directory.daemon daemon-bootstrappers - 1.1.2-SNAPSHOT + 1.1.4-SNAPSHOT org.apache.directory.server apacheds-server-tools - 1.5.2-SNAPSHOT + 1.5.3-SNAPSHOT org.apache.directory.server apacheds-server-jndi - 1.5.2-SNAPSHOT + 1.5.3-SNAPSHOT org.apache.directory.server apacheds-protocol-ntp - 1.5.2-SNAPSHOT + 1.5.3-SNAPSHOT org.apache.directory.server apacheds-protocol-kerberos - 1.5.2-SNAPSHOT + 1.5.3-SNAPSHOT org.apache.directory.server apacheds-protocol-changepw - 1.5.2-SNAPSHOT + 1.5.3-SNAPSHOT org.apache.directory.server apacheds-protocol-dns - 1.5.2-SNAPSHOT + 1.5.3-SNAPSHOT org.apache.directory.server apacheds-schema-extras - 1.5.2-SNAPSHOT + 1.5.3-SNAPSHOT org.apache.directory.server apacheds-bootstrap-partition - 1.5.2-SNAPSHOT + 1.5.3-SNAPSHOT org.apache.directory.shared shared-asn1-codec - 0.9.9-SNAPSHOT + 0.9.11-SNAPSHOT org.apache.directory.shared shared-ldap - 0.9.9-SNAPSHOT + 0.9.11-SNAPSHOT org.apache.directory.shared shared-ldap-constants - 0.9.9-SNAPSHOT + 0.9.11-SNAPSHOT org.apache.directory.daemon daemon-bootstrappers - 1.1.2-SNAPSHOT + 1.1.4-SNAPSHOT @@ -264,18 +269,40 @@ org.springframework spring-core 2.0.6 + + + commons-logging + commons-logging + + org.springframework spring-beans 2.0.6 + + + commons-logging + commons-logging + + org.springframework spring-context 2.0.6 + + + commons-logging + commons-logging + + + aopalliance + aopalliance + + @@ -317,7 +344,29 @@ org.apache.xbean xbean-spring - 3.2 + 3.3 + + + commons-logging + commons-logging + + + org.springframework + spring-beans + + + org.springframework + spring-context + + + org.springframework + spring-web + + + org.springframework + spring-jmx + + @@ -343,43 +392,94 @@ - org.apache.directory.shared - shared-ldap + org.apache.directory.server + apacheds-xbean-spring + + + + org.apache.directory.server + apacheds-server-jndi + + + + org.apache.directory.server + apacheds-protocol-ntp + + + + org.apache.directory.server + apacheds-protocol-kerberos + + + + org.apache.directory.server + apacheds-protocol-changepw + + + + org.apache.directory.server + apacheds-protocol-dns + + + + org.apache.directory.server + apacheds-server-xml + + + + org.apache.directory.server + apacheds-bootstrap-partition + + + + org.apache.directory.daemon + daemon-bootstrappers - org.slf4j slf4j-api - org.slf4j jcl104-over-slf4j - test + runtime - org.slf4j slf4j-log4j12 - test + runtime log4j log4j - test + runtime - junit - junit - test + org.springframework + spring-core + + + + org.springframework + spring-beans + + + + org.springframework + spring-context - + + org.apache.xbean + xbean-spring + + + apacheds apacheds-noarch @@ -415,15 +515,6 @@ - - - org.apache.maven.plugins - maven-release-plugin - - https://svn.apache.org/repos/asf/directory/apacheds/releases - - -