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 2016/03/02 12:54:40 UTC
[1/3] directory-fortress-realm git commit: Added some missing Apache
Headers
Repository: directory-fortress-realm
Updated Branches:
refs/heads/master c2d9bd2f7 -> 4e8e6238a
Added some missing Apache Headers
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/commit/3351aa7c
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/tree/3351aa7c
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/diff/3351aa7c
Branch: refs/heads/master
Commit: 3351aa7cc248794a0e837c8e6bea00d4b70c4cd7
Parents: c2d9bd2
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Wed Mar 2 12:17:39 2016 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Wed Mar 2 12:17:39 2016 +0100
----------------------------------------------------------------------
.../directory/fortress/realm/GlobalIds.java | 19 +++++++++++
.../directory/fortress/realm/package.html | 33 +++++++++++---------
proxy/src/main/java/fortress-javadoc.css | 19 +++++++++++
3 files changed, 57 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/blob/3351aa7c/impl/src/main/java/org/apache/directory/fortress/realm/GlobalIds.java
----------------------------------------------------------------------
diff --git a/impl/src/main/java/org/apache/directory/fortress/realm/GlobalIds.java b/impl/src/main/java/org/apache/directory/fortress/realm/GlobalIds.java
index 9d5fcb5..2f3cf7f 100644
--- a/impl/src/main/java/org/apache/directory/fortress/realm/GlobalIds.java
+++ b/impl/src/main/java/org/apache/directory/fortress/realm/GlobalIds.java
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ *
+ */
package org.apache.directory.fortress.realm;
/**
http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/blob/3351aa7c/impl/src/main/java/org/apache/directory/fortress/realm/package.html
----------------------------------------------------------------------
diff --git a/impl/src/main/java/org/apache/directory/fortress/realm/package.html b/impl/src/main/java/org/apache/directory/fortress/realm/package.html
index 4ee7df5..084dece 100644
--- a/impl/src/main/java/org/apache/directory/fortress/realm/package.html
+++ b/impl/src/main/java/org/apache/directory/fortress/realm/package.html
@@ -1,20 +1,25 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<!--
- ~ 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 Fortress Sentry</title>
+ <title>Package Documentation for Apache Fortress REALM</title>
</head>
<body>
<p>
http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/blob/3351aa7c/proxy/src/main/java/fortress-javadoc.css
----------------------------------------------------------------------
diff --git a/proxy/src/main/java/fortress-javadoc.css b/proxy/src/main/java/fortress-javadoc.css
index 44ace3f..be1fea6 100644
--- a/proxy/src/main/java/fortress-javadoc.css
+++ b/proxy/src/main/java/fortress-javadoc.css
@@ -1,3 +1,22 @@
+/*
+ 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.
+*/
+
BODY { color: #000000;
background-color: #FFFFFF;
font-family: sans-serif }
[2/3] directory-fortress-realm git commit: Excluded some more third
party licences from rat checks. Added the apache-release profile
Posted by el...@apache.org.
Excluded some more third party licences from rat checks. Added the apache-release profile
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/commit/0f35b0f3
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/tree/0f35b0f3
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/diff/0f35b0f3
Branch: refs/heads/master
Commit: 0f35b0f328a9f1320f6e26279b92dc054a27682a
Parents: 3351aa7
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Wed Mar 2 12:18:12 2016 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Wed Mar 2 12:18:12 2016 +0100
----------------------------------------------------------------------
pom.xml | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/blob/0f35b0f3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 84cf05b..a0e8714 100644
--- a/pom.xml
+++ b/pom.xml
@@ -315,6 +315,10 @@
<!-- 3RD_PARTY_LICENSES -->
<exclude>distribution/src/main/release/licenses/*</exclude>
<exclude>src/main/release/licenses/*</exclude>
+ <exclude>lib/LICENSE-EHCACHE-TERRACOTTA.txt</exclude>
+ <exclude>lib/LICENSE-JGraphT.txt</exclude>
+ <exclude>lib/LICENSE-unboundid-ldapsdk-2.1.0-se.txt</exclude>
+ <exclude>lib/LICENSE-UnboundID-LDAPSDK.txt</exclude>
<!-- Missing license header in dependency reduced pom, see http://jira.codehaus.org/browse/MSHADE-48 -->
<exclude>**/dependency-reduced-pom.xml</exclude>
<!-- Generated ldif files -->
@@ -443,5 +447,38 @@
</plugins>
</build>
</profile>
+
+ <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/3] directory-fortress-realm git commit: Added some plugins in the
pluginManagement part
Posted by el...@apache.org.
Added some plugins in the pluginManagement part
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/commit/4e8e6238
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/tree/4e8e6238
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/diff/4e8e6238
Branch: refs/heads/master
Commit: 4e8e6238afdc5b6aba55b0f94659f544dd17860b
Parents: 0f35b0f
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Wed Mar 2 12:54:28 2016 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Wed Mar 2 12:54:28 2016 +0100
----------------------------------------------------------------------
pom.xml | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 103 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/blob/4e8e6238/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a0e8714..f8c7de1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,6 +135,106 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <inherited>true</inherited>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.7</source>
+ <target>1.7</target>
+ <optimize>true</optimize>
+ <encoding>ISO-8859-1</encoding>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.6</version>
+ <configuration>
+ <excludes>
+ <exclude>**/bootstrap</exclude>
+ <exclude>**/config</exclude>
+ <exclude>**/*.xml</exclude>
+ <exclude>**/*.properties</exclude>
+ <exclude>**/*.txt</exclude>
+ <exclude>**/*.src</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </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>
+ <!-- 3RD_PARTY_LICENSES -->
+ <exclude>distribution/src/main/release/licenses/*</exclude>
+ <exclude>src/main/release/licenses/*</exclude>
+ <exclude>lib/LICENSE-EHCACHE-TERRACOTTA.txt</exclude>
+ <exclude>lib/LICENSE-JGraphT.txt</exclude>
+ <exclude>lib/LICENSE-unboundid-ldapsdk-2.1.0-se.txt</exclude>
+ <exclude>lib/LICENSE-UnboundID-LDAPSDK.txt</exclude>
+ <!-- Missing license header in dependency reduced pom, see http://jira.codehaus.org/browse/MSHADE-48 -->
+ <exclude>**/dependency-reduced-pom.xml</exclude>
+ <!-- Generated ldif files -->
+ <exclude>**/src/main/resources/schema/**/*.ldif</exclude>
+ <exclude>**/src/main/resources/schema-all.ldif</exclude>
+ <exclude>**/src/main/resources/schema/**/*.ldif</exclude>
+ <exclude>**/src/main/resources/schema-all.ldif</exclude>
+ <!-- Files having a Bouncy Castle license -->
+ <exclude>ldap/src/main/java/org/apache/directory/api/asn1/der/*.java</exclude>
+ <exclude>src/main/java/org/apache/directory/api/asn1/der/*.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<tagNameFormat>@{project.version}</tagNameFormat>
@@ -162,7 +262,7 @@
</configuration>
</execution>
</executions>
- </plugini-->
+ </plugin-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -181,11 +281,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <!-- version>${javadoc.version}</version -->
<configuration>
- <!--<additionalparam>-Xdoclint:none</additionalparam>-->
+ <additionalparam>-Xdoclint:none</additionalparam>
<stylesheet>java</stylesheet>
- <bottom><small>Copyright &copy; 2003-2015, The Apache Software Foundation. All Rights Reserved. Generated ${maven.build.timestamp}</small></bottom>
+ <bottom><small>Copyright &copy; 2003-2016, The Apache Software Foundation. All Rights Reserved. Generated ${maven.build.timestamp}</small></bottom>
<overview>proxy/src/main/java/overview.html</overview>
<docfilessubdirs>true</docfilessubdirs>
<includes></includes>