directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r330706 - in /directory/apacheds/trunk: ./ core-unit/ core-unit/src/ core-unit/src/main/ core-unit/src/main/java/ core-unit/src/test/ core-unit/src/test/java/ core/src/main/java/org/apache/ldap/server/schema/ core/src/test/java/ core/src/te...
Date Fri, 04 Nov 2005 04:59:26 GMT
Author: akarasulu
Date: Thu Nov  3 20:59:10 2005
New Revision: 330706

URL: http://svn.apache.org/viewcvs?rev=330706&view=rev
Log:
changes ...

 o preparing to move unit test cases
 o made directory layouts consistent with maven 2 project layout
 o fixed changes due to package changes on unit test base classes in core

Added:
    directory/apacheds/trunk/core-unit/   (with props)
    directory/apacheds/trunk/core-unit/project.properties
    directory/apacheds/trunk/core-unit/project.xml
    directory/apacheds/trunk/core-unit/src/
    directory/apacheds/trunk/core-unit/src/main/
    directory/apacheds/trunk/core-unit/src/main/java/
    directory/apacheds/trunk/core-unit/src/test/
    directory/apacheds/trunk/core-unit/src/test/java/
    directory/apacheds/trunk/core/src/test/java/
    directory/apacheds/trunk/core/src/test/java/org/
      - copied from r330695, directory/apacheds/trunk/core/src/test/org/
    directory/apacheds/trunk/core/src/test/java/org/apache/
      - copied from r330705, directory/apacheds/trunk/core/src/test/org/apache/
    directory/apacheds/trunk/main/src/test/java/
    directory/apacheds/trunk/main/src/test/java/org/
      - copied from r330497, directory/apacheds/trunk/main/src/test/org/
    directory/apacheds/trunk/main/src/test/java/org/apache/
      - copied from r330705, directory/apacheds/trunk/main/src/test/org/apache/
    directory/apacheds/trunk/plugin/src/test/java/
    directory/apacheds/trunk/plugin/src/test/java/org/
      - copied from r330497, directory/apacheds/trunk/plugin/src/test/org/
    directory/apacheds/trunk/plugin/src/test/java/org/apache/
      - copied from r330705, directory/apacheds/trunk/plugin/src/test/org/apache/
Removed:
    directory/apacheds/trunk/core/src/test/org/
    directory/apacheds/trunk/main/src/test/org/
    directory/apacheds/trunk/plugin/src/test/org/
Modified:
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java
    directory/apacheds/trunk/project.xml

Propchange: directory/apacheds/trunk/core-unit/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Nov  3 20:59:10 2005
@@ -0,0 +1,5 @@
+*.iml
+target
+.classpath
+.project
+*.log

Added: directory/apacheds/trunk/core-unit/project.properties
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core-unit/project.properties?rev=330706&view=auto
==============================================================================
--- directory/apacheds/trunk/core-unit/project.properties (added)
+++ directory/apacheds/trunk/core-unit/project.properties Thu Nov  3 20:59:10 2005
@@ -0,0 +1,15 @@
+maven.compile.source = 1.4
+maven.compile.target = 1.4
+maven.compile.debug=on
+maven.compile.optimize=on
+maven.compile.deprecation=on
+
+#maven.junit.fork=yes
+maven.xdoc.includeProjectDocumentation=yes
+
+maven.license.licenseFile=${basedir}/../LICENSE.txt
+
+maven.junit.sysproperties=java.util.prefs.PreferencesFactory
+java.util.prefs.PreferencesFactory=org.apache.ldap.server.prefs.ServerPreferencesFactory
+
+maven.eclipse.classpath.include=${basedir}/target/schema

Added: directory/apacheds/trunk/core-unit/project.xml
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core-unit/project.xml?rev=330706&view=auto
==============================================================================
--- directory/apacheds/trunk/core-unit/project.xml (added)
+++ directory/apacheds/trunk/core-unit/project.xml Thu Nov  3 20:59:10 2005
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <extend>${basedir}/../project.xml</extend>
+    <artifactId>apacheds-core-unit</artifactId>
+    <name>ApacheDS Core Unit</name>
+    <inceptionYear>2005</inceptionYear>
+    <package>org.apache.ldap.server.unit</package>
+    <shortDescription>Unit Test Framework for Server Core</shortDescription>
+    <dependencies>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.0</version>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>3.0</version>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>commons-primitives</groupId>
+            <artifactId>commons-primitives</artifactId>
+            <version>20041207.202534</version>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>regexp</groupId>
+            <artifactId>regexp</artifactId>
+            <version>1.2</version>
+            <type>jar</type>
+            <url>http://jakarta.apache.org/regexp/index.html</url>
+            <properties>
+                <gump.project>jakarta-regexp</gump.project>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>oro</groupId>
+            <artifactId>oro</artifactId>
+            <version>2.0.7</version>
+            <type>jar</type>
+            <url>http://jakarta.apache.org/oro</url>
+            <properties>
+                <gump.project>jakarta-oro</gump.project>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>1.0</version>
+            <type>jar</type>
+            <url>http://jakarta.apache.org/commons/io</url>
+        </dependency>
+        <dependency>
+            <groupId>antlr</groupId>
+            <artifactId>antlr</artifactId>
+            <version>2.7.2</version>
+            <type>jar</type>
+            <url>http://antlr.org/</url>
+        </dependency>
+        <dependency>
+            <groupId>jdbm</groupId>
+            <artifactId>jdbm</artifactId>
+            <version>1.0</version>
+            <type>jar</type>
+            <url>http://jdbm.sourceforge.net</url>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>apacheds-core</artifactId>
+            <version>${pom.currentVersion}</version>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>apacheds-shared</artifactId>
+            <version>${pom.currentVersion}</version>
+            <type>jar</type>
+        </dependency>
+        <!-- The Directory Maven Plugin -->
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>maven-directory-plugin</artifactId>
+            <version>${pom.currentVersion}</version>
+            <type>plugin</type>
+        </dependency>
+
+       <!-- Remove this dependency after finding a home for StringUtils -->
+        <dependency>
+            <groupId>directory-asn1</groupId>
+            <artifactId>asn1-codec</artifactId>
+            <version>0.3.4-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+    <build />
+    <reports>
+        <report>maven-changes-plugin</report>
+        <report>maven-tasklist-plugin</report>
+        <report>maven-junit-report-plugin</report>
+        <report>maven-jdepend-plugin</report>
+        <report>maven-simian-plugin</report>
+        <report>maven-javadoc-plugin</report>
+        <report>maven-jxr-plugin</report>
+        <report>maven-license-plugin</report>
+        <report>maven-multiproject-plugin</report>
+    </reports>
+</project>
+

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java?rev=330706&r1=330705&r2=330706&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java
Thu Nov  3 20:59:10 2005
@@ -642,7 +642,7 @@
     private void doFilter( Invocation invocation, Attributes entry )
             throws NamingException
     {
-        long t0 = System.nanoTime();
+        long t0 = System.currentTimeMillis();
         
         if ( log.isDebugEnabled() )
         {
@@ -701,7 +701,7 @@
             }
         }
         
-        long t1 = System.nanoTime();
+        long t1 = System.currentTimeMillis();
         
         if ( log.isDebugEnabled() )
         {

Modified: directory/apacheds/trunk/project.xml
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/project.xml?rev=330706&r1=330705&r2=330706&view=diff
==============================================================================
--- directory/apacheds/trunk/project.xml (original)
+++ directory/apacheds/trunk/project.xml Thu Nov  3 20:59:10 2005
@@ -98,7 +98,7 @@
     <build>
       <nagEmailAddress>dev@directory.apache.org</nagEmailAddress>
       <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
-      <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
+      <unitTestSourceDirectory>${basedir}/src/test/java</unitTestSourceDirectory>
 
       <unitTest>
         <includes>



Mime
View raw message