You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2006/08/30 07:23:17 UTC
svn commit: r438377 - in /directory/trunks/apacheds: core-unit/
core-unit/src/test/java/org/apache/directory/server/core/jndi/
core/src/test/java/org/apache/directory/server/core/jndi/ server-ssl/
server-ssl/src/test/java/org/apache/directory/server/ssl/
Author: akarasulu
Date: Tue Aug 29 22:23:16 2006
New Revision: 438377
URL: http://svn.apache.org/viewvc?rev=438377&view=rev
Log:
Fixes for DIRSERVER-648: Make LdapsTest and RootDSETests only run with -Dintegration test profile
Added:
directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/RootDSEITest.java
- copied unchanged from r438374, directory/branches/apacheds/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/RootDSEITest.java
directory/trunks/apacheds/server-ssl/src/test/java/org/apache/directory/server/ssl/LdapsITest.java
- copied unchanged from r438374, directory/branches/apacheds/1.0/server-ssl/src/test/java/org/apache/directory/server/ssl/LdapsITest.java
Removed:
directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/jndi/RootDSETest.java
directory/trunks/apacheds/server-ssl/src/test/java/org/apache/directory/server/ssl/LdapsTest.java
Modified:
directory/trunks/apacheds/core-unit/pom.xml
directory/trunks/apacheds/server-ssl/pom.xml
Modified: directory/trunks/apacheds/core-unit/pom.xml
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core-unit/pom.xml?rev=438377&r1=438376&r2=438377&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/pom.xml (original)
+++ directory/trunks/apacheds/core-unit/pom.xml Tue Aug 29 22:23:16 2006
@@ -20,7 +20,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>nlog4j</artifactId>
- <version>1.2.19</version>
+ <version>1.2.25</version>
<scope>provided</scope>
</dependency>
Modified: directory/trunks/apacheds/server-ssl/pom.xml
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/server-ssl/pom.xml?rev=438377&r1=438376&r2=438377&view=diff
==============================================================================
--- directory/trunks/apacheds/server-ssl/pom.xml (original)
+++ directory/trunks/apacheds/server-ssl/pom.xml Tue Aug 29 22:23:16 2006
@@ -36,5 +36,145 @@
<version>0.9.5-SNAPSHOT</version>
</dependency>
</dependencies>
+
+
+ <profiles>
+ <profile>
+ <id>no-integration-or-perf-tests</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/*ITest.java</exclude>
+ <exclude>**/*PTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <configuration>
+ <tasks>
+ <echo>
+=================================================================
+ W A R N I N G
+ -------------
+
+Integration and performance tests have been disabled. To enable
+integration tests run maven with the -Dintegration switch. To
+enable performance tests run maven with the -Dperformance switch.
+=================================================================
+ </echo>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>integration</id>
+ <activation>
+ <property><name>integration</name></property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/*PTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <configuration>
+ <tasks>
+ <echo>
+=================================================================
+ I N T E G R A T I O N
+ ---------------------
+
+Performance tests have been disabled. To enable
+performance tests run maven with the -Dperformance switch.
+=================================================================
+ </echo>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>performance</id>
+ <activation>
+ <property><name>performance</name></property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>outputDirectory</name>
+ <value>${basedir}/target</value>
+ </property>
+ </systemProperties>
+ <excludes>
+ <exclude>**/*ITest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <configuration>
+ <tasks>
+ <echo>
+=================================================================
+ P E R F O R M A N C E
+ ---------------------
+
+Integration tests have been disabled. To enable integration
+tests run maven with the -Dintegration switch.
+=================================================================
+ </echo>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+
</project>