[330735] Generate a better id for the categories
diff --git a/classes/export/generate1.php b/classes/export/generate1.php
index b43dd40..1492f63 100755
--- a/classes/export/generate1.php
+++ b/classes/export/generate1.php
@@ -346,7 +346,7 @@
$project_versions[$project_id] = $properties_file['version'];
}
if (sizeof($projects) > 0) {
- $site_xml .= "\n\t<category-def name=\"org.eclipse.babel.nls_$language_iso\" label=\"Babel Language Packs in $language_name\">";
+ $site_xml .= "\n\t<category-def name=\"nls_$language_iso\" label=\"Babel Language Packs in $language_name\">";
$site_xml .= "\n\t\t<description>Babel Language Packs in $language_name</description>";
$site_xml .= "\n\t</category-def>";
@@ -481,7 +481,7 @@
* Register this feature with the site.xml
*/
$site_xml .= "\n\t<feature url=\"features/$feature_filename\" id=\"$feature_id\" version=\"$train_version_timestamp\">";
- $site_xml .= "\n\t\t<category name=\"Babel Language Packs in $language_name\"/>";
+ $site_xml .= "\n\t\t<category name=\"nls_$language_iso\"/>";
$site_xml .= "\n\t</feature>";
} /* End: foreach project */
echo "${leader}Completed language pack for $language_name ($language_iso)\n";
@@ -521,7 +521,7 @@
exec("mkdir ${output_dir_for_train}mirrors/");
if (file_exists(METADATA_GENERATOR_LOCATION) && strcmp($train_id, "europa") != 0 && strcmp($train_id, "ganymede") != 0) {
echo "Running the Meta at " . dirname(__FILE__) . "/runMetadata.sh\n";
- system("/bin/sh " . dirname(__FILE__) . "/runMetadata.sh ". METADATA_GENERATOR_LOCATION . " ${output_dir_for_train} ");
+ system("/bin/sh " . dirname(__FILE__) . "/runMetadata.sh ". METADATA_GENERATOR_LOCATION . " $output_dir_for_train $train_version_timestamp");
echo "Processing XML\n";
system("xsltproc -o ${output_dir_for_train}content.xml ". dirname(__FILE__) . "/content.xsl ${output_dir_for_train}content.xml");
system("cd ${output_dir_for_train} ; jar -fc content.jar content.xml ; jar -fc artifacts.jar artifacts.xml");
@@ -551,7 +551,7 @@
*/
if (file_exists(METADATA_GENERATOR_LOCATION) && strcmp($train_id, "europa") != 0 && strcmp($train_id, "ganymede") != 0) {
echo "Running the Meta at " . dirname(__FILE__) . "/runMetadata.sh\n";
- system("/bin/sh " . dirname(__FILE__) . "/runMetadata.sh ". METADATA_GENERATOR_LOCATION . " ${output_dir_for_train} ");
+ system("/bin/sh " . dirname(__FILE__) . "/runMetadata.sh ". METADATA_GENERATOR_LOCATION . " $output_dir_for_train $train_version_timestamp");
echo "Processing XML\n";
system("xsltproc -o ${output_dir_for_train}content.xml ". dirname(__FILE__) . "/content.xsl ${output_dir_for_train}content.xml");
system("cd ${output_dir_for_train} ; jar -fc content.jar content.xml ; jar -fc artifacts.jar artifacts.xml");
diff --git a/classes/export/runMetadata.sh b/classes/export/runMetadata.sh
index 49d4681..63c4ad5 100644
--- a/classes/export/runMetadata.sh
+++ b/classes/export/runMetadata.sh
@@ -1,2 +1,2 @@
#!/bin/sh
-$1/eclipse -noSplash -application org.eclipse.equinox.p2.publisher.UpdateSitePublisher -metadataRepository file:$2 -metadataRepositoryName "Babel Language Pack Metadata Repository" -artifactRepository file:$2 -artifactRepositoryName "Babel Language Pack Artifact Repository" -source $2
\ No newline at end of file
+$1/eclipse -noSplash -application org.eclipse.equinox.p2.publisher.UpdateSitePublisher -metadataRepository file:$2 -metadataRepositoryName "Babel Language Pack Metadata Repository" -artifactRepository file:$2 -artifactRepositoryName "Babel Language Pack Artifact Repository" -source $2 -categoryQualifier "org.eclipse.babel" -categoryVersion "$3"
\ No newline at end of file
