[ 
https://issues.apache.org/jira/browse/KARAF-5649?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16383738#comment-16383738
 ] 

ASF GitHub Bot commented on KARAF-5649:
---------------------------------------

jbonofre closed pull request #468: [KARAF-5649] Add a feature for the manual
URL: https://github.com/apache/karaf/pull/468
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/assemblies/features/standard/src/main/feature/feature.xml 
b/assemblies/features/standard/src/main/feature/feature.xml
index d18fc56f48..9cc7c0af9d 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -1069,6 +1069,11 @@
         </config>
     </feature>
 
+    <feature name="documentation" description="Documentation of Karaf project 
in HTML" version="${project.version}">
+        <feature>war</feature>
+        <bundle>mvn:org.apache.karaf/manual/${project.version}</bundle>
+    </feature>
+
     <feature name="standard" description="Wrap feature describing all features 
part of a standard distribution" version="${project.version}">
         <feature>wrap</feature>
         <feature>aries-blueprint</feature>
diff --git a/manual/pom.xml b/manual/pom.xml
index fdcd6bfb56..ab0517d064 100644
--- a/manual/pom.xml
+++ b/manual/pom.xml
@@ -23,7 +23,7 @@
 
        <artifactId>manual</artifactId>
        <name>Apache Karaf :: Manual</name>
-       <packaging>pom</packaging>
+       <packaging>bundle</packaging>
 
        <build>
                <plugins>
@@ -238,6 +238,18 @@
                                        
<content>${project.build.directory}/generated-docs</content>
                                </configuration>
                        </plugin>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <version>3.3.0</version>
+                               <configuration>
+                                       <instructions>
+                                               
<Web-ContextPath>/documentation</Web-ContextPath>
+                                               
<Private-Package>*</Private-Package>
+                                               
<Include-Resource>target/generated-docs</Include-Resource>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
                </plugins>
        </build>
 
diff --git a/pom.xml b/pom.xml
index a840522147..6e421916f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,6 +71,7 @@
         <module>profile</module>
         <module>event</module>
         <module>tooling</module>
+        <module>manual</module>
         <module>assemblies</module>
         <module>demos</module>
         <module>archetypes</module>
@@ -1780,7 +1781,7 @@
                         <useReleaseProfile>false</useReleaseProfile>
                         <preparationGoals>clean install</preparationGoals>
                         <goals>deploy</goals>
-                        <arguments>-Prelease,deploy,src,manual</arguments>
+                        <arguments>-Prelease,deploy,src</arguments>
                         <autoVersionSubmodules>true</autoVersionSubmodules>
                     </configuration>
                 </plugin>
@@ -2092,12 +2093,6 @@
               <archetype.test.skip>true</archetype.test.skip>
             </properties>
         </profile>
-        <profile>
-            <id>manual</id>
-            <modules>
-                <module>manual</module>
-            </modules>
-        </profile>
         <profile>
             <id>rat</id>
             <activation>


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


> Add a feature for the manual
> ----------------------------
>
>                 Key: KARAF-5649
>                 URL: https://issues.apache.org/jira/browse/KARAF-5649
>             Project: Karaf
>          Issue Type: Improvement
>          Components: karaf-documentation
>    Affects Versions: 4.2.0.M2
>            Reporter: Francois Papon
>            Assignee: Jean-Baptiste Onofré
>            Priority: Minor
>             Fix For: 4.2.0.M2
>
>
> Adding a documentation feature in order to published the generated manual in 
> html with the http service.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

Reply via email to