ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From to...@apache.org
Subject svn commit: r925320 - in /incubator/ace/trunk/ace-webui: osgi.bnd pom.xml
Date Fri, 19 Mar 2010 16:53:20 GMT
Author: tonit
Date: Fri Mar 19 16:53:20 2010
New Revision: 925320

URL: http://svn.apache.org/viewvc?rev=925320&view=rev
Log:
use correct bnd manifest in webui war

Added:
    incubator/ace/trunk/ace-webui/osgi.bnd
Modified:
    incubator/ace/trunk/ace-webui/pom.xml

Added: incubator/ace/trunk/ace-webui/osgi.bnd
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-webui/osgi.bnd?rev=925320&view=auto
==============================================================================
--- incubator/ace/trunk/ace-webui/osgi.bnd (added)
+++ incubator/ace/trunk/ace-webui/osgi.bnd Fri Mar 19 16:53:20 2010
@@ -0,0 +1,8 @@
+Bundle-Version>:\
+  ${pom.version}
+
+Bundle-SymbolicName:\
+  ${bundle.symbolicName}
+
+Bundle-Name: Apache ACE - Client Web UI
+Bundle-Activator: org.apache.ace.server.Activator

Modified: incubator/ace/trunk/ace-webui/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-webui/pom.xml?rev=925320&r1=925319&r2=925320&view=diff
==============================================================================
--- incubator/ace/trunk/ace-webui/pom.xml (original)
+++ incubator/ace/trunk/ace-webui/pom.xml Fri Mar 19 16:53:20 2010
@@ -25,7 +25,7 @@
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
         <version>0.8.0-SNAPSHOT</version>
-        <relativePath>../pom/</relativePath>                
+        <relativePath>../pom/</relativePath>
     </parent>
 
     <groupId>org.apache.ace</groupId>
@@ -42,29 +42,6 @@
 
     <build>
         <plugins>
-
-			<plugin>
-			        <groupId>org.apache.felix</groupId>
-			        <artifactId>maven-bundle-plugin</artifactId>
-			        <executions>
-			          <execution>
-			            <id>bundle-manifest</id>
-			            <phase>process-classes</phase>
-			            <goals>
-			              <goal>manifest</goal>
-			            </goals>
-			          </execution>
-			        </executions>
-			        <configuration>
-			          <supportedProjectTypes>
-			            <supportedProjectType>jar</supportedProjectType>
-			            <supportedProjectType>bundle</supportedProjectType>
-			            <supportedProjectType>war</supportedProjectType>
-			          </supportedProjectTypes>
-			        </configuration>
-			      </plugin>
-
-
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>gwt-maven-plugin</artifactId>
@@ -73,10 +50,53 @@
                     <execution>
                         <goals>
                             <goal>compile</goal>
-                           <!-- <goal>generateAsync</goal>-->
+                            <!-- <goal>generateAsync</goal>-->
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                    </archive>
+                </configuration>
+            </plugin>
+            <!--
+             Enable support for non-bundle packaging types
+             See: http://felix.apache.org/site/apache-felix-maven-bundle-plugin-bnd.html
+            -->
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>2.0.0</version>
+                <executions>
+                    <execution>
+                        <id>bundle-manifest</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>manifest</goal>
                         </goals>
+                        <configuration>
+
+                        </configuration>
                     </execution>
                 </executions>
+                <configuration>
+                    <supportedProjectTypes>
+                        <supportedProjectType>jar</supportedProjectType>
+                        <supportedProjectType>bundle</supportedProjectType>
+                        <supportedProjectType>war</supportedProjectType>
+                    </supportedProjectTypes>
+                    <instructions>
+                        <!-- ...etc... -->
+                    </instructions>
+                </configuration>
             </plugin>
         </plugins>
     </build>



Mime
View raw message