You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2010/02/17 09:31:15 UTC
svn commit: r910862 - in /harmony/enhanced/classlib/branches/java6:
depends/jars/ modules/activation/ modules/activation/make/ modules/jaxb/
modules/jaxb/META-INF/ modules/jaxb/make/ modules/stax/
modules/stax/META-INF/ modules/stax/make/
Author: hindessm
Date: Wed Feb 17 08:31:15 2010
New Revision: 910862
URL: http://svn.apache.org/viewvc?rev=910862&view=rev
Log:
Fetch dependencies from maven repository.
Since they are not associated with a particular geronimo release, move to
distinct subdirectories. (This will mean people will need to fetch-depends
again. Sorry.)
Add Specification-Title/Version to manifests and fix bundle-version.
Modified:
harmony/enhanced/classlib/branches/java6/depends/jars/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/activation/build.xml
harmony/enhanced/classlib/branches/java6/modules/activation/make/depends.properties
harmony/enhanced/classlib/branches/java6/modules/jaxb/META-INF/MANIFEST.MF
harmony/enhanced/classlib/branches/java6/modules/jaxb/build.xml
harmony/enhanced/classlib/branches/java6/modules/jaxb/make/depends.properties
harmony/enhanced/classlib/branches/java6/modules/stax/META-INF/MANIFEST.MF
harmony/enhanced/classlib/branches/java6/modules/stax/build.xml
harmony/enhanced/classlib/branches/java6/modules/stax/make/depends.properties
Propchange: harmony/enhanced/classlib/branches/java6/depends/jars/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Feb 17 08:31:15 2010
@@ -14,3 +14,6 @@
icu4j_4.2.1
axis2-1.3
bcprov-jdk15-145
+geronimo-stax-api_1.0_spec-1.0.1
+geronimo-activation_1.1_spec-1.0.2
+geronimo-jaxb_2.1_spec-1.0
Modified: harmony/enhanced/classlib/branches/java6/modules/activation/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/activation/build.xml?rev=910862&r1=910861&r2=910862&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/activation/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/activation/build.xml Wed Feb 17 08:31:15 2010
@@ -35,7 +35,7 @@
<target name="fetch-depends">
- <mkdir dir="${geronimo.dir}" />
+ <mkdir dir="${activation.dir}" />
<download-one-file src="${activation.url}" dest="${activation.jar}"
md5="${activation.md5}" />
Modified: harmony/enhanced/classlib/branches/java6/modules/activation/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/activation/make/depends.properties?rev=910862&r1=910861&r2=910862&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/activation/make/depends.properties (original)
+++ harmony/enhanced/classlib/branches/java6/modules/activation/make/depends.properties Wed Feb 17 08:31:15 2010
@@ -14,14 +14,13 @@
# limitations under the License.
depends.jars=${depends.dir}/jars
-geronimo.version=2.2
geronimo.base=http://repo2.maven.org/maven2/org/apache/geronimo/specs
activation.base=${geronimo.base}/geronimo-activation_1.1_spec/1.0.2
-geronimo.dir=${depends.jars}/geronimo-${geronimo.version}
activation.version=1.1_spec-1.0.2
activation.basename=geronimo-activation_${activation.version}
activation.jarname=${activation.basename}.jar
-activation.jar=${geronimo.dir}/${activation.jarname}
+activation.dir=${depends.jars}/${activation.basename}
+activation.jar=${activation.dir}/${activation.jarname}
activation.url=${activation.base}/${activation.jarname}
activation.md5=9759ed85c6e767bf3dc00c4cf635c4e2
Modified: harmony/enhanced/classlib/branches/java6/modules/jaxb/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jaxb/META-INF/MANIFEST.MF?rev=910862&r1=910861&r2=910862&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jaxb/META-INF/MANIFEST.MF (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jaxb/META-INF/MANIFEST.MF Wed Feb 17 08:31:15 2010
@@ -1,8 +1,10 @@
Manifest-Version: 1.0
+Specification-Title: Java Architecture for XML Binding
+Specification-Version: 2.1
Bundle-ManifestVersion: 2
Bundle-Name: Harmony Geronimo JAXB
Bundle-SymbolicName: org.apache.harmony.jaxb
-Bundle-Version: 1.1
+Bundle-Version: 1.0
Bundle-ClassPath: geronimo-jaxb_2.1_spec-1.0.jar
Eclipse-JREBundle: true
Export-Package: javax.xml.bind,
Modified: harmony/enhanced/classlib/branches/java6/modules/jaxb/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jaxb/build.xml?rev=910862&r1=910861&r2=910862&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jaxb/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jaxb/build.xml Wed Feb 17 08:31:15 2010
@@ -35,7 +35,7 @@
<target name="fetch-depends">
- <mkdir dir="${geronimo.dir}" />
+ <mkdir dir="${jaxb.dir}" />
<download-one-file src="${jaxb.url}" dest="${jaxb.jar}"
md5="${jaxb.md5}" />
Modified: harmony/enhanced/classlib/branches/java6/modules/jaxb/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jaxb/make/depends.properties?rev=910862&r1=910861&r2=910862&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jaxb/make/depends.properties (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jaxb/make/depends.properties Wed Feb 17 08:31:15 2010
@@ -14,14 +14,13 @@
# limitations under the License.
depends.jars=${depends.dir}/jars
-depends.url=http://svn.apache.org/repos/asf/harmony/standard/depends
-geronimo.version=2.2
-geronimo.base=${depends.url}/jars/geronimo-${geronimo.version}
-geronimo.dir=${depends.jars}/geronimo-${geronimo.version}
+geronimo.base=http://repo2.maven.org/maven2/org/apache/geronimo/specs
+jaxb.base=${geronimo.base}/geronimo-jaxb_2.1_spec/1.0
jaxb.version=2.1_spec-1.0
jaxb.basename=geronimo-jaxb_${jaxb.version}
jaxb.jarname=${jaxb.basename}.jar
-jaxb.jar=${geronimo.dir}/${jaxb.jarname}
-jaxb.url=${geronimo.base}/${jaxb.jarname}
+jaxb.dir=${depends.jars}/${jaxb.basename}
+jaxb.jar=${jaxb.dir}/${jaxb.jarname}
+jaxb.url=${jaxb.base}/${jaxb.jarname}
jaxb.md5=c202b6d9a5bf4017345d0135bb487393
Modified: harmony/enhanced/classlib/branches/java6/modules/stax/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/stax/META-INF/MANIFEST.MF?rev=910862&r1=910861&r2=910862&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/stax/META-INF/MANIFEST.MF (original)
+++ harmony/enhanced/classlib/branches/java6/modules/stax/META-INF/MANIFEST.MF Wed Feb 17 08:31:15 2010
@@ -1,8 +1,10 @@
Manifest-Version: 1.0
+Specification-Title: Java Streaming API for XML Specification
+Specification-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Harmony Geronimo STAX
Bundle-SymbolicName: org.apache.harmony.stax
-Bundle-Version: 1.1
+Bundle-Version: 1.0.1
Bundle-ClassPath: geronimo-stax-api_1.0_spec-1.0.1.jar
Eclipse-JREBundle: true
Export-Package: javax.xml.stream,
Modified: harmony/enhanced/classlib/branches/java6/modules/stax/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/stax/build.xml?rev=910862&r1=910861&r2=910862&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/stax/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/stax/build.xml Wed Feb 17 08:31:15 2010
@@ -35,7 +35,7 @@
<target name="fetch-depends">
- <mkdir dir="${geronimo.dir}" />
+ <mkdir dir="${stax.dir}" />
<download-one-file src="${stax.url}" dest="${stax.jar}"
md5="${stax.md5}" />
Modified: harmony/enhanced/classlib/branches/java6/modules/stax/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/stax/make/depends.properties?rev=910862&r1=910861&r2=910862&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/stax/make/depends.properties (original)
+++ harmony/enhanced/classlib/branches/java6/modules/stax/make/depends.properties Wed Feb 17 08:31:15 2010
@@ -14,14 +14,13 @@
# limitations under the License.
depends.jars=${depends.dir}/jars
-depends.url=http://svn.apache.org/repos/asf/harmony/standard/depends
-geronimo.version=2.2
-geronimo.base=${depends.url}/jars/geronimo-${geronimo.version}
-geronimo.dir=${depends.jars}/geronimo-${geronimo.version}
+geronimo.base=http://repo2.maven.org/maven2/org/apache/geronimo/specs
+stax.base=${geronimo.base}/geronimo-stax-api_1.0_spec/1.0.1
stax.version=1.0_spec-1.0.1
stax.basename=geronimo-stax-api_${stax.version}
stax.jarname=${stax.basename}.jar
-stax.jar=${geronimo.dir}/${stax.jarname}
-stax.url=${geronimo.base}/${stax.jarname}
+stax.dir=${depends.jars}/${stax.basename}
+stax.jar=${stax.dir}/${stax.jarname}
+stax.url=${stax.base}/${stax.jarname}
stax.md5=b7c2a715cd3d1c43dc4ccfae426e8e2e