directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r567586 - in /directory/daemon/trunk: ./ bootstrappers/src/main/resources/META-INF/ plugin/src/main/resources/META-INF/ src/ src/main/appended-resources/
Date Mon, 20 Aug 2007 08:08:46 GMT
Author: djencks
Date: Mon Aug 20 01:08:45 2007
New Revision: 567586

URL: http://svn.apache.org/viewvc?rev=567586&view=rev
Log:
DIRSERVER-1024 use maven-remote-resources-plugin to install license and notice files

Added:
    directory/daemon/trunk/src/
      - copied from r567560, directory/apacheds/trunk/src/
Removed:
    directory/daemon/trunk/bootstrappers/src/main/resources/META-INF/LICENSE.txt
    directory/daemon/trunk/bootstrappers/src/main/resources/META-INF/NOTICE.txt
    directory/daemon/trunk/plugin/src/main/resources/META-INF/LICENSE.txt
    directory/daemon/trunk/plugin/src/main/resources/META-INF/NOTICE.txt
Modified:
    directory/daemon/trunk/pom.xml
    directory/daemon/trunk/src/main/appended-resources/supplemental-models.xml

Modified: directory/daemon/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/pom.xml?rev=567586&r1=567585&r2=567586&view=diff
==============================================================================
--- directory/daemon/trunk/pom.xml (original)
+++ directory/daemon/trunk/pom.xml Mon Aug 20 01:08:45 2007
@@ -74,6 +74,27 @@
           <version>2.3</version>
         </plugin>
 
+        <!-- remove when project version 8 is released -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-remote-resources-plugin</artifactId>
+          <version>1.0-alpha-5</version>
+          <executions>
+            <execution>
+              <goals>
+                <goal>process</goal>
+              </goals>
+              <configuration>
+                <resourceBundles>
+                  <resourceBundle>org.apache:apache-jar-resource-bundle:1.0</resourceBundle>
+                </resourceBundles>
+                <!-- hack to share the same corrections among all modules -->
+                <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
@@ -115,6 +136,13 @@
           <encoding>ISO-8859-1</encoding>
         </configuration>
       </plugin>
+
+      <!-- remove when project version 8 is released -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+      </plugin>
+
     </plugins>
   </build>
 </project>

Modified: directory/daemon/trunk/src/main/appended-resources/supplemental-models.xml
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/src/main/appended-resources/supplemental-models.xml?rev=567586&r1=567560&r2=567586&view=diff
==============================================================================
--- directory/daemon/trunk/src/main/appended-resources/supplemental-models.xml (original)
+++ directory/daemon/trunk/src/main/appended-resources/supplemental-models.xml Mon Aug 20
01:08:45 2007
@@ -2,34 +2,51 @@
 <supplementalDataModels>
   <supplement>
     <project>
-      <groupId>jdbm</groupId>
-      <artifactId>jdbm</artifactId>
-      <name>JDBM</name>
+      <groupId>org.slf4j</groupId>
+      <artifactId>nlog4j</artifactId>
+      <name>NLOG4J SLF4J implementation</name>
       <organization>
-        <name>JDBM</name>
-        <url>http://jdbm.sourceforge.net/</url>
+        <name>QOS.ch</name>
+        <url>http://www.qos.ch</url>
       </organization>
       <licenses>
         <license>
-          <name>JDBM License v1.00 (BSD)</name>
-          <url>http://jdbm.cvs.sourceforge.net/jdbm/jdbm/LICENSE.txt?revision=1.1</url>
+          <name>MIT</name>
+          <url>http://www.slf4j.org/license.html</url>
         </license>
       </licenses>
     </project>
   </supplement>
   <supplement>
     <project>
-      <groupId>antlr</groupId>
-      <artifactId>antlr</artifactId>
-      <name>ANTLR Parser Generator</name>
+      <groupId>commons-daemon</groupId>
+      <artifactId>commons-daemon</artifactId>
+      <name>Apache Commons Daemon</name>
       <organization>
-        <name>ANTLR</name>
-        <url>http://www.antlr.org/</url>
+        <name>The Apache Software Foundation</name>
+        <url>http://www.apache.org/</url>
       </organization>
       <licenses>
         <license>
-          <name>ANTLR 2 License (public domain)</name>
-          <url>http://www.antlr2.org/license.html</url>
+          <name>ASF 2</name>
+          <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+        </license>
+      </licenses>
+    </project>
+  </supplement>
+  <supplement>
+    <project>
+      <groupId>org.tanukisoftware</groupId>
+      <artifactId>wrapper</artifactId>
+      <name>Java Service Wrapper</name>
+      <organization>
+        <name>tanuki software</name>
+        <url>http://www.apache.org/</url>
+      </organization>
+      <licenses>
+        <license>
+          <name>MIT</name>
+          <url>http://wrapper.tanukisoftware.org/doc/english/license.html</url>
         </license>
       </licenses>
     </project>



Mime
View raw message