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/28 10:22:51 UTC

karaf git commit: [ENTESB-3684]Karaf Manual doesn't contain Package-Imports

Repository: karaf
Updated Branches:
  refs/heads/master 52e0cf810 -> 30752c9d8


[ENTESB-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/30752c9d
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/30752c9d
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/30752c9d

Branch: refs/heads/master
Commit: 30752c9d84fedd1274d88ff0ea7e1070a4ef5882
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:21:43 2015 +0800

----------------------------------------------------------------------
 manual/pom.xml | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/30752c9d/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>