directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r642498 - in /directory/sandbox/akarasulu/bigbang/installers: ./ apacheds-noarch/ apacheds-noarch/src/site/ apacheds/ apacheds/src/main/installers/ apacheds/src/site/
Date Sat, 29 Mar 2008 03:16:29 GMT
Author: akarasulu
Date: Fri Mar 28 20:16:27 2008
New Revision: 642498

URL: http://svn.apache.org/viewvc?rev=642498&view=rev
Log:
[MERGE][638217:642497] Pulling in changes from bigbang since last merge

Added:
    directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/src/site/
      - copied from r642497, directory/installers/branches/bigbang/apacheds-noarch/src/site/
    directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/src/site/site.xml
      - copied unchanged from r642497, directory/installers/branches/bigbang/apacheds-noarch/src/site/site.xml
    directory/sandbox/akarasulu/bigbang/installers/apacheds/src/site/
      - copied from r642497, directory/installers/branches/bigbang/apacheds/src/site/
    directory/sandbox/akarasulu/bigbang/installers/apacheds/src/site/site.xml
      - copied unchanged from r642497, directory/installers/branches/bigbang/apacheds/src/site/site.xml
Modified:
    directory/sandbox/akarasulu/bigbang/installers/LAST_BIG_BANG_MERGE
    directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/   (props changed)
    directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/log4j.properties
    directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/pom.xml
    directory/sandbox/akarasulu/bigbang/installers/apacheds/pom.xml
    directory/sandbox/akarasulu/bigbang/installers/apacheds/src/main/installers/apacheds-rpm.spec
    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=642498&r1=642497&r2=642498&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/installers/LAST_BIG_BANG_MERGE (original)
+++ directory/sandbox/akarasulu/bigbang/installers/LAST_BIG_BANG_MERGE Fri Mar 28 20:16:27
2008
@@ -1,11 +1,11 @@
+$Rev$
+$Date$
+
 This file shows the last time I merged from the big bang branch here as a commit
 number:
 
    https://svn.apache.org/repos/asf/directory/installers/branches/bigbang/
 
-$Rev$
-$Date$
-
 
 Sun Jan 20 12:02:09 EST 2008
 ----------------------------
@@ -16,4 +16,9 @@
 Tue Mar 18 01:02:23 EDT 2008
 ----------------------------
 svn merge -r 613609:638217 https://svn.apache.org/repos/asf/directory/installers/branches/bigbang
.
+
+
+Fri Mar 28 23:19:22 EDT 2008
+----------------------------
+svn merge -r 638217:642497 https://svn.apache.org/repos/asf/directory/installers/branches/bigbang
.
 

Propchange: directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Mar 28 20:16:27 2008
@@ -1,4 +1,5 @@
 server.xml
+*.log.*
 work
 META-INF
 server-work

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=642498&r1=642497&r2=642498&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/log4j.properties (original)
+++ directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/log4j.properties Fri Mar
28 20:16:27 2008
@@ -40,4 +40,5 @@
 # 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=642498&r1=642497&r2=642498&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/pom.xml (original)
+++ directory/sandbox/akarasulu/bigbang/installers/apacheds-noarch/pom.xml Fri Mar 28 20:16:27
2008
@@ -1,22 +1,25 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-    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
+<?xml version="1.0" encoding="UTF-8"?>
 
-    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.
+<!--
+  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.
 -->
-<!-- $Rev:  $ $Date:  $ -->
-<project>
+
+<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>

Modified: directory/sandbox/akarasulu/bigbang/installers/apacheds/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/installers/apacheds/pom.xml?rev=642498&r1=642497&r2=642498&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/installers/apacheds/pom.xml (original)
+++ directory/sandbox/akarasulu/bigbang/installers/apacheds/pom.xml Fri Mar 28 20:16:27 2008
@@ -1,22 +1,25 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?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.
+  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.
 -->
-<!-- $Rev:  $ $Date:  $ -->
-<project>
+
+<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>
@@ -31,97 +34,85 @@
     Installer generating project for ApacheDS
   </description>
 
+  <properties>
+    <studio-version>1.1.0-SNAPSHOT</studio-version>
+    <server-version>1.5.2-SNAPSHOT</server-version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.directory.installers</groupId>
       <artifactId>apacheds-noarch-installer</artifactId>
       <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>
@@ -141,12 +132,14 @@
                 <configuration>
                   <tasks>
                     <mkdir dir="target/images"/>
-                    <get src="http://builds.organicelement.com/repository/download/bt4/.lastSuccessful/ApacheDirectoryStudio_Windows.zip?guest=1"
+                    <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="ApacheDirectoryStudio.zip"
-                            />
-                    <touch file="ApacheDirectoryStudio.zip"/>
-                    <unzip src="ApacheDirectoryStudio.zip" dest="target/images/suite-win32"
overwrite="false" />
+                         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}"
/>
+                    </move>
                   </tasks>
                 </configuration>
                 <goals>
@@ -158,13 +151,12 @@
           <plugin>
             <groupId>org.apache.directory.daemon</groupId>
             <artifactId>daemon-plugin</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.2-SNAPSHOT</version>
             <configuration>
               <application>
                 <name>suite</name>
                 <version>1.0</version>
                 <description>Apache Directory Suite</description>
-
                 <icon>src/main/resources/feather.ico</icon>
                 <copyrightYear>2007</copyrightYear>
                 <minimumJavaVersion>1.5</minimumJavaVersion>
@@ -199,9 +191,7 @@
                   <filtered>true</filtered>
                 </packagedFile>
               </packagedFiles>
-              <applicationClass>
-                org.apache.ldap.server.Service
-              </applicationClass>
+              <applicationClass>org.apache.ldap.server.Service</applicationClass>
               <nsisTargets>
                 <nsisTarget>
                   <packagedFiles>
@@ -230,17 +220,14 @@
                       <filtered>false</filtered>
                     </packagedFile>
                   </packagedFiles>
-
                   <id>suite-win32</id>
                   <nsisCompiler>/usr/local/nsis/makensis</nsisCompiler>
                   <nsisConfigurationFile>src/main/installers/apacheds-suite-win.nsi</nsisConfigurationFile>
-                  <finalName>
-                    apacheds-suite-1.0-setup
-                  </finalName>
+                  <finalName>apacheds-suite-${studio-version}-setup</finalName>
                   <osName>Windows XP</osName>
                   <osFamily>windows</osFamily>
                   <osVersion>5.1</osVersion>
-                  <osArch>x86</osArch>
+                  <osArch>win32</osArch>
                   <daemonFramework>tanuki</daemonFramework>
                 </nsisTarget>
               </nsisTargets>
@@ -278,6 +265,27 @@
               </execution>
             </executions>
           </plugin>
+          <plugin>
+            <artifactId>maven-deploy-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>deploy-installer-suite-win32</id>
+                <phase>deploy</phase>
+                <configuration>
+                  <file>target/images/apacheds-suite-${studio-version}-setup.exe</file>
+                  <url>${pom.distributionManagement.snapshotRepository.url}</url>
+                  <artifactId>ApacheDirectoryInstaller</artifactId>
+                  <groupId>${pom.groupId}</groupId>
+                  <packaging>exe</packaging>
+                  <version>suite-win32-${studio-version}</version>
+                  <uniqueVersion>false</uniqueVersion>
+                </configuration>
+                <goals>
+                  <goal>deploy-file</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
       </build>
     </profile>
@@ -293,12 +301,14 @@
                 <configuration>
                   <tasks>
                     <mkdir dir="target/images"/>
-                    <get src="http://builds.organicelement.com/repository/download/bt4/.lastSuccessful/ApacheDirectoryStudio_Windows.zip?guest=1"
+                    <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="ApacheDirectoryStudio.zip"
-                            />
-                    <touch file="ApacheDirectoryStudio.zip"/>
-                    <unzip src="ApacheDirectoryStudio.zip" dest="target/images/studio-win32"
overwrite="false" />
+                         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}"
/>
+                    </move>
                   </tasks>
                 </configuration>
                 <goals>
@@ -310,7 +320,7 @@
           <plugin>
             <groupId>org.apache.directory.daemon</groupId>
             <artifactId>daemon-plugin</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.2-SNAPSHOT</version>
             <configuration>
               <application>
                 <name>studio</name>
@@ -351,9 +361,7 @@
                   <filtered>true</filtered>
                 </packagedFile>
               </packagedFiles>
-              <applicationClass>
-                org.apache.ldap.server.Service
-              </applicationClass>
+              <applicationClass>org.apache.ldap.server.Service</applicationClass>
               <nsisTargets>
                 <nsisTarget>
                   <packagedFiles>
@@ -368,13 +376,11 @@
                   <id>studio-win32</id>
                   <nsisCompiler>/usr/local/nsis/makensis</nsisCompiler>
                   <nsisConfigurationFile>src/main/installers/apacheds-studio-win.nsi</nsisConfigurationFile>
-                  <finalName>
-                    apacheds-studio-1.0-setup
-                  </finalName>
+                  <finalName>apacheds-studio-${studio-version}-setup</finalName>
                   <osName>Windows XP</osName>
                   <osFamily>windows</osFamily>
                   <osVersion>5.1</osVersion>
-                  <osArch>x86</osArch>
+                  <osArch>win32</osArch>
                   <daemonFramework>tanuki</daemonFramework>
                 </nsisTarget>
               </nsisTargets>
@@ -411,6 +417,27 @@
               </execution>
             </executions>
           </plugin>
+          <plugin>
+            <artifactId>maven-deploy-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>deploy-installer-studio-win32</id>
+                <phase>deploy</phase>
+                <configuration>
+                  <file>target/images/apacheds-studio-${studio-version}-setup.exe</file>
+                  <url>${pom.distributionManagement.snapshotRepository.url}</url>
+                  <artifactId>ApacheDirectoryInstaller</artifactId>
+                  <groupId>${pom.groupId}</groupId>
+                  <packaging>exe</packaging>
+                  <version>studio-win32-${studio-version}</version>
+                  <uniqueVersion>false</uniqueVersion>
+                </configuration>
+                <goals>
+                  <goal>deploy-file</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
       </build>
     </profile>
@@ -422,7 +449,7 @@
           <plugin>
             <groupId>org.apache.directory.daemon</groupId>
             <artifactId>daemon-plugin</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.2-SNAPSHOT</version>
             <configuration>
               <excludes>
 
@@ -529,10 +556,8 @@
                   </packagedFiles>
                   <id>apacheds-i386-rpm</id>
                   <rpmSpecificationFile>src/main/installers/apacheds-rpm.spec</rpmSpecificationFile>
-                  <!--<rpmTopDir>${user.home}/rpmbuild</rpmTopDir>-->
-                  <finalName>
-                    apacheds-server-1.5.2-SNAPSHOT-i386.rpm
-                  </finalName>
+                  <rpmTopDir>target/rpmbuild</rpmTopDir>
+                  <finalName>apacheds-server-1.5.2-SNAPSHOT-i386.rpm</finalName>
                   <osName>Linux</osName>
                   <osFamily>unix</osFamily>
                   <osArch>i386</osArch>
@@ -540,6 +565,7 @@
                   <scriptFile>src/main/installers/apacheds-init</scriptFile>
                   <!--<bootstrapperConfigurationFile>../../daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/wrapper/conf/apacheds.conf</bootstrapperConfigurationFile>-->
                 </rpmTarget>
+
                 <rpmTarget>
                   <packagedFiles>
                     <packagedFile>
@@ -576,10 +602,8 @@
                   </packagedFiles>
                   <id>apacheds-x86_64-rpm</id>
                   <rpmSpecificationFile>src/main/installers/apacheds-rpm.spec</rpmSpecificationFile>
-                  <!--<rpmTopDir>${user.home}/rpmbuild</rpmTopDir>-->
-                  <finalName>
-                    apacheds-server-1.5.2-SNAPSHOT-x86_64.rpm
-                  </finalName>
+                  <rpmTopDir>target/rpmbuild</rpmTopDir>
+                  <finalName>apacheds-server-1.5.2-SNAPSHOT-x86_64.rpm</finalName>
                   <osName>Linux</osName>
                   <osFamily>unix</osFamily>
                   <osArch>x86_64</osArch>
@@ -621,9 +645,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-1.5.2-SNAPSHOT-setup</finalName>
                   <osName>Windows XP</osName>
                   <osFamily>windows</osFamily>
                   <osVersion>5.1</osVersion>
@@ -631,12 +653,64 @@
                   <daemonFramework>tanuki</daemonFramework>
                 </nsisTarget>
               </nsisTargets>
-
             </configuration>
             <executions>
               <execution>
                 <goals>
                   <goal>generate</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <artifactId>maven-deploy-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>deploy-installer-server-win32</id>
+                <phase>deploy</phase>
+                <configuration>
+                  <file>target/images/apacheds-server-${server-version}-setup.exe</file>
+                  <url>${pom.distributionManagement.snapshotRepository.url}</url>
+                  <artifactId>ApacheDirectoryInstaller</artifactId>
+                  <groupId>${pom.groupId}</groupId>
+                  <packaging>exe</packaging>
+                  <version>server-win32-${server-version}</version>
+                  <uniqueVersion>false</uniqueVersion>
+                </configuration>
+                <goals>
+                  <goal>deploy-file</goal>
+                </goals>
+              </execution>
+              <execution>
+                <id>deploy-installer-server-rpm-x86</id>
+                <phase>deploy</phase>
+                <configuration>
+                  <file>target/images/apacheds-server-${server-version}-x86.rpm</file>
+                  <url>${pom.distributionManagement.snapshotRepository.url}</url>
+                  <artifactId>ApacheDirectoryInstaller</artifactId>
+                  <groupId>${pom.groupId}</groupId>
+                  <packaging>rpm</packaging>
+                  <version>server-x86-${server-version}</version>
+                  <uniqueVersion>false</uniqueVersion>
+                </configuration>
+                <goals>
+                  <goal>deploy-file</goal>
+                </goals>
+              </execution>
+              <execution>
+                <id>deploy-installer-server-rpm-x86_64</id>
+                <phase>deploy</phase>
+                <configuration>
+                  <file>target/images/apacheds-server-${server-version}-x86_64.rpm</file>
+                  <url>${pom.distributionManagement.snapshotRepository.url}</url>
+                  <artifactId>ApacheDirectoryInstaller</artifactId>
+                  <groupId>${pom.groupId}</groupId>
+                  <packaging>rpm</packaging>
+                  <version>server-x86_64-${server-version}</version>
+                  <uniqueVersion>false</uniqueVersion>
+                </configuration>
+                <goals>
+                  <goal>deploy-file</goal>
                 </goals>
               </execution>
             </executions>

Modified: directory/sandbox/akarasulu/bigbang/installers/apacheds/src/main/installers/apacheds-rpm.spec
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/installers/apacheds/src/main/installers/apacheds-rpm.spec?rev=642498&r1=642497&r2=642498&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/installers/apacheds/src/main/installers/apacheds-rpm.spec
(original)
+++ directory/sandbox/akarasulu/bigbang/installers/apacheds/src/main/installers/apacheds-rpm.spec
Fri Mar 28 20:16:27 2008
@@ -55,7 +55,7 @@
 mkdir -p $RPM_BUILD_ROOT%{adsdata}/default/partitions
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}/default
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/%{name}/default
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d
+mkdir -p $RPM_BUILD_ROOT/etc/init.d
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 ${mk.docs.dirs}
 ${mk.sources.dirs}

Modified: directory/sandbox/akarasulu/bigbang/installers/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/installers/pom.xml?rev=642498&r1=642497&r2=642498&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/installers/pom.xml (original)
+++ directory/sandbox/akarasulu/bigbang/installers/pom.xml Fri Mar 28 20:16:27 2008
@@ -1,21 +1,24 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?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.
+  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.
 -->
-<!-- $Rev:  $ $Date:  $ -->
+
 <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>
 
@@ -331,23 +334,12 @@
     <url>http://issues.apache.org/jira/browse/DIRSERVER</url>
   </issueManagement>
 
-  <inceptionYear>2003</inceptionYear>
-
-  <mailingLists>
-    <mailingList>
-      <name>The Directory Developers List</name>
-      <subscribe>dev-subscribe@directory.apache.org</subscribe>
-      <unsubscribe>dev-unsubscribe@directory.apache.org</unsubscribe>
-      <post>dev@directory.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/directory-dev</archive>
-    </mailingList>
-    <mailingList>
-      <name>The Directory Commits (SVN) List</name>
-      <subscribe>commits-subscribe@directory.apache.org</subscribe>
-      <unsubscribe>commits-unsubscribe@directory.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/directory-commits</archive>
-    </mailingList>
-  </mailingLists>
+  <distributionManagement>
+    <site>
+      <id>apache.directory.installers</id>
+      <url>scpexe://vm094.oxylos.org/var/www/html/projects/installers/</url>
+    </site>
+  </distributionManagement>
 
   <dependencies>
     <dependency>
@@ -393,87 +385,6 @@
     <module>apacheds-noarch</module>
   </modules>
 
-  <developers>
-    <developer>
-      <id>adc</id>
-    </developer>
-    <developer>
-      <id>akarasulu</id>
-      <url>http://directory.apache.org/community/who/akarasulu.html</url>
-    </developer>
-    <developer>
-      <id>bayard</id>
-    </developer>
-    <developer>
-      <id>bloritsch</id>
-    </developer>
-    <developer>
-      <id>brett</id>
-    </developer>
-    <developer>
-      <id>ckoppelt</id>
-    </developer>
-    <developer>
-      <id>elecharny</id>
-      <url>http://directory.apache.org/community/who/elecharny.html</url>
-    </developer>
-    <developer>
-      <id>erodriguez</id>
-      <url>http://directory.apache.org/community/who/erodriguez.html</url>
-    </developer>
-    <developer>
-      <id>ersiner</id>
-      <url>http://directory.apache.org/community/who/ersiner.html</url>
-    </developer>
-    <developer>
-      <id>jmachols</id>
-      <url>http://directory.apache.org/community/who/jmachols.html</url>
-    </developer>
-    <developer>
-      <id>niklas</id>
-    </developer>
-    <developer>
-      <id>noel</id>
-      <url>http://directory.apache.org/community/who/noel.html</url>
-    </developer>
-    <developer>
-      <id>pamarcelot</id>
-    </developer>
-    <developer>
-      <id>psteitz</id>
-      <url>http://directory.apache.org/community/who/psteitz.html</url>
-    </developer>
-    <developer>
-      <id>szoerner</id>
-      <url>http://directory.apache.org/community/who/szoerner.html</url>
-    </developer>
-    <developer>
-      <id>trustin</id>
-      <url>http://directory.apache.org/community/who/trustin.html</url>
-    </developer>
-    <developer>
-      <id>vtence</id>
-      <url>http://directory.apache.org/community/who/vtence.html</url>
-    </developer>
-    <developer>
-      <id>wesmckean</id>
-      <url>http://directory.apache.org/community/who/wesmckean.html</url>
-    </developer>
-  </developers>
-
-  <contributors>
-    <contributor>
-      <name>Nick Faiz</name>
-    </contributor>
-  </contributors>
-
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
-    </license>
-  </licenses>
-
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/directory/installers/branches/bigbang</connection>
     <url>http://svn.apache.org/repos/asf/directory/installers/branches/bigbang</url>
@@ -520,27 +431,88 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>project-team</report>
-              <report>mailing-list</report>
-              <report>issue-tracking</report>
-              <report>license</report>
-              <report>scm</report>
-            </reports>
-          </reportSet>
-        </reportSets>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <aggregate>true</aggregate>
+        </configuration>
       </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
+        <artifactId>maven-surefire-report-plugin</artifactId>
         <configuration>
           <aggregate>true</aggregate>
         </configuration>
       </plugin>
+      <plugin>
+        <artifactId>maven-jxr-plugin</artifactId>
+        <configuration>
+          <aggregate>true</aggregate>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-pmd-plugin</artifactId>
+        <configuration>
+          <linkXref>true</linkXref>
+          <sourceEncoding>utf-8</sourceEncoding>
+          <minimumTokens>100</minimumTokens>
+          <targetJdk>1.5</targetJdk>
+          <aggregate>true</aggregate>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>taglist-maven-plugin</artifactId>
+        <configuration>
+          <tags>
+            <tag>TODO</tag>
+            <tag>@todo</tag>
+            <tag>@deprecated</tag>
+            <tag>FIXME</tag>
+          </tags>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>findbugs-maven-plugin</artifactId>
+        <version>1.1.1</version>
+        <configuration>
+          <xmlOutput>false</xmlOutput>
+          <!--
+            <xmlOutput>true|false</xmlOutput>
+            <xmlOutputDirectory>directory location of xml findbugs report</xmlOutputDirectory>
+            <threshold>High|Normal|Low|Exp|Ignore</threshold>
+            <effort>Min|Default|Max</effort>
+            <excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
+            <includeFilterFile>findbugs-include.xml</includeFilterFile>
+            <visitors>FindDeadLocalStores,UnreadFields</visitors>
+            <omitVisitors>FindDeadLocalStores,UnreadFields</omitVisitors>
+            <onlyAnalyze>org.codehaus.mojo.findbugs.*</onlyAnalyze>
+            <pluginList>/libs/fb-contrib/fb-contrib-2.8.0.jar</pluginList>
+            <debug>true|false</debug>
+            <relaxed>true|false</relaxed>
+          -->
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>cobertura-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+      </plugin>
     </plugins>
   </reporting>
+
+  <repositories>
+    <repository>
+      <id>apache.directory.snapshot.repo</id>
+      <name>Snapshot repository for the Apache Directory project</name>
+      <url>http://vm094.oxylos.org/mirror-maven2/</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+    </repository>
+  </repositories>
+  
 </project>



Mime
View raw message