Thanks Jason,
I went ahead and committed the changes.
Ken
Jason Lee wrote:
> Should be low/no impact change.
>
> +1
>
> On Sep 11, 2008, at 3:04 PM, Ken Paulsen wrote:
>
>>
>> Hi everyone,
>>
>> Below are the diffs to a change I hope to commit which adds OSGi
>> meta-data to the webui-jsf.jar's MANIFEST.MF. Besides altering the
>> the MANIFEST.MF, this change does not have any other side-effects. I
>> did a diff of the files in the in webui-jsf.jar and of the contents
>> of those files -- nothing else is affected.
>>
>> cvs -q diff -u
>> Index: build-manifest.xml
>> ===================================================================
>> RCS file: /cvs/woodstock/webui/build-manifest.xml,v
>> retrieving revision 1.4
>> diff -u -r1.4 build-manifest.xml
>> --- build-manifest.xml 13 Nov 2007 01:19:01 -0000 1.4
>> +++ build-manifest.xml 11 Sep 2008 20:01:57 -0000
>> @@ -71,21 +71,34 @@
>> </target>
>> <target name="webui">
>> - <antcall target="build-webui-manifest">
>> - <param name="mf-name" value="webui.mf"/>
>> - <param name="section-name" value="${package-path}"/>
>> - <param name="implementation-title" value="${webui-impl-title}" />
>> - <param name="implementation-version"
>> value="${webui-impl-version}" />
>> - <param name="specification-title" value="${webui-spec-title}" />
>> - <param name="specification-version"
>> value="${webui-spec-version}" />
>> - <param name="component-version" value="${component-version}"/>
>> - <param name="swaed-version" value="${swaed-version}"/>
>> - <param name="theme-required-version"
>> value="${theme-required-version}"/>
>> - <param name="jsf-version" value="${jsf-version}"/>
>> - <param name="dependencies" value="${dependencies}"/>
>> - <param name="fileupload-dependencies"
>> - value="${fileupload-dependencies}"/>
>> - </antcall>
>> + <manifest file="webui.bnd" mode="replace">
>> + <attribute name="Created-By" value="${vendor}"/>
>> + <attribute name="Implementation-Title"
>> value="${webui-impl-title}"/>
>> + <attribute name="Implementation-Version"
>> value="${webui-impl-version}"/>
>> + <attribute name="Implementation-Vendor" value="${vendor}"/>
>> + <attribute name="Implementation-Vendor-Id" value="com.sun"/>
>> + <attribute name="Specification-Title"
>> value="${webui-spec-title}"/>
>> + <attribute name="Specification-Version"
>> value="${webui-spec-version}"/>
>> + <attribute name="Specification-Vendor" value="${vendor}"/>
>> + <attribute name="-level" value="0" /> <!-- compression level -->
>> +
>> + <!-- OSGi metadata -->
>> + <attribute name="Export-Package" value="*" />
>> + <attribute name="Import-Package"
>> value="com.sun.data.provider.*;resolution:=optional,*" />
>> + <attribute name="Bundle-Version" value="${webui-impl-version}" />
>> + <attribute name="Bundle-SymbolicName"
>> value="com.sun.woodstock.webui-jsf" />
>> + <attribute name="Bundle-Description" value="Woodstock JavaServer
>> Faces Component Library" />
>> +
>> + <section name="${package-path}">
>> + <attribute name="X-SJWUIC-SWAED-Version"
>> value="${swaed-version}"/>
>> + <attribute name="X-SJWUIC-Components-Version"
>> value="${component-version}"/>
>> + <attribute name="X-SJWUIC-Components-Timestamp"
>> value="${buildnumber}"/>
>> + <attribute name="X-SJWUIC-Theme-Version-Required"
>> value="${theme-required-version}"/>
>> + <attribute name="X-SJWUIC-JSF-Version" value="${jsf-version}"/>
>> + <attribute name="X-SJWUIC-Dependencies" value="${dependencies}"/>
>> + <attribute name="X-SJWUIC-Dependencies-FileUpload"
>> value="${fileupload-dependencies}"/>
>> + </section>
>> + </manifest>
>> </target>
>> <target name="webui-module-stub">
>> @@ -123,59 +136,16 @@
>> <manifest file="${mf-name}" mode="replace">
>> <attribute name="Created-By" value="${vendor}"/>
>> - <attribute name="Implementation-Title"
>> - value="${implementation-title}"/>
>> - <attribute name="Implementation-Version"
>> - value="${implementation-version}"/>
>> - <attribute name="Implementation-Vendor"
>> - value="${vendor}"/>
>> - <attribute name="Implementation-Vendor-Id"
>> - value="com.sun"/>
>> - <attribute name="Specification-Title"
>> - value="${specification-title}"/>
>> - <attribute name="Specification-Version"
>> - value="${specification-version}"/>
>> - <attribute name="Specification-Vendor"
>> - value="${vendor}"/>
>> + <attribute name="Implementation-Title"
>> value="${implementation-title}"/>
>> + <attribute name="Implementation-Version"
>> value="${implementation-version}"/>
>> + <attribute name="Implementation-Vendor" value="${vendor}"/>
>> + <attribute name="Implementation-Vendor-Id" value="com.sun"/>
>> + <attribute name="Specification-Title"
>> value="${specification-title}"/>
>> + <attribute name="Specification-Version"
>> value="${specification-version}"/>
>> + <attribute name="Specification-Vendor" value="${vendor}"/>
>> </manifest>
>> </target>
>> - <target name="build-webui-manifest">
>> - <manifest file="${mf-name}" mode="replace">
>> - <attribute name="Created-By" value="${vendor}"/>
>> -
>> - <attribute name="Implementation-Title"
>> - value="${implementation-title}"/>
>> - <attribute name="Implementation-Version"
>> - value="${implementation-version}"/>
>> - <attribute name="Implementation-Vendor"
>> - value="${vendor}"/>
>> - <attribute name="Implementation-Vendor-Id"
>> - value="com.sun"/>
>> - <attribute name="Specification-Title"
>> - value="${specification-title}"/>
>> - <attribute name="Specification-Version"
>> - value="${specification-version}"/>
>> - <attribute name="Specification-Vendor"
>> - value="${vendor}"/>
>> -
>> - <section name="${section-name}">
>> - <attribute name="X-SJWUIC-SWAED-Version"
>> value="${swaed-version}"/>
>> - <attribute name="X-SJWUIC-Components-Version"
>> - value="${component-version}"/>
>> - <attribute name="X-SJWUIC-Components-Timestamp"
>> - value="${buildnumber}"/>
>> - <attribute name="X-SJWUIC-Theme-Version-Required"
>> - value="${theme-required-version}"/>
>> - <attribute name="X-SJWUIC-JSF-Version" value="${jsf-version}"/>
>> - <attribute name="X-SJWUIC-Dependencies" value="${dependencies}"/>
>> - <attribute name="X-SJWUIC-Dependencies-FileUpload"
>> - value="${fileupload-dependencies}"/>
>> - </section>
>> -
>> -
>> - </manifest>
>> - </target>
>> <target name="build-l10n-manifest">
>> Index: build.properties
>> ===================================================================
>> RCS file: /cvs/woodstock/webui/build.properties,v
>> retrieving revision 1.5
>> diff -u -r1.5 build.properties
>> --- build.properties 25 Mar 2008 10:58:54 -0000 1.5
>> +++ build.properties 11 Sep 2008 20:01:57 -0000
>> @@ -72,3 +72,5 @@
>> ComponentVersion=4.3
>> SWAEDVersion=4.0
>> +# Location of bnd.jar file
>> +bnd.jar=lib/external/bnd-0.0.258.jar
>> Index: build.xml
>> ===================================================================
>> RCS file: /cvs/woodstock/webui/build.xml,v
>> retrieving revision 1.11
>> diff -u -r1.11 build.xml
>> --- build.xml 29 Oct 2007 13:48:10 -0000 1.11
>> +++ build.xml 11 Sep 2008 20:01:58 -0000
>> @@ -343,13 +343,8 @@
>> <copy file="${gen}/META-INF/facelets.taglib.xml"
>> tofile="${classes}/runtime/META-INF/woodstock.taglib.xml"/>
>> <!-- Create the runtime JAR -->
>> - <jar jarfile="${netbeans}/modules/autoload/ext/${webui.jar}"
>> - manifest="webui.mf" -
>> basedir="${classes}/runtime"
>> - excludesfile="${lib.netbeans}/standard-jar-excludes.txt"
>> - excludes="${all.exclude}"
>> - compress="${build.package.compress}"
>> index="${build.package.index}">
>> - </jar>
>> + <taskdef resource="aQute/bnd/ant/taskdef.properties"
>> classpath="${bnd.jar}" />
>> + <bnd files="webui.bnd" classpath="${classes}/runtime"
>> output="${netbeans}/modules/autoload/ext/${webui.jar}" />
>> <!-- put it in dist too -->
>> <mkdir dir="${dist}"/>
>> cvs diff: lib/external/bnd-0.0.258.jar is a new entry, no comparison
>> available
>>
>>
>> If I don't hear any objections, I'll commit this change by COB today.
>>
>> Thanks!
>>
>> Ken Paulsen
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe_at_woodstock.dev.java.net
>> For additional commands, e-mail: dev-help_at_woodstock.dev.java.net
>>
>
> Jason Lee - x31197
> Senior Java Developer, Sun Microsystems
> GlassFish Admin Console Team
> Email: jasondlee_at_sun.com
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe_at_woodstock.dev.java.net
> For additional commands, e-mail: dev-help_at_woodstock.dev.java.net
>