You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2014/10/23 18:59:10 UTC
[1/5] git commit: Replaced teh reference to org.openldap by a
reference to org.apache.directory
Repository: directory-fortress-core
Updated Branches:
refs/heads/master 49e82a58b -> 254f3bafe
Replaced teh reference to org.openldap by a reference to
org.apache.directory
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/abab11ea
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/abab11ea
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/abab11ea
Branch: refs/heads/master
Commit: abab11ea7c47cd06fd4bfa6d34a7c196e7afef03
Parents: 49e82a5
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Thu Oct 23 10:25:01 2014 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Thu Oct 23 10:25:01 2014 +0200
----------------------------------------------------------------------
src/test/resources/log4j.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/abab11ea/src/test/resources/log4j.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/log4j.xml b/src/test/resources/log4j.xml
index 0f23ec0..b884654 100755
--- a/src/test/resources/log4j.xml
+++ b/src/test/resources/log4j.xml
@@ -42,7 +42,7 @@
</category>
-->
- <category name="org.openldap.fortress.example" class="org.apache.log4j.Logger" additivity="false">
+ <category name="org.apache.directory.fortress.example" class="org.apache.log4j.Logger" additivity="false">
<priority value="DEBUG" class="org.apache.log4j.Level"/>
<appender-ref ref="console"/>
</category>
[4/5] git commit: Added the needed plugin and configuration for the
release and other things
Posted by el...@apache.org.
Added the needed plugin and configuration for the release and other
things
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/1b7f745d
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/1b7f745d
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/1b7f745d
Branch: refs/heads/master
Commit: 1b7f745dce440750435ccad503052a6582db459c
Parents: d8a54ee
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Thu Oct 23 18:57:33 2014 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Thu Oct 23 18:57:33 2014 +0200
----------------------------------------------------------------------
pom.xml | 189 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 file changed, 144 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/1b7f745d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 747b491..bee8ea0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,8 @@
specific language governing permissions and limitations
under the License.
-->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.directory</groupId>
<artifactId>fortress-core</artifactId>
@@ -67,48 +68,45 @@
<!-- ====================================================== -->
<properties>
<!-- Maven Plugins -->
- <version.apache.rat.plugin>0.10</version.apache.rat.plugin>
- <version.api.plugin>3.2.3</version.api.plugin>
- <version.assembly.plugin>2.4</version.assembly.plugin>
- <version.build.helper.plugin>1.9</version.build.helper.plugin>
- <version.bundle.plugin>2.5.0</version.bundle.plugin>
- <version.changes.plugin>2.10</version.changes.plugin>
- <version.checkstyle.plugin>2.12.1</version.checkstyle.plugin>
- <version.clean.plugin>2.5</version.clean.plugin>
- <version.clirr.plugin>2.6.1</version.clirr.plugin>
- <version.cobertura.plugin>2.6</version.cobertura.plugin>
- <version.compiler.plugin>3.1</version.compiler.plugin>
- <version.dashboard.plugin>1.0.0-beta-1</version.dashboard.plugin>
- <version.dependency.plugin>2.8</version.dependency.plugin>
- <version.deploy.plugin>2.8.1</version.deploy.plugin>
- <version.docck.plugin>1.0</version.docck.plugin>
- <version.eclipse.plugin>2.9</version.eclipse.plugin>
- <version.enforcer.plugin>1.3.1</version.enforcer.plugin>
- <version.findbugs.plugin>2.5.4</version.findbugs.plugin>
- <version.gpg.plugin>1.5</version.gpg.plugin>
- <version.install.plugin>2.5.1</version.install.plugin>
- <version.jar.plugin>2.5</version.jar.plugin>
- <version.javancss.plugin>2.0</version.javancss.plugin>
- <version.javadoc.plugin>2.9.1</version.javadoc.plugin>
- <version.jdepend.plugin>2.0</version.jdepend.plugin>
- <version.jmeter.core>2.11</version.jmeter.core>
- <version.jmeter.java>2.11</version.jmeter.java>
- <version.jxr.plugin>2.4</version.jxr.plugin>
- <version.model.plugin>3.2.3</version.model.plugin>
- <version.plexus.utils>3.0.18</version.plexus.utils>
- <version.plugin.plugin>3.3</version.plugin.plugin>
- <version.pmd.plugin>3.1</version.pmd.plugin>
- <version.project.plugin>3.0-alpha-2</version.project.plugin>
- <version.project.info.report.plugin>2.7</version.project.info.report.plugin>
- <version.rat.maven.plugin>1.0-alpha-3</version.rat.maven.plugin>
- <version.release.plugin>2.5</version.release.plugin>
- <version.remote.resources.plugin>1.5</version.remote.resources.plugin>
- <version.resources.plugin>2.6</version.resources.plugin>
- <version.scm.plugin>1.9</version.scm.plugin>
- <version.site.plugin>3.3</version.site.plugin>
- <version.source.plugin>2.2.1</version.source.plugin>
- <version.shade.plugin>2.3</version.shade.plugin>
- <version.surefire.plugin>2.17</version.surefire.plugin>
+ <version.maven.apache.rat.plugin>0.10</version.maven.apache.rat.plugin>
+ <version.maven.api.plugin>3.2.3</version.maven.api.plugin>
+ <version.maven.assembly.plugin>2.4</version.maven.assembly.plugin>
+ <version.maven.build.helper.plugin>1.9</version.maven.build.helper.plugin>
+ <version.maven.bundle.plugin>2.5.0</version.maven.bundle.plugin>
+ <version.maven.changes.plugin>2.10</version.maven.changes.plugin>
+ <version.maven.checkstyle.plugin>2.12.1</version.maven.checkstyle.plugin>
+ <version.maven.clean.plugin>2.5</version.maven.clean.plugin>
+ <version.maven.clirr.plugin>2.6.1</version.maven.clirr.plugin>
+ <version.maven.cobertura.plugin>2.6</version.maven.cobertura.plugin>
+ <version.maven.compiler.plugin>3.1</version.maven.compiler.plugin>
+ <version.maven.dashboard.plugin>1.0.0-beta-1</version.maven.dashboard.plugin>
+ <version.maven.dependency.plugin>2.8</version.maven.dependency.plugin>
+ <version.maven.deploy.plugin>2.8.1</version.maven.deploy.plugin>
+ <version.maven.docck.plugin>1.0</version.maven.docck.plugin>
+ <version.maven.eclipse.plugin>2.9</version.maven.eclipse.plugin>
+ <version.maven.enforcer.plugin>1.3.1</version.maven.enforcer.plugin>
+ <version.maven.findbugs.plugin>2.5.4</version.maven.findbugs.plugin>
+ <version.maven.gpg.plugin>1.5</version.maven.gpg.plugin>
+ <version.maven.install.plugin>2.5.1</version.maven.install.plugin>
+ <version.maven.jar.plugin>2.5</version.maven.jar.plugin>
+ <version.maven.javancss.plugin>2.0</version.maven.javancss.plugin>
+ <version.maven.javadoc.plugin>2.9.1</version.maven.javadoc.plugin>
+ <version.maven.jdepend.plugin>2.0</version.maven.jdepend.plugin>
+ <version.maven.jxr.plugin>2.4</version.maven.jxr.plugin>
+ <version.maven.model.plugin>3.2.3</version.maven.model.plugin>
+ <version.maven.plexus.utils>3.0.18</version.maven.plexus.utils>
+ <version.maven.plugin.plugin>3.3</version.maven.plugin.plugin>
+ <version.maven.pmd.plugin>3.1</version.maven.pmd.plugin>
+ <version.maven.project.plugin>3.0-alpha-2</version.maven.project.plugin>
+ <version.maven.project.info.report.plugin>2.7</version.maven.project.info.report.plugin>
+ <version.maven.release.plugin>2.5</version.maven.release.plugin>
+ <version.maven.remote.resources.plugin>1.5</version.maven.remote.resources.plugin>
+ <version.maven.resources.plugin>2.6</version.maven.resources.plugin>
+ <version.maven.scm.plugin>1.9</version.maven.scm.plugin>
+ <version.maven.site.plugin>3.3</version.maven.site.plugin>
+ <version.maven.source.plugin>2.2.1</version.maven.source.plugin>
+ <version.maven.shade.plugin>2.3</version.maven.shade.plugin>
+ <version.maven.surefire.plugin>2.17</version.maven.surefire.plugin>
<!-- Jars -->
<version.accelerator.api>1.0-RC39</version.accelerator.api>
@@ -135,6 +133,8 @@
<version.hamcrest.core>1.3</version.hamcrest.core>
<version.jasypt>1.8</version.jasypt>
<version.jgrapht.jdk5>0.7.3</version.jgrapht.jdk5>
+ <version.jmeter.core>2.11</version.jmeter.core>
+ <version.jmeter.java>2.11</version.jmeter.java>
<version.jsr311.api>1.1-ea</version.jsr311.api>
<version.junit>4.11</version.junit>
<version.log4j>1.2.17</version.log4j>
@@ -147,6 +147,14 @@
<version.xmlschema.core>2.0.3</version.xmlschema.core>
<version.xpp3>1.1.4c</version.xpp3>
<version.xml.apis>1.0b2</version.xml.apis>
+
+ <!-- ===================================================== -->
+ <!-- This is a hack to allow someone to release -->
+ <!-- without having to run the tests. In order to -->
+ <!-- do so, just tpe : -->
+ <!-- mvn release:prepare -Drelease.arguments="-N -Prelease" -->
+ <!-- ===================================================== -->
+ <release.arguments></release.arguments>
</properties>
<!-- ====================================================== -->
@@ -154,6 +162,7 @@
<!-- ====================================================== -->
<dependencyManagement>
<dependencies>
+ <!-- To be defined later -->
</dependencies>
</dependencyManagement>
@@ -280,7 +289,6 @@
<version>${version.jsr311.api}</version>
</dependency>
- <!-- Test dependencies -->
<dependency>
<groupId>org.apache.jmeter</groupId>
<artifactId>ApacheJMeter_core</artifactId>
@@ -315,8 +323,18 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>${version.maven.release.plugin}</version>
+ <configuration>
+ <arguments>${release.arguments}</arguments>
+ <tagNameFormat>@{project.version}</tagNameFormat>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
+ <version>${version.maven.compiler.plugin}</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
@@ -324,6 +342,37 @@
<encoding>ISO-8859-1</encoding>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <excludes>
+ <!-- MAVEN_DEFAULT_EXCLUDES -->
+ <exclude>**/target/**/*</exclude>
+ <exclude>**/cobertura.ser</exclude>
+ <!-- ECLIPSE_DEFAULT_EXCLUDES -->
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**/*</exclude>
+ <!-- IDEA_DEFAULT_EXCLUDES -->
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+ <!-- MANIFEST_MF_EXCLUDES -->
+ <exclude>**/MANIFEST.MF</exclude>
+ <!-- GIT_EXCLUDES -->
+ <exclude>**/.git/**/*</exclude>
+ <!-- CERT_EXCLUDES -->
+ <exclude>**/*.pem</exclude>
+ <!-- EXTERNAL_CODE_EXCLUDES -->
+ <exclude>**/CmdLineParser.java</exclude>
+ <!-- LICENSE_EXCLUDES -->
+ <exclude>**/lib/LICENSE*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
@@ -335,6 +384,21 @@
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>${version.maven.source.plugin}</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions>
@@ -359,4 +423,39 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>source-release-assembly</id>
+ <configuration>
+ <!-- we have a dedicated distribution module -->
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
[3/5] git commit: o Set some dependencies to stop tests o declared
all the dependencies versions in properties (usefull later if we define a
parent pom) o many fixes and improvement in the pom file
Posted by el...@apache.org.
o Set some dependencies to stop tests
o declared all the dependencies versions in properties (usefull later if
we define a parent pom)
o many fixes and improvement in the pom file
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/d8a54eef
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/d8a54eef
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/d8a54eef
Branch: refs/heads/master
Commit: d8a54eef26a9b280fa6e414965f3596bf98ef2d1
Parents: c94a97a
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Thu Oct 23 18:22:41 2014 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Thu Oct 23 18:22:41 2014 +0200
----------------------------------------------------------------------
pom.xml | 236 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 file changed, 181 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/d8a54eef/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 60e1424..747b491 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,11 +18,12 @@
-->
<project>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.openldap</groupId>
- <artifactId>fortress</artifactId>
+ <groupId>org.apache.directory</groupId>
+ <artifactId>fortress-core</artifactId>
<packaging>jar</packaging>
<name>Apache Fortress Core</name>
- <version>1.0-RC39</version>
+ <version>1.0.0-M1-SNAPSHOT</version>
+ <inceptionYear>2007</inceptionYear>
<description>Apache Fortress is a standards-based Identity and Access Management SDK that implements ANSI RBAC INCITS 359.</description>
<url>http://directory.apache.org/fortress/</url>
@@ -34,15 +35,19 @@
</licenses>
<scm>
- <url>http://www.openldap.org/software/repo/openldap-fortress-core.git</url>
- <connection>git://git.openldap.org/openldap-fortress-core.git</connection>
+ <connection>scm:git:http://git-wip-us.apache.org/repos/asf/directory-fortress-core.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/directory-fortress-core.git</developerConnection>
+ <tag>HEAD</tag>
</scm>
<issueManagement>
- <system>Fortress Core JIRA</system>
- <url>https://fortress.atlassian.net/browse/FC/</url>
+ <system>jira</system>
+ <url>https://issues.apache.org/jira/browse/DIRFORTRESS</url>
</issueManagement>
+ <!-- ====================================================== -->
+ <!-- The list of current developpers -->
+ <!-- ====================================================== -->
<developers>
<developer>
<id>smckinney</id>
@@ -57,130 +62,251 @@
</developer>
</developers>
+ <!-- ====================================================== -->
+ <!-- The used properties for this project -->
+ <!-- ====================================================== -->
+ <properties>
+ <!-- Maven Plugins -->
+ <version.apache.rat.plugin>0.10</version.apache.rat.plugin>
+ <version.api.plugin>3.2.3</version.api.plugin>
+ <version.assembly.plugin>2.4</version.assembly.plugin>
+ <version.build.helper.plugin>1.9</version.build.helper.plugin>
+ <version.bundle.plugin>2.5.0</version.bundle.plugin>
+ <version.changes.plugin>2.10</version.changes.plugin>
+ <version.checkstyle.plugin>2.12.1</version.checkstyle.plugin>
+ <version.clean.plugin>2.5</version.clean.plugin>
+ <version.clirr.plugin>2.6.1</version.clirr.plugin>
+ <version.cobertura.plugin>2.6</version.cobertura.plugin>
+ <version.compiler.plugin>3.1</version.compiler.plugin>
+ <version.dashboard.plugin>1.0.0-beta-1</version.dashboard.plugin>
+ <version.dependency.plugin>2.8</version.dependency.plugin>
+ <version.deploy.plugin>2.8.1</version.deploy.plugin>
+ <version.docck.plugin>1.0</version.docck.plugin>
+ <version.eclipse.plugin>2.9</version.eclipse.plugin>
+ <version.enforcer.plugin>1.3.1</version.enforcer.plugin>
+ <version.findbugs.plugin>2.5.4</version.findbugs.plugin>
+ <version.gpg.plugin>1.5</version.gpg.plugin>
+ <version.install.plugin>2.5.1</version.install.plugin>
+ <version.jar.plugin>2.5</version.jar.plugin>
+ <version.javancss.plugin>2.0</version.javancss.plugin>
+ <version.javadoc.plugin>2.9.1</version.javadoc.plugin>
+ <version.jdepend.plugin>2.0</version.jdepend.plugin>
+ <version.jmeter.core>2.11</version.jmeter.core>
+ <version.jmeter.java>2.11</version.jmeter.java>
+ <version.jxr.plugin>2.4</version.jxr.plugin>
+ <version.model.plugin>3.2.3</version.model.plugin>
+ <version.plexus.utils>3.0.18</version.plexus.utils>
+ <version.plugin.plugin>3.3</version.plugin.plugin>
+ <version.pmd.plugin>3.1</version.pmd.plugin>
+ <version.project.plugin>3.0-alpha-2</version.project.plugin>
+ <version.project.info.report.plugin>2.7</version.project.info.report.plugin>
+ <version.rat.maven.plugin>1.0-alpha-3</version.rat.maven.plugin>
+ <version.release.plugin>2.5</version.release.plugin>
+ <version.remote.resources.plugin>1.5</version.remote.resources.plugin>
+ <version.resources.plugin>2.6</version.resources.plugin>
+ <version.scm.plugin>1.9</version.scm.plugin>
+ <version.site.plugin>3.3</version.site.plugin>
+ <version.source.plugin>2.2.1</version.source.plugin>
+ <version.shade.plugin>2.3</version.shade.plugin>
+ <version.surefire.plugin>2.17</version.surefire.plugin>
+
+ <!-- Jars -->
+ <version.accelerator.api>1.0-RC39</version.accelerator.api>
+ <version.accelerator.impl>1.0-RC39</version.accelerator.impl>
+ <version.ant>1.9.1</version.ant>
+ <version.ant.launcher>1.9.1</version.ant.launcher>
+ <version.antlr>2.7.7</version.antlr>
+ <version.apacheds.all>2.0.0-M17</version.apacheds.all>
+ <version.api.all>1.0.0-M24</version.api.all>
+ <version.commons.beanutils>1.7.0</version.commons.beanutils>
+ <version.commons.beanutils-core>1.8.0</version.commons.beanutils-core>
+ <version.commons.codec>1.2</version.commons.codec>
+ <version.commons.collections>3.2.1</version.commons.collections>
+ <version.commons.configuration>1.6</version.commons.configuration>
+ <version.commons.digester>1.8</version.commons.digester>
+ <version.commons.httpclient>3.1</version.commons.httpclient>
+ <version.commons.io>2.4</version.commons.io>
+ <version.commons.lang>2.6</version.commons.lang>
+ <version.commons.logging>1.1.1</version.commons.logging>
+ <version.commons.pool>1.6</version.commons.pool>
+ <version.cxf.common.utilities>2.5.10</version.cxf.common.utilities>
+ <version.dom4j>1.6.1</version.dom4j>
+ <version.ehcache.core>2.6.9</version.ehcache.core>
+ <version.hamcrest.core>1.3</version.hamcrest.core>
+ <version.jasypt>1.8</version.jasypt>
+ <version.jgrapht.jdk5>0.7.3</version.jgrapht.jdk5>
+ <version.jsr311.api>1.1-ea</version.jsr311.api>
+ <version.junit>4.11</version.junit>
+ <version.log4j>1.2.17</version.log4j>
+ <version.mina.core>2.0.8</version.mina.core>
+ <version.slf4j.api>1.7.7</version.slf4j.api>
+ <version.slf4j.log4j12>1.7.7</version.slf4j.log4j12>
+ <version.stax2.api>3.1.1</version.stax2.api>
+ <version.opencsv>2.3</version.opencsv>
+ <version.woodstox.core.asl>4.2.0</version.woodstox.core.asl>
+ <version.xmlschema.core>2.0.3</version.xmlschema.core>
+ <version.xpp3>1.1.4c</version.xpp3>
+ <version.xml.apis>1.0b2</version.xml.apis>
+ </properties>
+
+ <!-- ====================================================== -->
+ <!-- The dependencies for all the projects -->
+ <!-- ====================================================== -->
+ <dependencyManagement>
+ <dependencies>
+ </dependencies>
+ </dependencyManagement>
+
+ <!-- ====================================================== -->
+ <!-- The dependencies -->
+ <!-- ====================================================== -->
<dependencies>
<dependency>
<groupId>org.openldap</groupId>
<artifactId>accelerator-api</artifactId>
- <version>${version}</version>
+ <version>${version.accelerator.api}</version>
</dependency>
<dependency>
<groupId>org.openldap</groupId>
<artifactId>accelerator-impl</artifactId>
- <version>${version}</version>
+ <version>${version.accelerator.impl}</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.4</version>
+ <version>${version.commons.lang}</version>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
- <version>1.6</version>
+ <version>${version.commons.configuration}</version>
</dependency>
- <dependency>
+ <!-- dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
- </dependency>
+ <version>${version.commons.collections}</version>
+ </dependency -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
+ <version>${version.commons.io}</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
+ <version>${version.commons.httpclient}</version>
</dependency>
- <!-- Logging dependencies -->
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.5</version>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache-core</artifactId>
+ <version>${version.ehcache.core}</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.7.5</version>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>${version.commons.pool}</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-common-utilities</artifactId>
+ <version>${version.cxf.common.utilities}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-all</artifactId>
+ <version>${version.api.all}</version>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>${version.ant}</version>
</dependency>
<dependency>
<groupId>org.jasypt</groupId>
<artifactId>jasypt</artifactId>
- <version>1.8</version>
+ <version>${version.jasypt}</version>
</dependency>
<dependency>
<groupId>org.jgrapht</groupId>
<artifactId>jgrapht-jdk1.5</artifactId>
- <version>0.7.3</version>
+ <version>${version.jgrapht.jdk5}</version>
</dependency>
<dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
- <version>2.6.9</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${version.slf4j.api}</version>
</dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.9.1</version>
- </dependency>
+ <!-- Logging dependencies -->
+ <!-- dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${version.slf4j.log4j12}</version>
+ </dependency-->
+ <!-- dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${version.log4j}</version>
+ </dependency-->
+
+ <!-- tests dependencies -->
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-common-utilities</artifactId>
- <version>2.5.10</version>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-all</artifactId>
+ <version>${version.apacheds.all}</version>
+ <type>jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
- <version>1.1-ea</version>
+ <version>${version.jsr311.api}</version>
</dependency>
<!-- Test dependencies -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
+ <groupId>org.apache.jmeter</groupId>
+ <artifactId>ApacheJMeter_core</artifactId>
+ <version>${version.jmeter.core}</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>net.sf.opencsv</groupId>
- <artifactId>opencsv</artifactId>
- <version>2.3</version>
+ <groupId>org.apache.jmeter</groupId>
+ <artifactId>ApacheJMeter_java</artifactId>
+ <version>${version.jmeter.java}</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-all</artifactId>
- <version>2.0.0-M17</version>
- <type>jar</type>
- <scope>compile</scope>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.directory.api</groupId>
- <artifactId>api-all</artifactId>
- <version>1.0.0-M24</version>
- <type>jar</type>
+ <groupId>net.sf.opencsv</groupId>
+ <artifactId>opencsv</artifactId>
+ <version>${version.opencsv}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
[5/5] git commit: Added the missing Apache header
Posted by el...@apache.org.
Added the missing Apache header
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/254f3baf
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/254f3baf
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/254f3baf
Branch: refs/heads/master
Commit: 254f3bafefbdb217c2fe5ec7103f268bbd151940
Parents: 1b7f745
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Thu Oct 23 18:57:56 2014 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Thu Oct 23 18:57:56 2014 +0200
----------------------------------------------------------------------
src/test/build.xml | 29 ++++++++++--------
.../fortress/core/samples/overview.html | 31 +++++++++++--------
.../fortress/core/samples/package.html | 32 +++++++++++---------
3 files changed, 52 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/254f3baf/src/test/build.xml
----------------------------------------------------------------------
diff --git a/src/test/build.xml b/src/test/build.xml
index 2aceace..de3d7e9 100755
--- a/src/test/build.xml
+++ b/src/test/build.xml
@@ -1,18 +1,21 @@
<!--
- ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
- ~
- ~ Copyright 1998-2014 The OpenLDAP Foundation.
- ~ All rights reserved.
- ~
- ~ Redistribution and use in source and binary forms, with or without
- ~ modification, are permitted only as authorized by the OpenLDAP
- ~ Public License.
- ~
- ~ A copy of this license is available in the file LICENSE in the
- ~ top-level directory of the distribution or, alternatively, at
- ~ <http://www.OpenLDAP.org/license.html>.
- -->
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<project name="fortress" default="test" basedir="../../">
<target name="init">
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/254f3baf/src/test/java/org/apache/directory/fortress/core/samples/overview.html
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/overview.html b/src/test/java/org/apache/directory/fortress/core/samples/overview.html
index e0fc67d..e1f0337 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/overview.html
+++ b/src/test/java/org/apache/directory/fortress/core/samples/overview.html
@@ -1,17 +1,22 @@
<!--
- ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
- ~
- ~ Copyright 1998-2014 The OpenLDAP Foundation.
- ~ All rights reserved.
- ~
- ~ Redistribution and use in source and binary forms, with or without
- ~ modification, are permitted only as authorized by the OpenLDAP
- ~ Public License.
- ~
- ~ A copy of this license is available in the file LICENSE in the
- ~ top-level directory of the distribution or, alternatively, at
- ~ <http://www.OpenLDAP.org/license.html>.
- -->
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+-->
<html>
<head>
<title>Overview of the org.openldap.fortress programming samples</title>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/254f3baf/src/test/java/org/apache/directory/fortress/core/samples/package.html
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/package.html b/src/test/java/org/apache/directory/fortress/core/samples/package.html
index 9e5a703..9881d96 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/package.html
+++ b/src/test/java/org/apache/directory/fortress/core/samples/package.html
@@ -1,18 +1,22 @@
<!--
- ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
- ~
- ~ Copyright 1998-2014 The OpenLDAP Foundation.
- ~ All rights reserved.
- ~
- ~ Redistribution and use in source and binary forms, with or without
- ~ modification, are permitted only as authorized by the OpenLDAP
- ~ Public License.
- ~
- ~ A copy of this license is available in the file LICENSE in the
- ~ top-level directory of the distribution or, alternatively, at
- ~ <http://www.OpenLDAP.org/license.html>.
- -->
-
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+-->
<html>
<head>
<title>Package Documentation for org.openldap.fortress.samples</title>
[2/5] git commit: Another replacement for the openldap package
Posted by el...@apache.org.
Another replacement for the openldap package
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/c94a97a4
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/c94a97a4
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/c94a97a4
Branch: refs/heads/master
Commit: c94a97a473e487a66715f81a55657d3b89e0d4d5
Parents: abab11e
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Thu Oct 23 10:25:37 2014 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Thu Oct 23 10:25:37 2014 +0200
----------------------------------------------------------------------
src/test/resources/log4j.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/c94a97a4/src/test/resources/log4j.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/log4j.xml b/src/test/resources/log4j.xml
index b884654..cc535c6 100755
--- a/src/test/resources/log4j.xml
+++ b/src/test/resources/log4j.xml
@@ -36,7 +36,7 @@
</appender>
<!-- Uncomment to store REST log statements to file:
- <category name="org.openldap.fortress.rest.RestUtils" class="org.apache.log4j.Logger" additivity="false">
+ <category name="org.apache.directory.fortress.rest.RestUtils" class="org.apache.log4j.Logger" additivity="false">
<priority value="INFO" class="org.apache.log4j.Level"/>
<appender-ref ref="file"/>
</category>