directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r644087 - in /directory/installers/branches/bigbang/apacheds-noarch: apacheds.bat apacheds.sh pom.xml src/main/assembly/ src/main/resources/
Date Wed, 02 Apr 2008 22:04:21 GMT
Author: djencks
Date: Wed Apr  2 15:04:19 2008
New Revision: 644087

URL: http://svn.apache.org/viewvc?rev=644087&view=rev
Log:
fix build, remove cruft from assembly plugin, move server.xml unpack into target/plan

Removed:
    directory/installers/branches/bigbang/apacheds-noarch/src/main/assembly/
    directory/installers/branches/bigbang/apacheds-noarch/src/main/resources/
Modified:
    directory/installers/branches/bigbang/apacheds-noarch/apacheds.bat
    directory/installers/branches/bigbang/apacheds-noarch/apacheds.sh
    directory/installers/branches/bigbang/apacheds-noarch/pom.xml

Modified: directory/installers/branches/bigbang/apacheds-noarch/apacheds.bat
URL: http://svn.apache.org/viewvc/directory/installers/branches/bigbang/apacheds-noarch/apacheds.bat?rev=644087&r1=644086&r2=644087&view=diff
==============================================================================
--- directory/installers/branches/bigbang/apacheds-noarch/apacheds.bat (original)
+++ directory/installers/branches/bigbang/apacheds-noarch/apacheds.bat Wed Apr  2 15:04:19
2008
@@ -13,4 +13,4 @@
    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/installers/branches/bigbang/apacheds-noarch/apacheds.sh
URL: http://svn.apache.org/viewvc/directory/installers/branches/bigbang/apacheds-noarch/apacheds.sh?rev=644087&r1=644086&r2=644087&view=diff
==============================================================================
--- directory/installers/branches/bigbang/apacheds-noarch/apacheds.sh (original)
+++ directory/installers/branches/bigbang/apacheds-noarch/apacheds.sh Wed Apr  2 15:04:19
2008
@@ -6,4 +6,4 @@
   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/installers/branches/bigbang/apacheds-noarch/pom.xml
URL: http://svn.apache.org/viewvc/directory/installers/branches/bigbang/apacheds-noarch/pom.xml?rev=644087&r1=644086&r2=644087&view=diff
==============================================================================
--- directory/installers/branches/bigbang/apacheds-noarch/pom.xml (original)
+++ directory/installers/branches/bigbang/apacheds-noarch/pom.xml Wed Apr  2 15:04:19 2008
@@ -195,11 +195,12 @@
             <configuration>
               <shadedArtifactAttached>true</shadedArtifactAttached>
               <shadedClassifierName>app</shadedClassifierName>
+<!--
               <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>
@@ -213,8 +214,13 @@
                     <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>
@@ -234,27 +240,12 @@
                   </excludes>
                 </filter>
               </filters>
+-->
             </configuration>
           </execution>
         </executions>
       </plugin>
-      <!--<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>-->
-      <!--</plugin>-->
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
@@ -267,22 +258,6 @@
         </configuration>
       </plugin>
 
-<!--
-      <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>
@@ -301,7 +276,7 @@
                   <version>1.5.2-SNAPSHOT</version>
                 </artifactItem>
               </artifactItems>
-              <outputDirectory>${basedir}</outputDirectory>
+              <outputDirectory>${basedir}/target/plan</outputDirectory>
               <overWriteReleases>true</overWriteReleases>
               <overWriteSnapshots>true</overWriteSnapshots>
             </configuration>



Mime
View raw message