You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2015/04/29 08:56:58 UTC
[1/2] karaf git commit: [KARAF-3684]Karaf Manual doesn't contain
Package-Imports
Repository: karaf
Updated Branches:
refs/heads/master 94ddfed72 -> b3a2a1cba
[KARAF-3684]Karaf Manual doesn't contain Package-Imports
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/3a2f10b6
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/3a2f10b6
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/3a2f10b6
Branch: refs/heads/master
Commit: 3a2f10b6942b33752159611f924de6392352b39f
Parents: 52e0cf8
Author: Freeman Fang <fr...@gmail.com>
Authored: Tue Apr 28 16:21:43 2015 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Tue Apr 28 16:29:11 2015 +0800
----------------------------------------------------------------------
manual/pom.xml | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/3a2f10b6/manual/pom.xml
----------------------------------------------------------------------
diff --git a/manual/pom.xml b/manual/pom.xml
index 27d99af..dbe589f 100644
--- a/manual/pom.xml
+++ b/manual/pom.xml
@@ -114,7 +114,7 @@
</sources>
</configuration>
</execution>
- <!--
+ <!--
<execution>
<id>attach-artifacts</id>
<phase>install</phase>
@@ -130,7 +130,7 @@
</artifacts>
</configuration>
</execution>
- -->
+ -->
</executions>
</plugin>
<plugin>
@@ -368,7 +368,21 @@
</supportedProjectTypes>
<instructions>
<Import-Package>
-
+ javax.servlet,
+ javax.servlet.http,
+ javax.servlet.jsp;resolution:=optional,
+ javax.servlet.jsp.el;resolution:=optional,
+ org.apache.commons.logging;resolution:=optional;provider=paxlogging,
+ org.apache.commons.logging.impl;resolution:=optional;provider=paxlogging,
+ org.apache.log4j;resolution:=optional;provider=paxlogging,
+ org.apache.log4j.spi;resolution:=optional;provider=paxlogging,
+ org.apache.log4j.xml;resolution:=optional;provider=paxlogging,
+ org.slf4j;resolution:=optional;provider=paxlogging,
+ org.slf4j.helpers;resolution:=optional;provider=paxlogging,
+ org.slf4j.spi;resolution:=optional;provider=paxlogging,
+ org.osgi.framework,
+ javax.swing.tree,
+ org.osgi.service.packageadmin
</Import-Package>
<Bundle-ClassPath>.,WEB-INF/classes</Bundle-ClassPath>
<Embed-Directory>WEB-INF/lib</Embed-Directory>
[2/2] karaf git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/karaf
Posted by ff...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/karaf
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/b3a2a1cb
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/b3a2a1cb
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/b3a2a1cb
Branch: refs/heads/master
Commit: b3a2a1cbaebd3a838f6d30dd1e079fee72341cd1
Parents: 3a2f10b 94ddfed
Author: Freeman Fang <fr...@gmail.com>
Authored: Wed Apr 29 14:52:18 2015 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Wed Apr 29 14:52:18 2015 +0800
----------------------------------------------------------------------
.../jaas/modules/ldap/LDAPLoginModule.java | 7 +-
.../modules/ldap/LdapCaseInsensitiveDNTest.java | 107 +++++++++++++++++++
.../ldap/ldapCaseInsensitiveDN.properties | 36 +++++++
.../main/java/org/apache/karaf/main/Main.java | 5 +
.../assembly/AssemblyDeployCallback.java | 5 +-
.../apache/karaf/profile/assembly/Builder.java | 9 +-
6 files changed, 165 insertions(+), 4 deletions(-)
----------------------------------------------------------------------