directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r567597 - in /directory/sandbox/djencks/triplesec-jacc2: LICENSE.txt NOTICE.txt crypto/src/main/resources/META-INF/LICENSE.txt crypto/src/main/resources/META-INF/NOTICE.txt installers/LICENSE.txt installers/NOTICE.txt pom.xml src/main/
Date Mon, 20 Aug 2007 08:33:48 GMT
Author: djencks
Date: Mon Aug 20 01:33:47 2007
New Revision: 567597

URL: http://svn.apache.org/viewvc?rev=567597&view=rev
Log:
use maven remote resources plugin

Added:
    directory/sandbox/djencks/triplesec-jacc2/src/main/
      - copied from r567560, directory/apacheds/trunk/src/main/
Removed:
    directory/sandbox/djencks/triplesec-jacc2/LICENSE.txt
    directory/sandbox/djencks/triplesec-jacc2/NOTICE.txt
    directory/sandbox/djencks/triplesec-jacc2/crypto/src/main/resources/META-INF/LICENSE.txt
    directory/sandbox/djencks/triplesec-jacc2/crypto/src/main/resources/META-INF/NOTICE.txt
    directory/sandbox/djencks/triplesec-jacc2/installers/LICENSE.txt
    directory/sandbox/djencks/triplesec-jacc2/installers/NOTICE.txt
Modified:
    directory/sandbox/djencks/triplesec-jacc2/pom.xml

Modified: directory/sandbox/djencks/triplesec-jacc2/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/pom.xml?rev=567597&r1=567596&r2=567597&view=diff
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/pom.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/pom.xml Mon Aug 20 01:33:47 2007
@@ -114,7 +114,7 @@
         <artifactId>xmlParserAPIs</artifactId>
         <version>2.6.2</version>
       </dependency>
-    
+
       <dependency>
         <groupId>xerces</groupId>
         <artifactId>xercesImpl</artifactId>
@@ -148,10 +148,10 @@
         <artifactId>apacheds-core</artifactId>
         <version>1.5.1-SNAPSHOT</version>
         <exclusions>
-            <exclusion>
-                <groupId>org.apache.directory.server</groupId>
-                <artifactId>apacheds-bootstrap-partition</artifactId>
-            </exclusion>
+          <exclusion>
+            <groupId>org.apache.directory.server</groupId>
+            <artifactId>apacheds-bootstrap-partition</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
 
@@ -312,42 +312,42 @@
         <artifactId>spring-context</artifactId>
         <version>1.2.8</version>
       </dependency>
-        <dependency>
-          <groupId>dom4j</groupId>
-          <artifactId>dom4j</artifactId>
-          <version>1.6</version>
-        </dependency>
-
-        <dependency>
-          <groupId>jcharts</groupId>
-          <artifactId>jcharts</artifactId>
-          <version>0.6.0</version>
-        </dependency>
-        <dependency>
-          <groupId>myfaces</groupId>
-          <artifactId>myfaces-api</artifactId>
-          <version>1.1.0</version>
-        </dependency>
-        <dependency>
-          <groupId>myfaces</groupId>
-          <artifactId>myfaces-impl</artifactId>
-          <version>1.1.0</version>
-        </dependency>
-          <dependency>
-          <groupId>javax.servlet</groupId>
-          <artifactId>jstl</artifactId>
-          <version>1.1.0</version>
-        </dependency>
-        <dependency>
-         <groupId>commons-digester</groupId>
-         <artifactId>commons-digester</artifactId>
-         <version>1.5</version>
-       </dependency>
-       <dependency>
-         <groupId>commons-beanutils</groupId>
-         <artifactId>commons-beanutils</artifactId>
-         <version>1.6.1</version>
-       </dependency>
+      <dependency>
+        <groupId>dom4j</groupId>
+        <artifactId>dom4j</artifactId>
+        <version>1.6</version>
+      </dependency>
+
+      <dependency>
+        <groupId>jcharts</groupId>
+        <artifactId>jcharts</artifactId>
+        <version>0.6.0</version>
+      </dependency>
+      <dependency>
+        <groupId>myfaces</groupId>
+        <artifactId>myfaces-api</artifactId>
+        <version>1.1.0</version>
+      </dependency>
+      <dependency>
+        <groupId>myfaces</groupId>
+        <artifactId>myfaces-impl</artifactId>
+        <version>1.1.0</version>
+      </dependency>
+      <dependency>
+        <groupId>javax.servlet</groupId>
+        <artifactId>jstl</artifactId>
+        <version>1.1.0</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-digester</groupId>
+        <artifactId>commons-digester</artifactId>
+        <version>1.5</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-beanutils</groupId>
+        <artifactId>commons-beanutils</artifactId>
+        <version>1.6.1</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -369,14 +369,14 @@
     </repository>
   </repositories>
 
-<!--
-  <distributionManagement>
-    <site>
-      <id>triplesec.website</id>
-      <url>scp://.org/home/projects/triplesec/public_html/maven</url>
-    </site>
-  </distributionManagement>
--->
+  <!--
+    <distributionManagement>
+      <site>
+        <id>triplesec.website</id>
+        <url>scp://.org/home/projects/triplesec/public_html/maven</url>
+      </site>
+    </distributionManagement>
+  -->
 
   <issueManagement>
     <system>JIRA</system>
@@ -419,13 +419,13 @@
     </developer>
   </developers>
 
-    <licenses>
-        <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
 
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/directory/trunks/triplesec</connection>
@@ -433,160 +433,174 @@
     <url>https://svn.apache.org/viewvc/directory/trunks/triplesec</url>
   </scm>
 
-    <organization>
-        <name>Apache Software Foundation</name>
-        <url>http://www.apache.org</url>
-    </organization>
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>http://www.apache.org</url>
+  </organization>
 
 
   <build>
-         <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.2</version>
-                    <configuration>
-                        <forkMode>never</forkMode>
-                        <argLine>-enableassertions</argLine>
-                        <workingDirectory>${project.build.directory}</workingDirectory>
-
-                        <!-- Override the default, do not accept Test* as test classes
-->
-                        <!--<excludes>-->
-                            <!--<exclude>**/Abstract*.java</exclude>-->
-                            <!--<exclude>**/Test*.java</exclude>-->
-                        <!--</excludes>-->
-                        <!--<includes>-->
-                            <!--<include>**/*Test.java</include>-->
-                        <!--</includes>-->
-                    </configuration>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-clean-plugin</artifactId>
-                    <version>2.1</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-antrun-plugin</artifactId>
-                    <version>1.1</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <version>2.1</version>
-                    <configuration>
-                        <tarLongFileMode>gnu</tarLongFileMode>
-                    </configuration>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.1</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-clover-plugin</artifactId>
-                    <version>2.3</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <version>2.0-beta-4</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-one-plugin</artifactId>
-                    <version>1.0</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <version>2.1</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-war-plugin</artifactId>
-                    <version>2.0.1</version>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.maven</groupId>
-                            <artifactId>maven-archiver</artifactId>
-                            <!--
-                            FIXME: 2.1 is broken... won't allow custom manifestEntires, need
to use
-                                   until war plugin is updated.
-                            -->
-                            <version>2.2</version>
-                        </dependency>
-                    </dependencies>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-idea-plugin</artifactId>
-                    <version>2.0</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-eclipse-plugin</artifactId>
-                    <version>2.2</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>jspc-maven-plugin</artifactId>
-                    <version>1.4.5</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>1.0</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>dependency-maven-plugin</artifactId>
-                    <version>1.0</version>
-                </plugin>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.2</version>
+          <configuration>
+            <forkMode>never</forkMode>
+            <argLine>-enableassertions</argLine>
+            <workingDirectory>${project.build.directory}</workingDirectory>
+
+            <!-- Override the default, do not accept Test* as test classes -->
+            <!--<excludes>-->
+            <!--<exclude>**/Abstract*.java</exclude>-->
+            <!--<exclude>**/Test*.java</exclude>-->
+            <!--</excludes>-->
+            <!--<includes>-->
+            <!--<include>**/*Test.java</include>-->
+            <!--</includes>-->
+          </configuration>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>2.1</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-antrun-plugin</artifactId>
+          <version>1.1</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>2.1</version>
+          <configuration>
+            <tarLongFileMode>gnu</tarLongFileMode>
+          </configuration>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>2.1</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-clover-plugin</artifactId>
+          <version>2.3</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-release-plugin</artifactId>
+          <version>2.0-beta-4</version>
+        </plugin>
+
+        <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>
+          <version>2.1</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-war-plugin</artifactId>
+          <version>2.0.1</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.maven</groupId>
+              <artifactId>maven-archiver</artifactId>
+              <!--
+              FIXME: 2.1 is broken... won't allow custom manifestEntires, need to use
+                     until war plugin is updated.
+              -->
+              <version>2.2</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-idea-plugin</artifactId>
+          <version>2.0</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-eclipse-plugin</artifactId>
+          <version>2.2</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>jspc-maven-plugin</artifactId>
+          <version>1.4.5</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>build-helper-maven-plugin</artifactId>
+          <version>1.0</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>dependency-maven-plugin</artifactId>
+          <version>1.0</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>2.0-beta-5</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.directory.daemon</groupId>
+          <artifactId>daemon-plugin</artifactId>
+          <version>1.5.1-SNAPSHOT</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.directory.server</groupId>
+          <artifactId>apacheds-core-plugin</artifactId>
+          <version>1.5.1-SNAPSHOT</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.mortbay.jetty</groupId>
+          <artifactId>maven-jetty-plugin</artifactId>
+          <version>6.1.0rc2</version>
+        </plugin>
 
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-        <version>2.0-beta-5</version>
-      </plugin>
+      </plugins>
+    </pluginManagement>
 
-       <plugin>
-        <groupId>org.apache.directory.daemon</groupId>
-        <artifactId>daemon-plugin</artifactId>
-        <version>1.5.1-SNAPSHOT</version>
-       </plugin>
-      <plugin>
-        <groupId>org.apache.directory.server</groupId>
-        <artifactId>apacheds-core-plugin</artifactId>
-        <version>1.5.1-SNAPSHOT</version>
-      </plugin>
-
-      <plugin>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>maven-jetty-plugin</artifactId>
-        <version>6.1.0rc2</version>
-      </plugin>
-
-           </plugins>
-        </pluginManagement>
-
-   <plugins>
+    <plugins>
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -602,7 +616,13 @@
         <artifactId>maven-site-plugin</artifactId>
       </plugin>
 
-      
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+      </plugin>
+
+
+<!--
       <plugin>
         <inherited>false</inherited>
         <artifactId>maven-antrun-plugin</artifactId>
@@ -611,7 +631,8 @@
             <phase>site</phase>
             <configuration>
               <tasks>
-                <javadoc destdir="target/site/apidocs" author="true" use="true" windowtitle="Apache
Directory Triplesec">
+                <javadoc destdir="target/site/apidocs" author="true" use="true"
+                         windowtitle="Apache Directory Triplesec">
                   <sourcepath>
                     <dirset dir=".">
                       <include name="*/src/main/java"/>
@@ -628,7 +649,8 @@
           </execution>
         </executions>
       </plugin>
-      
+-->
+
     </plugins>
 
   </build>
@@ -660,7 +682,7 @@
       <activation>
         <activeByDefault>true</activeByDefault>
       </activation>
-    
+
       <modules>
         <module>bootstrap-partition</module>
         <module>changelog</module>
@@ -685,14 +707,16 @@
         <module>guardian-ldif</module>
         <module>utils-hauskeys</module>
       </modules>
-      
+
     </profile>
     <profile>
       <id>installers</id>
       <activation>
-        <property><name>installers</name></property>
+        <property>
+          <name>installers</name>
+        </property>
       </activation>
-    
+
       <modules>
         <module>bootstrap-partition</module>
         <module>changelog</module>
@@ -720,26 +744,30 @@
 
         <module>installers</module>
       </modules>
-      
+
     </profile>
     <profile>
       <id>smstrial</id>
       <activation>
-        <property><name>smstrial</name></property>
+        <property>
+          <name>smstrial</name>
+        </property>
       </activation>
-      
+
       <modules>
         <module>smstrial-schema</module>
         <module>webapp-smstrial</module>
       </modules>
-      
+
     </profile>
     <profile>
       <id>all</id>
       <activation>
-        <property><name>all</name></property>
+        <property>
+          <name>all</name>
+        </property>
       </activation>
-      
+
       <modules>
         <module>bootstrap-partition</module>
         <module>changelog</module>
@@ -765,10 +793,10 @@
 
         <module>smstrial-schema</module>
         <module>webapp-smstrial</module>
-        
+
         <module>installers</module>
       </modules>
-      
+
     </profile>
   </profiles>
 



Mime
View raw message