directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
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 GMT
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 @@
   <parent>
     <groupId>org.apache.directory.installers</groupId>
     <artifactId>installers-parent</artifactId>
-    <version>1.5.2-SNAPSHOT</version>
+    <version>1.5.3-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-noarch-installer</artifactId>
   <name>ApacheDS Architecture Independent Installer</name>
-  <packaging>jar</packaging>  
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-xbean-spring</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-server-jndi</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-protocol-ntp</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-protocol-kerberos</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-protocol-changepw</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-protocol-dns</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-server-xml</artifactId>
-    </dependency>  
-
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-bootstrap-partition</artifactId>
-    </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>
-      <artifactId>spring-core</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-beans</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.xbean</groupId>
-      <artifactId>xbean-spring</artifactId>
-    </dependency>
-  </dependencies>
+  <packaging>jar</packaging>
 
   <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-shade-plugin</artifactId>
+          <version>1.0.1</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
     <plugins>
       <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <configuration>
-          <filesets>
-            <fileset>
-              <directory>.</directory>
-              <includes>
-                <include>*.log</include>
-                <include>server.xml</include>
-                <include>META-INF</include>
-                <include>example.com</include>
-              </includes>
-              <followSymlinks>false</followSymlinks>
-            </fileset>
-          </filesets>
-        </configuration>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <shadedArtifactAttached>true</shadedArtifactAttached>
+              <shadedClassifierName>app</shadedClassifierName>
+                <artifactSet>
+                  <excludes>
+                      <!-- this should not be needed and is not needed when building just the installers
+                      it does seem to be needed when building *-with-dependencies -->
+                    <exclude>bouncycastle:bcprov-jdk15</exclude>
+                  </excludes>
+                </artifactSet>
+                <!-- Uncomment the filters below and remove the dependency on shared-bouncycastle-reduced
+                if you want to try to shrink the bc repackaging further. I (djencks) got stuck -->
+<!--
+              <filters>
+                <filter>
+                  <artifact>bouncycastle:bcprov-jdk15</artifact>
+                  <includes>
+                    <include>org/bouncycastle/asn1/**</include>
+                    <include>org/bouncycastle/jce/provider/BouncyCastleProvider.class</include>
+                    <include>org/bouncycastle/x509/X509V1CertificateGenerator.class</include>
+                    <include>org/bouncycastle/jce/interfaces/ConfigurableProvider.class</include>
+                    <include>org/bouncycastle/jce/provider/symmetric/AESMappings.class</include>
+                    <include>org/bouncycastle/asn1/nist/NISTObjectIdentifiers.class</include>
+                    <include>org/bouncycastle/asn1/DERObjectIdentifier.class</include>
+                    <include>org/bouncycastle/asn1/ASN1Object.class</include>
+                    <include>org/bouncycastle/asn1/DERObject.class</include>
+                    <include>org/bouncycastle/asn1/DERTags.class</include>
+                    <include>org/bouncycastle/asn1/ASN1Encodable.class</include>
+                    <include>org/bouncycastle/asn1/DEREncodable.class</include>
+                    <include>org/bouncycastle/jce/provider/symmetric/CamelliaMappings.class</include>
+                    <include>org/bouncycastle/asn1/ntt/NTTObjectIdentifiers.class</include>
+                    <include>org/bouncycastle/jce/provider/symmetric/CAST5Mappings.class</include>
+                    <include>org/bouncycastle/jce/provider/symmetric/SEEDMappings.class</include>
+                    <include>org/bouncycastle/asn1/kisa/KISAObjectIdentifiers.class</include>
+                    <include>org/bouncycastle/asn1/pkcs/PKCSObjectIdentifiers.class</include>
+                    <include>org.bouncycastle.jce.provider.JDKX509CertificateFactory.class</include>
+                    <include>org.bouncycastle.jce.provider.JDKX509CertificateFactory.class</include>
+                  </includes>
+                  <excludes>
+                    <exclude>META-INF/BCKEY.SF</exclude>
+                    <exclude>META-INF/BCKEY.DSA</exclude>
+                    <exclude>org/bouncycastle/crypto/engines/IDEAEngine.class</exclude>
+                    <exclude>org/bouncycastle/asn1/misc/IDEACBCPar.class</exclude>
+                    <exclude>org/bouncycastle/jce/provider/JDKAlgorithmParameterGenerator$IDEA.class</exclude>
+                    <exclude>org/bouncycastle/jce/provider/JCEKeyGenerator$IDEA.class</exclude>
+                    <exclude>org/bouncycastle/jce/provider/JCEBlockCipher$IDEA.class</exclude>
+                    <exclude>org/bouncycastle/jce/provider/JCESecretKeyFactory$PBEWithSHAAndIDEA.class</exclude>
+                    <exclude>org/bouncycastle/jce/provider/JCEBlockCipher$PBEWithSHAAndIDEA.class</exclude>
+                    <exclude>org/bouncycastle/jce/provider/JDKAlgorithmParameters$IDEAAlgorithmParameters.class</exclude>
+                    <exclude>org/bouncycastle/jce/provider/JCEStreamCipher$IDEA_OFB8.class</exclude>
+                    <exclude>org/bouncycastle/jce/provider/JCEMac$IDEACFB8.class</exclude>
+                    <exclude>org/bouncycastle/jce/provider/JCEBlockCipher$IDEACBC.class</exclude>
+                    <exclude>org/bouncycastle/jce/provider/JCEMac$IDEA.class</exclude>
+                    <exclude>org/bouncycastle/jce/provider/JCEStreamCipher$IDEA_CFB8.class</exclude>
+                  </excludes>
+                </filter>
+              </filters>
+-->
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
@@ -153,20 +127,6 @@
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifest>
-              <mainClass>org.apache.directory.server.UberjarMain</mainClass>
-            </manifest> 
-          </archive>
-          <descriptor>src/main/assembly/apacheds-main.xml</descriptor>
-          <classifier>app</classifier>
-          <appendAssemblyId>false</appendAssemblyId>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
           <execution>
@@ -180,10 +140,10 @@
                 <artifactItem>
                   <groupId>org.apache.directory.server</groupId>
                   <artifactId>apacheds-server-xml</artifactId>
-                  <version>1.5.2-SNAPSHOT</version>
+                  <version>1.5.2</version>
                 </artifactItem>
               </artifactItems>
-              <outputDirectory>${basedir}</outputDirectory>
+              <outputDirectory>${basedir}/target/plan</outputDirectory>
               <overWriteReleases>true</overWriteReleases>
               <overWriteSnapshots>true</overWriteSnapshots>
             </configuration>

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 <http://www.wassenaar.org/> 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  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.
--->
-
 <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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.installers</groupId>
     <artifactId>installers-parent</artifactId>
-    <version>1.5.2-SNAPSHOT</version>
+    <version>1.5.3-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-installers</artifactId>
   <name>ApacheDS Installers</name>
@@ -35,8 +14,9 @@
   </description>
 
   <properties>
-    <studio-version>1.1.0-SNAPSHOT</studio-version>
-    <server-version>1.5.2-SNAPSHOT</server-version>
+    <studio-version>1.1.0</studio-version>
+    <server-version>1.5.3-SNAPSHOT</server-version>
+    <suite-version>1.1.0</suite-version>
   </properties>
 
   <dependencies>
@@ -46,76 +26,13 @@
       <version>${pom.version}</version>
     </dependency>  
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>mitosis</artifactId>
-    </dependency>  
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-server-jndi</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-server-xml</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.daemon</groupId>
-      <artifactId>daemon-bootstrappers</artifactId>
-      <scope>provided</scope>
-    </dependency>  
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-server-tools</artifactId>
-    </dependency>  
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-schema-extras</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-bootstrap-partition</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jcl104-over-slf4j</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
       <groupId>tanukisoft</groupId>
       <artifactId>wrapper</artifactId>
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-cli</groupId>
-      <artifactId>commons-cli</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-beans</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-server-tools</artifactId>
     </dependency>
   </dependencies>
 
@@ -131,11 +48,9 @@
                 <phase>process-resources</phase>
                 <configuration>
                   <tasks>
-                    <mkdir dir="target/images"/>
-                    <get src="http://vm094.oxylos.org/mirror-maven2/org/apache/directory/studio/ApacheDirectoryStudio/${studio-version}-win32/ApacheDirectoryStudio-${studio-version}-win32.zip"
-                         verbose="on" usetimestamp="true"
-                         dest="target/ApacheDirectoryStudio.zip" />
-                    <touch file="target/ApacheDirectoryStudio.zip"/>
+                    <mkdir dir="target/images" />
+                    <get src="http://vm094.oxylos.org/mirror-maven2/org/apache/directory/studio/ApacheDirectoryStudio/${studio-version}-win32/ApacheDirectoryStudio-${studio-version}-win32.zip" verbose="on" usetimestamp="true" dest="target/ApacheDirectoryStudio.zip" />
+                    <touch file="target/ApacheDirectoryStudio.zip" />
                     <unzip src="target/ApacheDirectoryStudio.zip" dest="target/images/suite-win32" overwrite="false" />
                     <move toDir="target/images/suite-win32/ApacheDirectoryStudio">
                       <fileset dir="target/images/suite-win32/ApacheDirectoryStudio-win32-${studio-version}" />
@@ -151,7 +66,7 @@
           <plugin>
             <groupId>org.apache.directory.daemon</groupId>
             <artifactId>daemon-plugin</artifactId>
-            <version>1.1.2-SNAPSHOT</version>
+            <version>1.1.4-SNAPSHOT</version>
             <configuration>
               <application>
                 <name>suite</name>
@@ -223,7 +138,7 @@
                   <id>suite-win32</id>
                   <nsisCompiler>/usr/local/nsis/makensis</nsisCompiler>
                   <nsisConfigurationFile>src/main/installers/apacheds-suite-win.nsi</nsisConfigurationFile>
-                  <finalName>apacheds-suite-${studio-version}-setup</finalName>
+                  <finalName>apache-directory-suite-${suite-version}-setup</finalName>
                   <osName>Windows XP</osName>
                   <osFamily>windows</osFamily>
                   <osVersion>5.1</osVersion>
@@ -255,6 +170,7 @@
                 <exclude>freemarker:freemarker</exclude>
                 <exclude>asm:asm-util</exclude>
                 <exclude>jasperreports:jasperreports</exclude>
+                <exclude>bouncycastle:bcprov-jdk15</exclude>
               </excludes>
             </configuration>
             <executions>
@@ -272,7 +188,7 @@
                 <id>deploy-installer-suite-win32</id>
                 <phase>deploy</phase>
                 <configuration>
-                  <file>target/images/apacheds-suite-${studio-version}-setup.exe</file>
+                  <file>target/images/apache-directory-suite-${suite-version}-setup.exe</file>
                   <url>${pom.distributionManagement.snapshotRepository.url}</url>
                   <artifactId>ApacheDirectoryInstaller</artifactId>
                   <groupId>${pom.groupId}</groupId>
@@ -300,11 +216,9 @@
                 <phase>process-resources</phase>
                 <configuration>
                   <tasks>
-                    <mkdir dir="target/images"/>
-                    <get src="http://vm094.oxylos.org/mirror-maven2/org/apache/directory/studio/ApacheDirectoryStudio/${studio-version}-win32/ApacheDirectoryStudio-${studio-version}-win32.zip"
-                         verbose="on" usetimestamp="true"
-                         dest="target/ApacheDirectoryStudio.zip" />
-                    <touch file="target/ApacheDirectoryStudio.zip"/>
+                    <mkdir dir="target/images" />
+                    <get src="http://vm094.oxylos.org/mirror-maven2/org/apache/directory/studio/ApacheDirectoryStudio/${studio-version}-win32/ApacheDirectoryStudio-${studio-version}-win32.zip" verbose="on" usetimestamp="true" dest="target/ApacheDirectoryStudio.zip" />
+                    <touch file="target/ApacheDirectoryStudio.zip" />
                     <unzip src="target/ApacheDirectoryStudio.zip" dest="target/images/studio-win32" overwrite="false" />
                     <move toDir="target/images/studio-win32/ApacheDirectoryStudio">
                       <fileset dir="target/images/studio-win32/ApacheDirectoryStudio-win32-${studio-version}" />
@@ -320,7 +234,7 @@
           <plugin>
             <groupId>org.apache.directory.daemon</groupId>
             <artifactId>daemon-plugin</artifactId>
-            <version>1.1.2-SNAPSHOT</version>
+            <version>1.1.4-SNAPSHOT</version>
             <configuration>
               <application>
                 <name>studio</name>
@@ -374,9 +288,9 @@
                   </packagedFiles>
 
                   <id>studio-win32</id>
-                  <nsisCompiler>/usr/local/nsis/makensis</nsisCompiler>
+                  <nsisCompiler>/usr/local/share/nsis/makensis</nsisCompiler>
                   <nsisConfigurationFile>src/main/installers/apacheds-studio-win.nsi</nsisConfigurationFile>
-                  <finalName>apacheds-studio-${studio-version}-setup</finalName>
+                  <finalName>apache-directory-studio-${studio-version}-setup</finalName>
                   <osName>Windows XP</osName>
                   <osFamily>windows</osFamily>
                   <osVersion>5.1</osVersion>
@@ -407,6 +321,7 @@
                 <exclude>freemarker:freemarker</exclude>
                 <exclude>asm:asm-util</exclude>
                 <exclude>jasperreports:jasperreports</exclude>
+                <exclude>bouncycastle:bcprov-jdk15</exclude>
               </excludes>
             </configuration>
             <executions>
@@ -424,7 +339,7 @@
                 <id>deploy-installer-studio-win32</id>
                 <phase>deploy</phase>
                 <configuration>
-                  <file>target/images/apacheds-studio-${studio-version}-setup.exe</file>
+                  <file>target/images/apache-directory-studio-${studio-version}-setup.exe</file>
                   <url>${pom.distributionManagement.snapshotRepository.url}</url>
                   <artifactId>ApacheDirectoryInstaller</artifactId>
                   <groupId>${pom.groupId}</groupId>
@@ -449,7 +364,7 @@
           <plugin>
             <groupId>org.apache.directory.daemon</groupId>
             <artifactId>daemon-plugin</artifactId>
-            <version>1.1.2-SNAPSHOT</version>
+            <version>1.1.4-SNAPSHOT</version>
             <configuration>
               <excludes>
 
@@ -475,12 +390,13 @@
                 <exclude>freemarker:freemarker</exclude>
                 <exclude>asm:asm-util</exclude>
                 <exclude>jasperreports:jasperreports</exclude>
+                <exclude>bouncycastle:bcprov-jdk15</exclude>
               </excludes>
 
               <application>
                 <name>apacheds</name>
                 <icon>src/main/resources/feather.ico</icon>
-                <version>1.5.2-SNAPSHOT</version>
+                <version>1.5.3-SNAPSHOT</version>
                 <copyrightYear>2007</copyrightYear>
                 <minimumJavaVersion>1.5</minimumJavaVersion>
                 <url>http://directory.apache.org</url>
@@ -557,7 +473,7 @@
                   <id>apacheds-i386-rpm</id>
                   <rpmSpecificationFile>src/main/installers/apacheds-rpm.spec</rpmSpecificationFile>
                   <rpmTopDir>target/rpmbuild</rpmTopDir>
-                  <finalName>apacheds-server-1.5.2-SNAPSHOT-i386.rpm</finalName>
+                  <finalName>apacheds-${server-version}-i386.rpm</finalName>
                   <osName>Linux</osName>
                   <osFamily>unix</osFamily>
                   <osArch>i386</osArch>
@@ -603,7 +519,7 @@
                   <id>apacheds-x86_64-rpm</id>
                   <rpmSpecificationFile>src/main/installers/apacheds-rpm.spec</rpmSpecificationFile>
                   <rpmTopDir>target/rpmbuild</rpmTopDir>
-                  <finalName>apacheds-server-1.5.2-SNAPSHOT-x86_64.rpm</finalName>
+                  <finalName>apacheds-${server-version}-x86_64.rpm</finalName>
                   <osName>Linux</osName>
                   <osFamily>unix</osFamily>
                   <osArch>x86_64</osArch>
@@ -645,7 +561,7 @@
                   <id>server-win32</id>
                   <nsisCompiler>/usr/local/nsis/makensis</nsisCompiler>
                   <nsisConfigurationFile>src/main/installers/apacheds-server-win.nsi</nsisConfigurationFile>
-                  <finalName>apacheds-server-1.5.2-SNAPSHOT-setup</finalName>
+                  <finalName>apacheds-${server-version}-setup</finalName>
                   <osName>Windows XP</osName>
                   <osFamily>windows</osFamily>
                   <osVersion>5.1</osVersion>
@@ -653,6 +569,59 @@
                   <daemonFramework>tanuki</daemonFramework>
                 </nsisTarget>
               </nsisTargets>
+              
+              <!-- Targets for Mac OS X .pkg installer package -->
+              <pkgTargets>
+                <pkgTarget>
+                 <id>apacheds-macosx</id>
+                  <finalName>apacheds-${server-version}.dmg</finalName>
+                  <osName>Mac OS X</osName>
+                  <osFamily>macosx</osFamily>
+                  <osArch>x86</osArch>
+                  <daemonFramework>tanuki</daemonFramework>
+                </pkgTarget>
+              </pkgTargets>
+              
+              <!-- Targets for Debian .deb installer package -->
+              <debTargets>
+                <debTarget>
+                 <id>apacheds-debian-i386</id>
+                  <finalName>apacheds-${server-version}-i386.deb</finalName>
+                  <osName>linux</osName>
+                  <osFamily>linux</osFamily>
+                  <osArch>i386</osArch>
+                  <daemonFramework>tanuki</daemonFramework>
+                </debTarget>
+                <debTarget>
+                 <id>apacheds-debian-amd64</id>
+                  <finalName>apacheds-${server-version}-amd64.deb</finalName>
+                  <osName>linux</osName>
+                  <osFamily>linux</osFamily>
+                  <osArch>amd64</osArch>
+                  <daemonFramework>tanuki</daemonFramework>
+                </debTarget>
+              </debTargets>
+              
+              <!-- Targets for Linux Binary .bin installer -->
+              <binTargets>
+                <binTarget>
+                 <id>apacheds-bin-installer-i386</id>
+                  <finalName>apacheds-${server-version}-i386.bin</finalName>
+                  <osName>Linux</osName>
+                  <osFamily>linux</osFamily>
+                  <osArch>i386</osArch>
+                  <daemonFramework>tanuki</daemonFramework>
+                </binTarget>
+                 <binTarget>
+                 <id>apacheds-bin-installer-x86_64</id>
+                  <finalName>apacheds-${server-version}-x86_64.bin</finalName>
+                  <osName>Linux</osName>
+                  <osFamily>linux</osFamily>
+                  <osArch>x86_64</osArch>
+                  <daemonFramework>tanuki</daemonFramework>
+                </binTarget>
+              </binTargets>
+              
             </configuration>
             <executions>
               <execution>
@@ -669,7 +638,7 @@
                 <id>deploy-installer-server-win32</id>
                 <phase>deploy</phase>
                 <configuration>
-                  <file>target/images/apacheds-server-${server-version}-setup.exe</file>
+                  <file>target/images/apacheds-${server-version}-setup.exe</file>
                   <url>${pom.distributionManagement.snapshotRepository.url}</url>
                   <artifactId>ApacheDirectoryInstaller</artifactId>
                   <groupId>${pom.groupId}</groupId>
@@ -737,7 +706,7 @@
                 <artifactItem>
                   <groupId>org.apache.directory.server</groupId>
                   <artifactId>apacheds-server-xml</artifactId>
-                  <version>1.5.2-SNAPSHOT</version>
+                  <version>1.5.3-SNAPSHOT</version>
                 </artifactItem>
               </artifactItems>
               <outputDirectory>${basedir}/src/main/installers</outputDirectory>
@@ -750,4 +719,3 @@
     </plugins>
   </build>
 </project>
-

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 @@
   <parent>
     <groupId>org.apache.directory.project</groupId>
     <artifactId>project</artifactId>
-    <version>10-SNAPSHOT</version>
+    <version>10</version>
   </parent>
 
   <groupId>org.apache.directory.installers</groupId>
   <artifactId>installers-parent</artifactId>
-  <version>1.5.2-SNAPSHOT</version>
+  <version>1.5.3-SNAPSHOT</version>
   <name>ApacheDS Installers</name>
   <packaging>pom</packaging>
 
+  <properties>
+    <projectName>Apache Directory Server</projectName>
+    <!--<siteId>apacheds</siteId>-->
+  </properties>
+
   <url>http://directory.apache.org/apacheds/1.5</url>
 
   <dependencyManagement>
@@ -41,97 +46,97 @@
       <dependency>
         <groupId>org.apache.directory.server</groupId>
         <artifactId>mitosis</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.3-SNAPSHOT</version>
       </dependency>  
 
       <dependency>
         <groupId>org.apache.directory.server</groupId>
         <artifactId>apacheds-xbean-spring</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.3-SNAPSHOT</version>
       </dependency>  
 
       <dependency>
         <groupId>org.apache.directory.server</groupId>
         <artifactId>apacheds-server-xml</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.3-SNAPSHOT</version>
       </dependency>
   
       <dependency>
         <groupId>org.apache.directory.daemon</groupId>
         <artifactId>daemon-bootstrappers</artifactId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>1.1.4-SNAPSHOT</version>
       </dependency>  
 
       <dependency>
         <groupId>org.apache.directory.server</groupId>
         <artifactId>apacheds-server-tools</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.3-SNAPSHOT</version>
       </dependency>  
 
       <dependency>
         <groupId>org.apache.directory.server</groupId>
         <artifactId>apacheds-server-jndi</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.directory.server</groupId>
         <artifactId>apacheds-protocol-ntp</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.directory.server</groupId>
         <artifactId>apacheds-protocol-kerberos</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.directory.server</groupId>
         <artifactId>apacheds-protocol-changepw</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.directory.server</groupId>
         <artifactId>apacheds-protocol-dns</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.directory.server</groupId>
         <artifactId>apacheds-schema-extras</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.directory.server</groupId>
         <artifactId>apacheds-bootstrap-partition</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
         <artifactId>shared-asn1-codec</artifactId>
-        <version>0.9.9-SNAPSHOT</version>
+        <version>0.9.11-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
         <artifactId>shared-ldap</artifactId>
-        <version>0.9.9-SNAPSHOT</version>
+        <version>0.9.11-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
         <artifactId>shared-ldap-constants</artifactId>
-        <version>0.9.9-SNAPSHOT</version>
+        <version>0.9.11-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.directory.daemon</groupId>
         <artifactId>daemon-bootstrappers</artifactId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>1.1.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
@@ -264,18 +269,40 @@
         <groupId>org.springframework</groupId>
         <artifactId>spring-core</artifactId>
         <version>2.0.6</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
 
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-beans</artifactId>
         <version>2.0.6</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
 
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-context</artifactId>
         <version>2.0.6</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>aopalliance</groupId>
+            <artifactId>aopalliance</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
 
       <dependency>
@@ -317,7 +344,29 @@
       <dependency>
         <groupId>org.apache.xbean</groupId>
         <artifactId>xbean-spring</artifactId>
-        <version>3.2</version>
+        <version>3.3</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jmx</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
 
       <dependency>
@@ -343,43 +392,94 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap</artifactId>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-xbean-spring</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-server-jndi</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-protocol-ntp</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-protocol-kerberos</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-protocol-changepw</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-protocol-dns</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-server-xml</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-bootstrap-partition</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.directory.daemon</groupId>
+      <artifactId>daemon-bootstrappers</artifactId>
     </dependency>
 
-    <!-- apacheds standard logging interface -->
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
 
-    <!-- not sure what this is used for -->
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl104-over-slf4j</artifactId>
-      <scope>test</scope>
+      <scope>runtime</scope>
     </dependency>
 
-    <!-- standard logging implementation for tests -->
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <scope>test</scope>
+      <scope>runtime</scope>
     </dependency>
 
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <scope>test</scope>
+      <scope>runtime</scope>
     </dependency>
 
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
     </dependency>
-  </dependencies>
 
+    <dependency>
+      <groupId>org.apache.xbean</groupId>
+      <artifactId>xbean-spring</artifactId>
+    </dependency>
+  </dependencies>
+  
   <modules>
     <module>apacheds</module>
     <module>apacheds-noarch</module>
@@ -415,15 +515,6 @@
       </plugins>
     </pluginManagement>
 
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-release-plugin</artifactId>
-        <configuration>
-          <tagBase>https://svn.apache.org/repos/asf/directory/apacheds/releases</tagBase>
-        </configuration>
-      </plugin>
-    </plugins>
   </build>
 
   <reporting>



Mime
View raw message