directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r589366 - in /directory/triplesec/branches/rewrite: crypto/pom.xml pom.xml
Date Sun, 28 Oct 2007 14:42:11 GMT
Author: akarasulu
Date: Sun Oct 28 07:42:11 2007
New Revision: 589366

URL: http://svn.apache.org/viewvc?rev=589366&view=rev
Log:
simplifying and chopping things up for ground up rewrite

Modified:
    directory/triplesec/branches/rewrite/crypto/pom.xml
    directory/triplesec/branches/rewrite/pom.xml

Modified: directory/triplesec/branches/rewrite/crypto/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/branches/rewrite/crypto/pom.xml?rev=589366&r1=589365&r2=589366&view=diff
==============================================================================
--- directory/triplesec/branches/rewrite/crypto/pom.xml (original)
+++ directory/triplesec/branches/rewrite/crypto/pom.xml Sun Oct 28 07:42:11 2007
@@ -21,14 +21,17 @@
   <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>
   <name>Triplesec Crypto API</name>
   <description>
     Cryptography packages for various algorithms. These are classes forked from
-    Bouncy Castle to include within a midlet to keep it's footprint small. 
+    Bouncy Castle to include within a midlet to keep it's footprint as small
+    as possible rather than including the entire JME distribution with unused
+    algorithms.  A fork with package renaming was required to prevent the 
+    potential for class conflicts in various server side modules.
   </description>
   <packaging>jar</packaging>  
 </project>

Modified: directory/triplesec/branches/rewrite/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/branches/rewrite/pom.xml?rev=589366&r1=589365&r2=589366&view=diff
==============================================================================
--- directory/triplesec/branches/rewrite/pom.xml (original)
+++ directory/triplesec/branches/rewrite/pom.xml Sun Oct 28 07:42:11 2007
@@ -26,319 +26,28 @@
   <parent>
     <groupId>org.apache.directory.project</groupId>
     <artifactId>project</artifactId>
-    <version>7</version>
+    <version>9-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.directory.triplesec</groupId>
   <version>1.0-SNAPSHOT</version>
-  <artifactId>build</artifactId>
+  <artifactId>triplesec-parent</artifactId>
   <url>http://directory.apache.org/triplesec/</url>
-  <inceptionYear>2005</inceptionYear>
+  <inceptionYear>2004</inceptionYear>
   <name>Triplesec</name>
   <packaging>pom</packaging>
 
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/directory/triplesec/trunk</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/directory/triplesec/trunk</developerConnection>
-    <url>https://svn.apache.org/viewvc/directory/triplesec/trunk</url>
-  </scm>
-
-  <issueManagement>
-    <system>JIRA</system>
-    <url>https://issues.apache.org/jira/browse/DIRTSEC</url>
-  </issueManagement>
-
-  <!-- might not be need since latest activation and mail jars are in ibiblio now -->
-  <repositories>
-    <repository>
-      <id>java.net</id>
-      <url>https://maven-repository.dev.java.net/nonav/repository</url>
-      <layout>legacy</layout>
-    </repository>
-  </repositories>
+  <modules>
+    <module>crypto</module>
+  </modules>
 
   <dependencyManagement>
     <dependencies>
-    
-      <!--
-                W E B   J A R S :  W I C K E T,   J E T T Y,   T O M C A T,   G E R O N I
M O  
-                -->
-
-      <dependency>
-        <groupId>wicket</groupId>
-        <artifactId>wicket</artifactId>
-        <version>1.2.6</version>
-      </dependency>
-
-      <dependency>
-        <groupId>wicket</groupId>
-        <artifactId>wicket-spring</artifactId>
-        <version>1.2.6</version>
-      </dependency>
-
-      <dependency>
-        <groupId>wicket</groupId>
-        <artifactId>wicket-extensions</artifactId>
-        <version>1.2.6</version>
-      </dependency>
-
-      <dependency>
-        <!-- check to see if this dependency is correct and/or if we need to have jetty-embedded
-->
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>jetty</artifactId>
-        <version>6.1.4</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-servlet_2.4_spec</artifactId>
-        <version>1.0.1</version>
-      </dependency>
-
-      <!--
-                S U N   J A R S 
-                -->
-
-      <dependency>
-        <groupId>javax.activation</groupId>
-        <artifactId>activation</artifactId>
-        <version>1.1</version>
-      </dependency>
-
-      <dependency>
-        <groupId>javax.mail</groupId>
-        <artifactId>mail</artifactId>
-        <version>1.4</version>
-      </dependency>
-
-      <!--
-                A P A C H E   C O M M O N S   J A R S 
-                -->
-
-      <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>commons-codec</groupId>
-        <artifactId>commons-codec</artifactId>
-        <version>1.2</version>
-      </dependency>
-
-      <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <version>1.3.1</version>
-      </dependency>
-
-      <dependency>
-        <groupId>commons-collections</groupId>
-        <artifactId>commons-collections</artifactId>
-        <version>3.2</version>
-      </dependency>
-
-      <dependency>
-        <groupId>commons-daemon</groupId>
-        <artifactId>commons-daemon</artifactId>
-        <version>1.0.1</version>
-      </dependency>
-
-      <dependency>
-        <groupId>commons-lang</groupId>
-        <artifactId>commons-lang</artifactId>
-        <version>2.3</version>
-      </dependency>
-
-      <dependency>
-        <groupId>commons-cli</groupId>
-        <artifactId>commons-cli</artifactId>
-        <version>1.0</version>
-      </dependency>
-
-      <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
-        <version>1.1</version>
-      </dependency>
-
-      <dependency>
-        <groupId>commons-httpclient</groupId>
-        <artifactId>commons-httpclient</artifactId>
-        <version>3.0.1</version>
-      </dependency>
-
-      <!--
-                L O G G I N G   J A R S 
-                -->
-
-      <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
-        <version>1.2.13</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>nlog4j</artifactId>
-        <version>1.2.25</version>
-      </dependency>
-
-      <!--
-                M I S C   A P A C H E   J A R S 
-                -->
-
-      <dependency>
-        <groupId>ant</groupId>
-        <artifactId>ant</artifactId>
-        <version>1.6.5</version>
-      </dependency>
-
-      <dependency> <!-- might not be needed if we switch to config in DIT and go
all wicket w/o jsp -->
-        <groupId>xerces</groupId>
-        <artifactId>xmlParserAPIs</artifactId>
-        <version>2.6.2</version>
-      </dependency>
-    
-      <dependency> <!-- might not be needed if we switch to config in DIT and go
all wicket w/o jsp -->
-        <groupId>xerces</groupId>
-        <artifactId>xercesImpl</artifactId>
-        <version>2.6.2</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.derby</groupId>
-        <artifactId>derby</artifactId>
-        <version>10.2.2.0</version>
-      </dependency>
-
-      <!--
-                A P A C H E   D I R E C T O R Y   J A R S 
-                -->
- 
-      <dependency>
-        <groupId>org.apache.directory.server</groupId>
-        <artifactId>apacheds-core</artifactId>
-        <version>1.5.1-SNAPSHOT</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-ldap</artifactId>
-        <version>1.5.1-SNAPSHOT</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.directory.server</groupId>
-        <artifactId>apacheds-core-unit</artifactId>
-        <version>1.5.1-SNAPSHOT</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.directory.server</groupId>
-        <artifactId>apacheds-kerberos-shared</artifactId>
-        <version>1.5.1-SNAPSHOT</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.directory.server</groupId>
-        <artifactId>apacheds-protocol-kerberos</artifactId>
-        <version>1.5.1-SNAPSHOT</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.directory.server</groupId>
-        <artifactId>apacheds-server-ssl</artifactId>
-        <version>1.5.1-SNAPSHOT</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.directory.server</groupId>
-        <artifactId>apacheds-server-tools</artifactId>
-        <version>1.5.1-SNAPSHOT</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.directory.server</groupId>
-        <artifactId>apacheds-core-shared</artifactId>
-        <version>1.5.1-SNAPSHOT</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.directory.server</groupId>
-        <artifactId>apacheds-server-jndi</artifactId>
-        <version>1.5.1-SNAPSHOT</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-asn1-codec</artifactId>
-        <version>0.9.7-SNAPSHOT</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.directory.daemon</groupId>
-        <artifactId>daemon-bootstrappers</artifactId>
-        <version>1.1.1-SNAPSHOT</version>
-      </dependency>
-
-      <!--
-                M I S C   J A R S 
-                -->
-
-      <dependency>
-        <groupId>antlr</groupId>
-        <artifactId>antlr</artifactId>
-        <version>2.7.7</version>
-      </dependency>
-
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>3.8.1</version>
+        <version>4.4</version>
       </dependency>
-
-      <dependency> <!-- might not be needed if we switch to config in DIT -->
-        <groupId>dom4j</groupId>
-        <artifactId>dom4j</artifactId>
-        <version>1.6</version>
-      </dependency>
-
-      <dependency>
-        <groupId>jcharts</groupId>
-        <artifactId>jcharts</artifactId>
-        <version>0.6.0</version>
-      </dependency>
-      
-      <!--
-                S P R I N G   J A R S 
-                -->
- 
-     <dependency> <!-- might not be needed if we switch to config in DIT -->
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-core</artifactId>
-        <version>1.2.9</version>
-      </dependency>
-
-      <dependency> <!-- might not be needed if we switch to config in DIT -->
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-beans</artifactId>
-        <version>1.2.9</version>
-      </dependency>
-
-      <dependency> <!-- might not be needed if we switch to config in DIT -->
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-context</artifactId>
-        <version>1.2.9</version>
-      </dependency>
-
     </dependencies>
   </dependencyManagement>
 
@@ -350,162 +59,9 @@
     </dependency>
   </dependencies>
 
-  <!-- ordered alphabetically by id -->
-  <developers>
-    <developer>
-      <id>akarasulu</id>
-    </developer>
-    <developer>
-      <id>ccustine</id>
-    </developer>
-    <developer>
-      <id>ckoppelt</id>
-    </developer>
-    <developer>
-      <id>ersiner</id>
-    </developer>
-    <developer>
-      <id>elecharny</id>
-    </developer>
-    <developer>
-      <id>tbennett</id>
-    </developer>
-    <developer>
-      <id>trustin</id>
-    </developer>
-  </developers>
-
   <build>
     <pluginManagement>
       <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.3</version>
-          <configuration>
-            <!-- I have a feeling these create serious issues with classloading through
maven 
-                                      resulting in the failure of IDEs to set breakpoints.
 It may also explain issues
-                                      with log4j configuration and with NT locking issues
when cleaning out test dirs.
-                                      
-                                      <forkMode>once</forkMode>
-                                      <argLine>-enableassertions -Dgeronimo.bootstrap.logging.enabled=false
-Dlog4j.configuration=org/apache/geronimo/test-log4j.properties</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.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.2</version>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-clover-plugin</artifactId>
-          <version>2.4</version>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-release-plugin</artifactId>
-          <version>2.0-beta-6</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.2</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.1</version>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-eclipse-plugin</artifactId>
-          <version>2.3</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.1.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.4</version>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.0.2</version>
-        </plugin>
-
       </plugins>
     </pluginManagement>
   
@@ -518,208 +74,6 @@
           <target>1.5</target>
         </configuration>
       </plugin>
-
-      <plugin>
-        <inherited>false</inherited>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>site</phase>
-            <configuration>
-              <tasks>
-                <javadoc destdir="target/site/apidocs" author="true" use="true" windowtitle="Apache
Directory Triplesec">
-                  <sourcepath>
-                    <dirset dir=".">
-                      <include name="*/src/main/java"/>
-                      <exclude name="directory"/>
-                    </dirset>
-                  </sourcepath>
-                  <package name="org.safehaus.triplesec.*"/>
-                </javadoc>
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
-
-  <reporting>
-    <excludeDefaults>true</excludeDefaults>
-    <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>
-      </plugin>
-    </plugins>
-  </reporting>
-
-  <profiles>
-    <profile>
-      <id>default</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-    
-      <modules>
-        <module>crypto</module>
-
-        <!--
-        <module>changelog</module>
-        <module>configuration</module>
-        <module>configuration-io</module>
-        <module>otp</module>
-        <module>profile</module>
-        <module>testdata</module>
-        <module>jaas</module>
-        <module>sms</module>
-        <module>store</module>
-        <module>verifier</module>
-        <module>main</module>
-        <module>integration</module>
-        <module>tools</module>
-        <module>admin-api</module>
-        <module>guardian-api</module>
-        <module>guardian-ldap</module>
-        <module>guardian-ldif</module>
-        <module>utils-hauskeys</module>
-        <module>wicket-tools</module>
-        <module>webapp-root</module>
-        <module>webapp-registration</module>
-        <module>webapp-activation</module>
-        <module>webapp-demo</module>
-        <module>webapp-servlet-demo</module>
-        <module>webapp-wicket-admin</module>
-        <module>webapp-config</module>
-        <module>webapp-changelog</module>
-        <module>swing-admin</module>
-        <module>swing-demo</module>
-        -->
-      </modules>
-      
-    </profile>
-    <profile>
-      <id>installers</id>
-      <activation>
-        <property><name>installers</name></property>
-      </activation>
-    
-      <modules>
-        <module>crypto</module>
-
-        <!--
-        <module>changelog</module>
-        <module>configuration</module>
-        <module>configuration-io</module>
-        <module>otp</module>
-        <module>profile</module>
-        <module>testdata</module>
-        <module>jaas</module>
-        <module>sms</module>
-        <module>store</module>
-        <module>verifier</module>
-        <module>main</module>
-        <module>integration</module>
-        <module>tools</module>
-        <module>admin-api</module>
-        <module>guardian-api</module>
-        <module>guardian-ldap</module>
-        <module>guardian-ldif</module>
-        <module>utils-hauskeys</module>
-        <module>wicket-tools</module>
-        <module>webapp-root</module>
-        <module>webapp-registration</module>
-        <module>webapp-activation</module>
-        <module>webapp-demo</module>
-        <module>webapp-servlet-demo</module>
-        <module>webapp-wicket-admin</module>
-        <module>webapp-config</module>
-        <module>webapp-changelog</module>
-        <module>smstrial-schema</module>
-        <module>webapp-smstrial</module>
-        <module>swing-admin</module>
-        <module>swing-demo</module>
-        
-        <module>installers</module>
-        -->
-      </modules>
-      
-    </profile>
-    <profile>
-      <id>smstrial</id>
-      <activation>
-        <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>
-      </activation>
- 
-      <modules>
-        <module>crypto</module>
-
-        <!--
-        <module>changelog</module>
-        <module>configuration</module>
-        <module>configuration-io</module>
-        <module>otp</module>
-        <module>profile</module>
-        <module>testdata</module>
-        <module>jaas</module>
-        <module>sms</module>
-        <module>store</module>
-        <module>verifier</module>
-        <module>main</module>
-        <module>integration</module>
-        <module>tools</module>
-        <module>admin-api</module>
-        <module>guardian-api</module>
-        <module>guardian-ldap</module>
-        <module>guardian-ldif</module>
-        <module>utils-hauskeys</module>
-        <module>wicket-tools</module>
-        <module>webapp-root</module>
-        <module>webapp-registration</module>
-        <module>webapp-activation</module>
-        <module>webapp-demo</module>
-        <module>webapp-servlet-demo</module>
-        <module>webapp-wicket-admin</module>
-        <module>webapp-config</module>
-        <module>webapp-changelog</module>
-        <module>swing-admin</module>
-        <module>swing-demo</module>
-        
-        <module>smstrial-schema</module>
-        <module>webapp-smstrial</module>
-        
-        <module>installers</module>
-        -->
-      </modules>
-      
-    </profile>
-  </profiles>
 </project>



Mime
View raw message