felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r1309872 - /felix/trunk/webconsole-plugins/ds/pom.xml
Date Thu, 05 Apr 2012 14:17:07 GMT
Author: fmeschbe
Date: Thu Apr  5 14:17:06 2012
New Revision: 1309872

URL: http://svn.apache.org/viewvc?rev=1309872&view=rev
Log:
FELIX-3442 Have to explicitly include processed resources
  use Include-Resource directive extension instead of maven resource
  to embed the processed translation files

Modified:
    felix/trunk/webconsole-plugins/ds/pom.xml

Modified: felix/trunk/webconsole-plugins/ds/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/ds/pom.xml?rev=1309872&r1=1309871&r2=1309872&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/ds/pom.xml (original)
+++ felix/trunk/webconsole-plugins/ds/pom.xml Thu Apr  5 14:17:06 2012
@@ -35,20 +35,6 @@
     </scm>
 
     <build>
-		<!-- add UTF-8-to-ISO translated resources -->
-		<resources>
-			<resource>
-				<directory>${basedir}/src/main/resources</directory>
-			</resource>
-			<resource>
-				<directory>target/classes</directory>
-				<includes>
-					<include>OSGI-INF/**</include>
-				</includes>
-				<filtering>false</filtering>
-			</resource>
-		</resources>
-    
         <plugins>
             <!-- translate UTF-8 encoded properties files to ISO-8859-1 -->
             <plugin>
@@ -80,6 +66,9 @@
                         <Bundle-Activator>
                             org.apache.felix.webconsole.plugins.ds.internal.Activator
                         </Bundle-Activator>
+                        <Include-Resource>
+                            {maven-resources},OSGI-INF=target/classes/OSGI-INF
+                        </Include-Resource>
                     </instructions>
                 </configuration>
             </plugin>



Mime
View raw message