svn commit: r820670 - in /felix/trunk/sigil: build.xml common/core/sigil.properties eclipse/core.feature/feature.xml

[ds...@apache.org]

Author: dsavage
Date: Thu Oct  1 14:43:47 2009
New Revision: 820670

URL: http://svn.apache.org/viewvc?rev=820670&view=rev
Log:
merge bnd lib inside common core bundle to avoid need to install bndlib separately
add commmons.lang jar to core.feature file for same purpose (FELIX-1677)

Modified:
    felix/trunk/sigil/build.xml
    felix/trunk/sigil/common/core/sigil.properties
    felix/trunk/sigil/eclipse/core.feature/feature.xml

Modified: felix/trunk/sigil/build.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/build.xml?rev=820670&r1=820669&r2=820670&view=diff
==============================================================================
--- felix/trunk/sigil/build.xml (original)
+++ felix/trunk/sigil/build.xml Thu Oct  1 14:43:47 2009
@@ -34,8 +34,7 @@
     <subant buildpath="bldcommon/prepare" target="resolve" />
   </target>
 
-  <!--target name="dist" depends="build, site" /-->
-  <target name="dist" depends="build" />
+  <target name="dist" depends="build, site" />
 
   <target name="clean" depends="clean-list, clean-site, clean-tmp" />
 
@@ -61,12 +60,8 @@
     <ivy:retrieve organisation="org.apache" module="felix.sigil.eclipse.search" revision="latest.integration" inline="true" pattern="${site.dir}/plugins/[artifact]_${buildVersion}.[ext]" transitive="false"/>
     <ivy:retrieve organisation="org.apache" module="felix.sigil.eclipse.ui" revision="latest.integration" inline="true" pattern="${site.dir}/plugins/[artifact]_${buildVersion}.[ext]" transitive="false"/>
     <ivy:retrieve organisation="org.apache" module="felix.sigil.eclipse.utils" revision="latest.integration" inline="true" pattern="${site.dir}/plugins/[artifact]_${buildVersion}.[ext]" transitive="false"/>
+    <ivy:retrieve organisation="sigil" module="com.springsource.org.apache.commons.lang" revision="2.4.0" inline="true" pattern="${site.dir}/plugins/[artifact]_[revision].[ext]" transitive="false"/>
 
-    <!-- extras -->
-    <ivy:retrieve organisation="biz.aQute" module="bndlib" revision="0.0.312" inline="true" pattern="${site.dir}/extras/[artifact]_[revision].[ext]" transitive="false"/>
-
-    <ivy:retrieve organisation="sigil" module="com.springsource.org.apache.commons.lang" revision="2.4.0" inline="true" pattern="${site.dir}/extras/[artifact]_[revision].[ext]" transitive="false"/>
-    
     <!-- ivy -->
     <ivy:retrieve organisation="org.apache" module="felix.sigil.ivy.resolver" revision="latest.integration" inline="true" pattern="${site.dir}/ivy/[artifact].[ext]" transitive="false"/>
 

Modified: felix/trunk/sigil/common/core/sigil.properties
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/sigil.properties?rev=820670&r1=820669&r2=820670&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/sigil.properties (original)
+++ felix/trunk/sigil/common/core/sigil.properties Thu Oct  1 14:43:47 2009
@@ -19,8 +19,15 @@
 	profiles/OSGi_Minimum-1.1.profile, \
 	profiles/profile.list, \
 
--sourcedirs: \
-	src, \
+-contents: \
+    aQute.bnd*, \
+    aQute.lib*, \
+    aQute.libg*, \
+	org.apache.felix.sigil.bnd*, \
+	org.apache.felix.sigil.config*, \
+	org.apache.felix.sigil.core*, \
+	org.apache.felix.sigil.model*, \
+	org.apache.felix.sigil.repository*, \
 
 -exports: \
 	org.apache.felix.sigil.bnd, \
@@ -34,7 +41,7 @@
 	org.apache.felix.sigil.repository, \
 
 -imports: \
-	aQute.lib.osgi, \
+	aQute.lib.osgi;resolve=compile, \
 	org.apache.felix.sigil.bnd, \
 	org.apache.felix.sigil.common.osgi, \
 	org.apache.felix.sigil.config, \

Modified: felix/trunk/sigil/eclipse/core.feature/feature.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core.feature/feature.xml?rev=820670&r1=820669&r2=820670&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core.feature/feature.xml (original)
+++ felix/trunk/sigil/eclipse/core.feature/feature.xml Thu Oct  1 14:43:47 2009
@@ -77,6 +77,13 @@
    </requires>
 
    <plugin
+         id="com.springsource.org.apache.commons.lang"
+         download-size="0"
+         install-size="0"
+         version="2.4.0"
+         unpack="false"/>
+         
+   <plugin
          id="org.apache.felix.sigil.common.core"
          download-size="0"
          install-size="0"