directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccust...@apache.org
Subject svn commit: r559610 - in /directory/triplesec/trunk: ./ admin-api/ changelog/ configuration-io/ configuration/ crypto/ guardian-api/ guardian-ldap/ guardian-ldif/ installers/ integration/ jaas/ main/ otp/ profile/ sms/ store/ swing-admin/ swing-demo/ t...
Date Wed, 25 Jul 2007 21:15:20 GMT
Author: ccustine
Date: Wed Jul 25 14:15:18 2007
New Revision: 559610

URL: http://svn.apache.org/viewvc?view=rev&rev=559610
Log:
DIRSERVER-1008 - Cleaned up logging configurations to get rid of commons-logging and use more
centralized config in parent poms.

Also renamed parent poms to provide unique project IDs for maven generated IDE projects.

Modified:
    directory/triplesec/trunk/admin-api/pom.xml
    directory/triplesec/trunk/changelog/pom.xml
    directory/triplesec/trunk/configuration-io/pom.xml
    directory/triplesec/trunk/configuration/pom.xml
    directory/triplesec/trunk/crypto/pom.xml
    directory/triplesec/trunk/guardian-api/pom.xml
    directory/triplesec/trunk/guardian-ldap/pom.xml
    directory/triplesec/trunk/guardian-ldif/pom.xml
    directory/triplesec/trunk/installers/pom.xml
    directory/triplesec/trunk/integration/pom.xml
    directory/triplesec/trunk/jaas/pom.xml
    directory/triplesec/trunk/main/pom.xml
    directory/triplesec/trunk/otp/pom.xml
    directory/triplesec/trunk/pom.xml
    directory/triplesec/trunk/profile/pom.xml
    directory/triplesec/trunk/sms/pom.xml
    directory/triplesec/trunk/store/pom.xml
    directory/triplesec/trunk/swing-admin/pom.xml
    directory/triplesec/trunk/swing-demo/pom.xml
    directory/triplesec/trunk/testdata/pom.xml
    directory/triplesec/trunk/tools/pom.xml
    directory/triplesec/trunk/utils-hauskeys/pom.xml
    directory/triplesec/trunk/verifier/pom.xml
    directory/triplesec/trunk/webapp-activation/pom.xml
    directory/triplesec/trunk/webapp-changelog/pom.xml
    directory/triplesec/trunk/webapp-config/pom.xml
    directory/triplesec/trunk/webapp-demo/pom.xml
    directory/triplesec/trunk/webapp-registration/pom.xml
    directory/triplesec/trunk/webapp-root/pom.xml
    directory/triplesec/trunk/webapp-servlet-demo/pom.xml
    directory/triplesec/trunk/webapp-wicket-admin/pom.xml
    directory/triplesec/trunk/wicket-tools/pom.xml

Modified: directory/triplesec/trunk/admin-api/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/admin-api/pom.xml?view=diff&rev=559610&r1=559609&r2=559610
==============================================================================
--- directory/triplesec/trunk/admin-api/pom.xml (original)
+++ directory/triplesec/trunk/admin-api/pom.xml Wed Jul 25 14:15:18 2007
@@ -23,7 +23,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.triplesec</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>triplesec-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>triplesec-admin-api</artifactId>

Modified: directory/triplesec/trunk/changelog/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/changelog/pom.xml?view=diff&rev=559610&r1=559609&r2=559610
==============================================================================
--- directory/triplesec/trunk/changelog/pom.xml (original)
+++ directory/triplesec/trunk/changelog/pom.xml Wed Jul 25 14:15:18 2007
@@ -23,7 +23,7 @@
 <project>
   <parent>
     <groupId>org.apache.directory.triplesec</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>triplesec-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -39,10 +39,6 @@
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-server-jndi</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
     </dependency>
   </dependencies>
 

Modified: directory/triplesec/trunk/configuration-io/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/configuration-io/pom.xml?view=diff&rev=559610&r1=559609&r2=559610
==============================================================================
--- directory/triplesec/trunk/configuration-io/pom.xml (original)
+++ directory/triplesec/trunk/configuration-io/pom.xml Wed Jul 25 14:15:18 2007
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.triplesec</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>triplesec-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>triplesec-configuration-io</artifactId>
@@ -54,11 +54,6 @@
     </dependency>
 
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-    </dependency>
-
-    <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
     </dependency>
@@ -75,11 +70,6 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
     </dependency>
 
     <dependency>

Modified: directory/triplesec/trunk/configuration/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/configuration/pom.xml?view=diff&rev=559610&r1=559609&r2=559610
==============================================================================
--- directory/triplesec/trunk/configuration/pom.xml (original)
+++ directory/triplesec/trunk/configuration/pom.xml Wed Jul 25 14:15:18 2007
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.triplesec</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>triplesec-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>triplesec-configuration</artifactId>
@@ -36,10 +36,5 @@
       <artifactId>apacheds-server-jndi</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <scope>provided</scope>
-    </dependency>
   </dependencies>
 </project>

Modified: directory/triplesec/trunk/crypto/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/crypto/pom.xml?view=diff&rev=559610&r1=559609&r2=559610
==============================================================================
--- directory/triplesec/trunk/crypto/pom.xml (original)
+++ directory/triplesec/trunk/crypto/pom.xml Wed Jul 25 14:15:18 2007
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.triplesec</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>triplesec-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>triplesec-crypto</artifactId>

Modified: directory/triplesec/trunk/guardian-api/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/guardian-api/pom.xml?view=diff&rev=559610&r1=559609&r2=559610
==============================================================================
--- directory/triplesec/trunk/guardian-api/pom.xml (original)
+++ directory/triplesec/trunk/guardian-api/pom.xml Wed Jul 25 14:15:18 2007
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.triplesec</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>triplesec-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>triplesec-guardian-api</artifactId>

Modified: directory/triplesec/trunk/guardian-ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/guardian-ldap/pom.xml?view=diff&rev=559610&r1=559609&r2=559610
==============================================================================
--- directory/triplesec/trunk/guardian-ldap/pom.xml (original)
+++ directory/triplesec/trunk/guardian-ldap/pom.xml Wed Jul 25 14:15:18 2007
@@ -23,7 +23,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.triplesec</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>triplesec-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>triplesec-guardian-ldap</artifactId>
@@ -33,11 +33,6 @@
   </description>
   <packaging>jar</packaging>  
   <dependencies>
-    <dependency>
-      <artifactId>nlog4j</artifactId>
-      <groupId>org.slf4j</groupId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <artifactId>triplesec-guardian-api</artifactId>
       <groupId>${pom.groupId}</groupId>

Modified: directory/triplesec/trunk/guardian-ldif/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/guardian-ldif/pom.xml?view=diff&rev=559610&r1=559609&r2=559610
==============================================================================
--- directory/triplesec/trunk/guardian-ldif/pom.xml (original)
+++ directory/triplesec/trunk/guardian-ldif/pom.xml Wed Jul 25 14:15:18 2007
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.triplesec</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>triplesec-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>triplesec-guardian-ldif</artifactId>
@@ -31,11 +31,6 @@
   </description>
   <packaging>jar</packaging>  
   <dependencies>
-    <dependency>
-      <artifactId>nlog4j</artifactId>
-      <groupId>org.slf4j</groupId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <artifactId>shared-ldap</artifactId>
       <groupId>org.apache.directory.shared</groupId>

Modified: directory/triplesec/trunk/installers/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/installers/pom.xml?view=diff&rev=559610&r1=559609&r2=559610
==============================================================================
--- directory/triplesec/trunk/installers/pom.xml (original)
+++ directory/triplesec/trunk/installers/pom.xml Wed Jul 25 14:15:18 2007
@@ -24,7 +24,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.triplesec</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>triplesec-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>triplesec-installers</artifactId>
@@ -111,10 +111,6 @@
       <artifactId>apacheds-server-tools</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-    </dependency>
-    <dependency>
       <groupId>commons-daemon</groupId>
       <artifactId>commons-daemon</artifactId>
     </dependency>
@@ -133,10 +129,6 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>

Modified: directory/triplesec/trunk/integration/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/integration/pom.xml?view=diff&rev=559610&r1=559609&r2=559610
==============================================================================
--- directory/triplesec/trunk/integration/pom.xml (original)
+++ directory/triplesec/trunk/integration/pom.xml Wed Jul 25 14:15:18 2007
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.triplesec</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>triplesec-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>triplesec-integration</artifactId>
@@ -33,10 +33,6 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>

Modified: directory/triplesec/trunk/jaas/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/jaas/pom.xml?view=diff&rev=559610&r1=559609&r2=559610
==============================================================================
--- directory/triplesec/trunk/jaas/pom.xml (original)
+++ directory/triplesec/trunk/jaas/pom.xml Wed Jul 25 14:15:18 2007
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.triplesec</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>triplesec-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>triplesec-jaas</artifactId>
@@ -50,10 +50,5 @@
       <version>${project.version}</version>
     </dependency>
     
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <scope>provided</scope>
-    </dependency>
   </dependencies>
 </project>

Modified: directory/triplesec/trunk/main/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/main/pom.xml?view=diff&rev=559610&r1=559609&r2=559610
==============================================================================
--- directory/triplesec/trunk/main/pom.xml (original)
+++ directory/triplesec/trunk/main/pom.xml Wed Jul 25 14:15:18 2007
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.triplesec</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>triplesec-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>triplesec-main</artifactId>
@@ -124,21 +124,12 @@
       <artifactId>ant</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>

Modified: directory/triplesec/trunk/otp/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/otp/pom.xml?view=diff&rev=559610&r1=559609&r2=559610
==============================================================================
--- directory/triplesec/trunk/otp/pom.xml (original)
+++ directory/triplesec/trunk/otp/pom.xml Wed Jul 25 14:15:18 2007
@@ -23,7 +23,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.triplesec</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>triplesec-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>triplesec-otp</artifactId>

Modified: directory/triplesec/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/pom.xml?view=diff&rev=559610&r1=559609&r2=559610
==============================================================================
--- directory/triplesec/trunk/pom.xml (original)
+++ directory/triplesec/trunk/pom.xml Wed Jul 25 14:15:18 2007
@@ -31,7 +31,7 @@
 
   <groupId>org.apache.directory.triplesec</groupId>
   <version>1.0-SNAPSHOT</version>
-  <artifactId>build</artifactId>
+  <artifactId>triplesec-parent</artifactId>
   <name>Triplesec</name>
   <packaging>pom</packaging>
 
@@ -39,6 +39,36 @@
     <dependencies>
 
       <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-log4j12</artifactId>
+        <version>1.4.0</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>jcl104-over-slf4j</artifactId>
+        <version>1.4.0</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>1.4.0</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>nlog4j</artifactId>
+        <version>1.2.25</version>
+      </dependency>
+
+      <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>1.2.13</version>
+      </dependency>
+
+      <dependency>
         <groupId>wicket</groupId>
         <artifactId>wicket</artifactId>
         <version>1.2.4</version>
@@ -75,12 +105,6 @@
       </dependency>
 
       <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
-        <version>1.2.13</version>
-      </dependency>
-
-      <dependency>
         <groupId>commons-httpclient</groupId>
         <artifactId>commons-httpclient</artifactId>
         <version>3.0.1</version>
@@ -242,18 +266,6 @@
       </dependency>
 
       <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
-        <version>1.0.4</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>nlog4j</artifactId>
-        <version>1.2.25</version>
-      </dependency>
-
-      <dependency>
         <groupId>antlr</groupId>
         <artifactId>antlr</artifactId>
         <version>2.7.6</version>
@@ -274,19 +286,19 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-core</artifactId>
-        <version>1.2.8</version>
+        <version>1.2.9</version>
       </dependency>
 
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-beans</artifactId>
-        <version>1.2.8</version>
+        <version>1.2.9</version>
       </dependency>
 
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-context</artifactId>
-        <version>1.2.8</version>
+        <version>1.2.9</version>
       </dependency>
 
       <dependency>
@@ -334,6 +346,27 @@
   </dependencyManagement>
 
   <dependencies>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.4.0</version>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl104-over-slf4j</artifactId>
+      <version>1.4.0</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.4.0</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

Modified: directory/triplesec/trunk/profile/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/profile/pom.xml?view=diff&rev=559610&r1=559609&r2=559610
==============================================================================
--- directory/triplesec/trunk/profile/pom.xml (original)
+++ directory/triplesec/trunk/profile/pom.xml Wed Jul 25 14:15:18 2007
@@ -23,7 +23,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.triplesec</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>triplesec-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>triplesec-profile</artifactId>

Modified: directory/triplesec/trunk/sms/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/sms/pom.xml?view=diff&rev=559610&r1=559609&r2=559610
==============================================================================
--- directory/triplesec/trunk/sms/pom.xml (original)
+++ directory/triplesec/trunk/sms/pom.xml Wed Jul 25 14:15:18 2007
@@ -23,7 +23,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.triplesec</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>triplesec-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>triplesec-sms</artifactId>
@@ -36,14 +36,6 @@
     <dependency>
       <groupId>commons-httpclient</groupId>
       <artifactId>commons-httpclient</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>

Modified: directory/triplesec/trunk/store/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/store/pom.xml?view=diff&rev=559610&r1=559609&r2=559610
==============================================================================
--- directory/triplesec/trunk/store/pom.xml (original)
+++ directory/triplesec/trunk/store/pom.xml Wed Jul 25 14:15:18 2007
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.triplesec</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>triplesec-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>triplesec-store</artifactId>
@@ -43,11 +43,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>triplesec-jaas</artifactId>
       <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.server</groupId>

Modified: directory/triplesec/trunk/swing-admin/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/pom.xml?view=diff&rev=559610&r1=559609&r2=559610
==============================================================================
--- directory/triplesec/trunk/swing-admin/pom.xml (original)
+++ directory/triplesec/trunk/swing-admin/pom.xml Wed Jul 25 14:15:18 2007
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.triplesec</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>triplesec-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>triplesec-swing-admin</artifactId>
@@ -53,11 +53,6 @@
       <groupId>${pom.groupId}</groupId>
       <artifactId>triplesec-guardian-ldap</artifactId>
       <version>${pom.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
     </dependency>
 
     <dependency>

Modified: directory/triplesec/trunk/swing-demo/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-demo/pom.xml?view=diff&rev=559610&r1=559609&r2=559610
==============================================================================
--- directory/triplesec/trunk/swing-demo/pom.xml (original)
+++ directory/triplesec/trunk/swing-demo/pom.xml Wed Jul 25 14:15:18 2007
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.triplesec</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>triplesec-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>triplesec-swing-demo</artifactId>
@@ -33,10 +33,6 @@
   </description>
   <packaging>jar</packaging>  
   <dependencies>
-    <dependency>
-      <artifactId>nlog4j</artifactId>
-      <groupId>org.slf4j</groupId>
-    </dependency>
     <dependency>
       <artifactId>triplesec-guardian-ldap</artifactId>
       <groupId>${pom.groupId}</groupId>

Modified: directory/triplesec/trunk/testdata/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/testdata/pom.xml?view=diff&rev=559610&r1=559609&r2=559610
==============================================================================
--- directory/triplesec/trunk/testdata/pom.xml (original)
+++ directory/triplesec/trunk/testdata/pom.xml Wed Jul 25 14:15:18 2007
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.triplesec</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>triplesec-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>triplesec-testdata</artifactId>

Modified: directory/triplesec/trunk/tools/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/tools/pom.xml?view=diff&rev=559610&r1=559609&r2=559610
==============================================================================
--- directory/triplesec/trunk/tools/pom.xml (original)
+++ directory/triplesec/trunk/tools/pom.xml Wed Jul 25 14:15:18 2007
@@ -24,7 +24,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.triplesec</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>triplesec-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>triplesec-tools</artifactId>

Modified: directory/triplesec/trunk/utils-hauskeys/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/utils-hauskeys/pom.xml?view=diff&rev=559610&r1=559609&r2=559610
==============================================================================
--- directory/triplesec/trunk/utils-hauskeys/pom.xml (original)
+++ directory/triplesec/trunk/utils-hauskeys/pom.xml Wed Jul 25 14:15:18 2007
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.triplesec</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>triplesec-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>triplesec-utils-hauskeys</artifactId>

Modified: directory/triplesec/trunk/verifier/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/verifier/pom.xml?view=diff&rev=559610&r1=559609&r2=559610
==============================================================================
--- directory/triplesec/trunk/verifier/pom.xml (original)
+++ directory/triplesec/trunk/verifier/pom.xml Wed Jul 25 14:15:18 2007
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.triplesec</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>triplesec-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>triplesec-verifier</artifactId>
@@ -53,11 +53,6 @@
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core-unit</artifactId>
       <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <scope>provided</scope>
     </dependency>
   </dependencies>
 

Modified: directory/triplesec/trunk/webapp-activation/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-activation/pom.xml?view=diff&rev=559610&r1=559609&r2=559610
==============================================================================
--- directory/triplesec/trunk/webapp-activation/pom.xml (original)
+++ directory/triplesec/trunk/webapp-activation/pom.xml Wed Jul 25 14:15:18 2007
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.triplesec</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>triplesec-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>triplesec-webapp-activation</artifactId>
@@ -88,12 +88,6 @@
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-servlet_2.4_spec</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>
 

Modified: directory/triplesec/trunk/webapp-changelog/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-changelog/pom.xml?view=diff&rev=559610&r1=559609&r2=559610
==============================================================================
--- directory/triplesec/trunk/webapp-changelog/pom.xml (original)
+++ directory/triplesec/trunk/webapp-changelog/pom.xml Wed Jul 25 14:15:18 2007
@@ -21,7 +21,7 @@
 -->
 
   <parent>
-    <artifactId>build</artifactId>
+    <artifactId>triplesec-parent</artifactId>
     <groupId>org.apache.directory.triplesec</groupId>
     <version>1.0-SNAPSHOT</version>
   </parent>
@@ -63,10 +63,6 @@
       <artifactId>jstl</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-    <dependency>
       <groupId>commons-el</groupId>
       <artifactId>commons-el</artifactId>
     </dependency>
@@ -105,16 +101,8 @@
       <artifactId>xercesImpl</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-    </dependency>
-    <dependency>
       <groupId>jetty</groupId>
       <artifactId>org.mortbay.jetty</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
     </dependency>
   </dependencies>
 

Modified: directory/triplesec/trunk/webapp-config/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-config/pom.xml?view=diff&rev=559610&r1=559609&r2=559610
==============================================================================
--- directory/triplesec/trunk/webapp-config/pom.xml (original)
+++ directory/triplesec/trunk/webapp-config/pom.xml Wed Jul 25 14:15:18 2007
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.triplesec</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>triplesec-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>triplesec-webapp-config</artifactId>
@@ -29,6 +29,7 @@
   <packaging>war</packaging>  
   <build>
     <finalName>tsec-config</finalName>
+<!--
     <plugins>
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
@@ -44,6 +45,7 @@
         </configuration>
       </plugin>
     </plugins>
+-->
   </build>
   <dependencies>
     <dependency>
@@ -56,10 +58,6 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-    </dependency>
-    <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>triplesec-integration</artifactId>
       <version>${pom.version}</version>
@@ -80,11 +78,6 @@
       <groupId>${pom.groupId}</groupId>
       <artifactId>triplesec-main</artifactId>
       <version>${pom.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: directory/triplesec/trunk/webapp-demo/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/pom.xml?view=diff&rev=559610&r1=559609&r2=559610
==============================================================================
--- directory/triplesec/trunk/webapp-demo/pom.xml (original)
+++ directory/triplesec/trunk/webapp-demo/pom.xml Wed Jul 25 14:15:18 2007
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.triplesec</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>triplesec-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>triplesec-webapp-demo</artifactId>
@@ -59,10 +59,6 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-    </dependency>
-    <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>triplesec-integration</artifactId>
       <version>${pom.version}</version>
@@ -72,11 +68,6 @@
       <groupId>${pom.groupId}</groupId>
       <artifactId>triplesec-main</artifactId>
       <version>${pom.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: directory/triplesec/trunk/webapp-registration/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-registration/pom.xml?view=diff&rev=559610&r1=559609&r2=559610
==============================================================================
--- directory/triplesec/trunk/webapp-registration/pom.xml (original)
+++ directory/triplesec/trunk/webapp-registration/pom.xml Wed Jul 25 14:15:18 2007
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.triplesec</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>triplesec-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>triplesec-webapp-registration</artifactId>
@@ -56,10 +56,6 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-    </dependency>
-    <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>triplesec-integration</artifactId>
       <version>${pom.version}</version>
@@ -92,11 +88,6 @@
     <dependency>
       <groupId>javax.mail</groupId>
       <artifactId>mail</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <scope>provided</scope>
     </dependency>
   </dependencies>
 

Modified: directory/triplesec/trunk/webapp-root/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-root/pom.xml?view=diff&rev=559610&r1=559609&r2=559610
==============================================================================
--- directory/triplesec/trunk/webapp-root/pom.xml (original)
+++ directory/triplesec/trunk/webapp-root/pom.xml Wed Jul 25 14:15:18 2007
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.triplesec</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>triplesec-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>triplesec-webapp-root</artifactId>

Modified: directory/triplesec/trunk/webapp-servlet-demo/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-servlet-demo/pom.xml?view=diff&rev=559610&r1=559609&r2=559610
==============================================================================
--- directory/triplesec/trunk/webapp-servlet-demo/pom.xml (original)
+++ directory/triplesec/trunk/webapp-servlet-demo/pom.xml Wed Jul 25 14:15:18 2007
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.triplesec</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>triplesec-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>triplesec-webapp-servlet-demo</artifactId>
@@ -51,10 +51,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>triplesec-guardian-ldap</artifactId>
       <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>

Modified: directory/triplesec/trunk/webapp-wicket-admin/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-wicket-admin/pom.xml?view=diff&rev=559610&r1=559609&r2=559610
==============================================================================
--- directory/triplesec/trunk/webapp-wicket-admin/pom.xml (original)
+++ directory/triplesec/trunk/webapp-wicket-admin/pom.xml Wed Jul 25 14:15:18 2007
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.triplesec</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>triplesec-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>triplesec-wicket-admin</artifactId>
@@ -56,10 +56,6 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-    </dependency>
-    <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>triplesec-main</artifactId>
       <version>${pom.version}</version>
@@ -77,11 +73,6 @@
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <scope>provided</scope>
     </dependency>
   </dependencies>
 

Modified: directory/triplesec/trunk/wicket-tools/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/wicket-tools/pom.xml?view=diff&rev=559610&r1=559609&r2=559610
==============================================================================
--- directory/triplesec/trunk/wicket-tools/pom.xml (original)
+++ directory/triplesec/trunk/wicket-tools/pom.xml Wed Jul 25 14:15:18 2007
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.triplesec</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>triplesec-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>triplesec-wicket-tools</artifactId>



Mime
View raw message