aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hugh...@apache.org
Subject svn commit: r1188776 - in /aries/branches/oct-2011-release/blueprint: blueprint-bundle/pom.xml blueprint-core/pom.xml
Date Tue, 25 Oct 2011 16:41:35 GMT
Author: hughesj
Date: Tue Oct 25 16:41:35 2011
New Revision: 1188776

URL: http://svn.apache.org/viewvc?rev=1188776&view=rev
Log:
ARIES-766: remove need for resources to be referred to by ../

Modified:
    aries/branches/oct-2011-release/blueprint/blueprint-bundle/pom.xml
    aries/branches/oct-2011-release/blueprint/blueprint-core/pom.xml

Modified: aries/branches/oct-2011-release/blueprint/blueprint-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/blueprint/blueprint-bundle/pom.xml?rev=1188776&r1=1188775&r2=1188776&view=diff
==============================================================================
--- aries/branches/oct-2011-release/blueprint/blueprint-bundle/pom.xml (original)
+++ aries/branches/oct-2011-release/blueprint/blueprint-bundle/pom.xml Tue Oct 25 16:41:35
2011
@@ -100,10 +100,6 @@
         <aries.osgi.import.service>
             org.osgi.service.cm.ConfigurationAdmin;availability:=optional
         </aries.osgi.import.service>
-        <aries.osgi.include.resource>
-            {maven-resources},
-            META-INF/NOTICE=../NOTICE
-        </aries.osgi.include.resource>
         <aries.osgi.failok>
             true
         </aries.osgi.failok>

Modified: aries/branches/oct-2011-release/blueprint/blueprint-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/oct-2011-release/blueprint/blueprint-core/pom.xml?rev=1188776&r1=1188775&r2=1188776&view=diff
==============================================================================
--- aries/branches/oct-2011-release/blueprint/blueprint-core/pom.xml (original)
+++ aries/branches/oct-2011-release/blueprint/blueprint-core/pom.xml Tue Oct 25 16:41:35 2011
@@ -84,6 +84,10 @@
       <aries.osgi.export.service>
           org.apache.aries.blueprint.ParserService
       </aries.osgi.export.service>
+      <aries.osgi.include.resource>
+          {maven-resources},
+          org/apache/aries/blueprint/blueprint.xsd=${project.build.directory}/sources/org/osgi/service/blueprint/blueprint.xsd
+      </aries.osgi.include.resource>
   </properties>
   
   <dependencies>
@@ -170,19 +174,37 @@
                 <directory>src/main/resources</directory>
             </resource>
             <resource>
-                <directory>../blueprint-api/src/main/resources/org/osgi/service/blueprint</directory>
-                <targetPath>org/apache/aries/blueprint</targetPath>
-                <includes>
-                    <include>blueprint.xsd</include>
-                </includes>
-            </resource>
-            <resource>
                   <directory>${project.build.sourceDirectory}</directory>
                   <includes>
                      <include>**/packageinfo</include>
                   </includes>
             </resource>
         </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack-sources</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.aries.blueprint</groupId>
+                                    <artifactId>org.apache.aries.blueprint.api</artifactId>
+                                    <classifier>sources</classifier>
+                                    <includes>**/blueprint.xsd</includes>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>${project.build.directory}/sources</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
-  
 </project>



Mime
View raw message