9 files changed, 10 insertions, 92 deletions

diff --git a/recipes-core/xml-commons/dom4j_1.6.1.bb b/recipes-core/xml-commons/dom4j_1.6.1.bb
index ee46dfd..0ba3f0e 100644
--- a/recipes-core/xml-commons/dom4j_1.6.1.bb
+++ b/recipes-core/xml-commons/dom4j_1.6.1.bb
@@ -1,6 +1,6 @@
 SUMMARY = "A simple and flexible library for working with XML, XPath and XSLT"
 DESCRIPTION = "dom4j is a simple and flexible Java library for working with XML, XPath and XSLT"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3f752b663f2a821c3b32482fc6aece3c"
 
 HOMEPAGE = "http://dom4j.github.io"
diff --git a/recipes-core/xml-commons/jaxen_1.1.6.bb b/recipes-core/xml-commons/jaxen_1.1.6.bb
index 2741f2c..13f5fdc 100644
--- a/recipes-core/xml-commons/jaxen_1.1.6.bb
+++ b/recipes-core/xml-commons/jaxen_1.1.6.bb
@@ -4,7 +4,7 @@ DOM, XOM, dom4j, and JDOM. Is it also possible to write adapters that \
 treat non-XML trees such as compiled Java byte code or Java beans as XML, \
 thus enabling you to query these trees with XPath too.\
 "
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a2e66c2e2482aa23c11342f1469fa3b6"
 
 HOMEPAGE = "http://jaxen.org/"
@@ -15,7 +15,7 @@ DEPENDS = "fastjar-native virtual/javac-native xerces-j xom"
 SRCREV = "7d7755ac8b19daa2ff6f319f432b864cc72d89b6"
 
 SRC_URI = "\
-        git://github.com/codehaus/${BPN} \
+        git://github.com/codehaus/${BPN};protocol=https;branch=master \
         http://www.jdom.org/dist/binary/archive/jdom-1.1.tar.gz;name=jdom \
 "
 SRC_URI[jdom.md5sum] = "22745cbaaddb12884ed8ee09083d8fe2"
diff --git a/recipes-core/xml-commons/jaxme_0.5.2.bb b/recipes-core/xml-commons/jaxme_0.5.2.bb
deleted file mode 100644
index b563cc6..0000000
--- a/recipes-core/xml-commons/jaxme_0.5.2.bb
+++ /dev/null
@@ -1,77 +0,0 @@
-SUMMARY = "Implementation of the JAXB API"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
-AUTHOR = "Apache Software Foundation"
-HOMEPAGE = "http://ws.apache.org/jaxme"
-
-SRC_URI = "\
-        http://apache.org/dist/ws/jaxme/source/ws-${P}-src.tar.gz;name=archive \
-        http://ftp.hosting-studio.de/pub/linux/apache/ant/source/apache-ant-1.7.1-src.tar.bz2;name=ant \
-        "
-
-# do_compile:
-# 2. ERROR in src/jaxme/org/apache/ws/jaxme/generator/XJCTask.java (at line 30)
-#         import org.apache.ws.jaxme.generator.sg.SGFactoryChain;
-#                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-# The import org.apache.ws.jaxme.generator.sg.SGFactoryChain cannot be resolved
-# ----------
-# 3. ERROR in src/jaxme/org/apache/ws/jaxme/generator/XJCTask.java (at line 1055)
-#         if (!SGFactoryChain.class.isAssignableFrom(c)) {
-#              ^^^^^^^^^^^^^^
-# SGFactoryChain cannot be resolved to a type
-# ----------
-# ... and many more
-PNBLACKLIST[jaxme] ?= "BROKEN: do_compile fails"
-
-S = "${WORKDIR}/ws-${P}"
-
-inherit java-library
-
-DEPENDS = "fastjar-native log4j1.2 xerces-j xalan-j commons-codec hsqldb antlr antlr-native"
-
-do_compile() {
-    oe_makeclasspath cp -s log4j-1.2 xercesImpl xalan2 commons-codec hsqldb antlr
-    cp=build-api:build-jaxme:build-js:build-xs:build-pm:$cp
-
-    jaxme_build src/api build-api $cp jaxmeapi-${PV}.jar
-
-    runantlr -o src/js/org/apache/ws/jaxme/js/jparser src/js/org/apache/ws/jaxme/js/jparser/java15.g
-    jaxme_build src/js build-js $cp jaxmejs-${PV}.jar
-
-    jaxme_build src/xs build-xs $cp jaxmexs-${PV}.jar
-
-    jaxme_build src/jaxme build-jaxme $cp ${JARFILENAME}
-
-#    jaxme_build src/pm build-pm $cp jaxmepm-${PV}.jar
-}
-
-do_install_append() {
-    oe_jarinstall jaxmeapi-${PV}.jar jaxmeapi.jar
-    oe_jarinstall jaxmejs-${PV}.jar jaxmejs.jar
-    oe_jarinstall jaxmexs-${PV}.jar jaxmexs.jar
-    oe_jarinstall jaxmepm-${PV}.jar jaxmepm.jar
-}
-
-# Compile helper
-# 1 - source dir
-# 2 - dest dir
-# 3 - classpath
-# 4 - jar file name
-jaxme_build() {
-    mkdir -p $2
-
-    ant_sourcepath=${WORKDIR}/apache-ant-1.7.1/src/main
-
-    echo "javac -sourcepath $ant_sourcepath:$1 -cp $3 -d $2 \`find $1 -name "*.java"\`"
-    javac -sourcepath $ant_sourcepath:$1 -cp $3 -d $2 `find $1 -name "*.java" -and -not \( -wholename "*junit*" -or -wholename "*examples*" \) `
-    (cd $1 && find . -name "*.properties" -exec cp {} ${S}/$2/{} \;)
-
-    rm -rf $2/org/apache/tools
-
-    fastjar -C $2 -c -f $4 .
-}
-
-SRC_URI[archive.md5sum] = "084ebfe4a816058f8ff6bd731fa70df4"
-SRC_URI[archive.sha256sum] = "0415d721259acf95c564fb84606bb17f6227c1cc444e89b78d1cd9903c1c88dc"
-SRC_URI[ant.md5sum] = "0d68db4a1ada5c91bcbf53cefd0c2fd7"
-SRC_URI[ant.sha256sum] = "4dc49a7260ef90a6dc6611b7e96b9f047d507589736d4a2ad6efbe3edfc6fba6"
diff --git a/recipes-core/xml-commons/jaxp1.3_1.4.01.bb b/recipes-core/xml-commons/jaxp1.3_1.4.01.bb
index 98cb077..7965bb8 100644
--- a/recipes-core/xml-commons/jaxp1.3_1.4.01.bb
+++ b/recipes-core/xml-commons/jaxp1.3_1.4.01.bb
@@ -27,7 +27,6 @@ do_compile() {
   fastjar cfm ${JARFILENAME} manifest.commons -C build .
 }
 
-SRC_URI[md5sum] = "2fea8e97a5d4d1a24bd05f5f62f3e04e"
 SRC_URI[sha256sum] = "d34bd88dc89c5c1ed2545ec5c61e4606fc28beb200a6fecf8c3ed17694181866"
 
 BBCLASSEXTEND = "native"
diff --git a/recipes-core/xml-commons/jdom_1.1.3.bb b/recipes-core/xml-commons/jdom_1.1.3.bb
index df9125d..c7b42f1 100644
--- a/recipes-core/xml-commons/jdom_1.1.3.bb
+++ b/recipes-core/xml-commons/jdom_1.1.3.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Parses, manipulates, and outputs XML using standard Java constructs"
 DESCRIPTION = "JDOM aims to provide a complete, Java-based solution for \
 accessing, manipulating, and outputting XML data from Java code."
-LICENSE = "BSD"
+LICENSE = "BSD-4-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=897c700e4c122d8f4ef8f6d253a6f744"
 
 HOMEPAGE = "http://jdom.org/"
@@ -9,7 +9,6 @@ HOMEPAGE = "http://jdom.org/"
 DEPENDS = "fastjar-native virtual/javac-native jaxen"
 
 SRC_URI = "http://www.jdom.org/dist/source/archive/jdom-${PV}.tar.gz"
-SRC_URI[md5sum] = "dc8391e84cfdb170fcd8279aa370019f"
 SRC_URI[sha256sum] = "d471718c4ac7a1a2f10715b93cb3fcd2ecbab60384b73ad1c089712e47bd8d1f"
 
 PACKAGE_ARCH = "${TUNE_PKGARCH}"
diff --git a/recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb b/recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb
index 42ce703..0fafcea 100644
--- a/recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb
+++ b/recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb
@@ -36,7 +36,6 @@ do_compile() {
   fastjar cfm ${JARFILENAME} src/manifest.resolver -C build  org
 }
 
-SRC_URI[md5sum] = "46d52acdb67ba60f0156043f30108766"
 SRC_URI[sha256sum] = "55dbe7bd56452c175320ce9a97b752252c5537427221323c72e9b9c1ac221efe"
 
 BBCLASSEXTEND = "native"
diff --git a/recipes-core/xml-commons/xom_1.2.10.bb b/recipes-core/xml-commons/xom_1.2.10.bb
index 8b43c39..9b09e4d 100644
--- a/recipes-core/xml-commons/xom_1.2.10.bb
+++ b/recipes-core/xml-commons/xom_1.2.10.bb
@@ -14,7 +14,7 @@ PV_jaxen = "1.1.6"
 
 SRC_URI = "\
         http://www.cafeconleche.org/XOM/${P}-src.tar.gz;name=archive \
-        git://github.com/codehaus/${SRCNAME_jaxen};name=jaxen \
+        git://github.com/codehaus/${SRCNAME_jaxen};name=jaxen;branch=master;protocol=https \
         file://04_remove_sun_import.patch \
 "
 SRC_URI[archive.md5sum] = "9f3a2ae827a9f6826fe76e4b7b0c22b3"
@@ -36,7 +36,7 @@ do_move_jaxen() {
 
 }
 
-addtask move_jaxen after do_removebinaries before do_patch
+addtask move_jaxen after do_deletebinaries before do_patch
 
 do_compile() {
     mkdir -p build
diff --git a/recipes-core/xml-commons/xpp2_2.1.10.bb b/recipes-core/xml-commons/xpp2_2.1.10.bb
index 6fc81a2..170f4ff 100644
--- a/recipes-core/xml-commons/xpp2_2.1.10.bb
+++ b/recipes-core/xml-commons/xpp2_2.1.10.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Streaming pull XML parser for java"
-LICENSE = "BSD-like"
+LICENSE = "BSD-4-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d40c660a53e36a103a35c170d38d0ef6"
 HOMEPAGE = "http://www.extreme.indiana.edu/xgws/xsoap/xpp/"
 
@@ -30,5 +30,4 @@ do_compile() {
     fastjar -C build-oe -c -f ${JARFILENAME} .
 }
 
-SRC_URI[md5sum] = "865ca4e2496c215d301b57450137626f"
 SRC_URI[sha256sum] = "ad82569b809e29c19b8223feaa12923f97bb4bbc942ff985857f9d853db489cf"
diff --git a/recipes-core/xml-commons/xpp3_1.1.3.4.O.bb b/recipes-core/xml-commons/xpp3_1.1.3.4.O.bb
index 1f02cb7..ce344c4 100644
--- a/recipes-core/xml-commons/xpp3_1.1.3.4.O.bb
+++ b/recipes-core/xml-commons/xpp3_1.1.3.4.O.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Streaming pull XML parser for Java (3rd edition)"
-LICENSE = "BSD-like"
+LICENSE = "BSD-4-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=35235e1ea47db355da0627f8d93e3a6c"
 
 HOMEPAGE = "http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1"
@@ -39,12 +39,11 @@ do_compile() {
     fastjar -C build-xpath -c -f xpp3-xpath-${PV}.jar .
 }
 
-do_install_append() {
+do_install:append() {
     oe_jarinstall xpp3-xpath-${PV}.jar xpp3-xpath.jar
 }
 
-FILES_libxpp3-xpath-java = "${datadir}/java/xpp3-xpath*"
+FILES:libxpp3-xpath-java = "${datadir}/java/xpp3-xpath*"
 
 
-SRC_URI[md5sum] = "e1b6aeaad1cd06e64568aae1a507d5c6"
 SRC_URI[sha256sum] = "404c0cd332f54ecf9807dc86d365c17dcffab669994c9dcbbad31fbc4b59f811"