FCL/sftools/dev/build: comparison buildframework/helium/sf/java/sysdef/src/com/nokia/helium/sysdef/ant/taskdefs/CreateRootSysdefTask.java

equal deleted inserted replaced

-:c7c26511138f
+:7c4a911dc066
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.Resource;
 import org.apache.tools.ant.types.ResourceCollection;
+import com.nokia.helium.sysdef.PackageDefinition;
+import com.nokia.helium.sysdef.PackageDefinitionParsingException;
 import com.nokia.helium.sysdef.PackageMap;
 import com.nokia.helium.sysdef.PackageMapParsingException;
 import freemarker.cache.ClassTemplateLoader;
 import freemarker.cache.FileTemplateLoader;
 * file. All package must also have a package_data.xml file in order to retrieve
 * the root and the layer location of the package.
 *
 * Example:
 * <pre>
-* &lt;hlm:createPackageMapping epocroot="E:\sdk" destFile="E:\sdk\sysdef_root.xml" &gt;
+* &lt;hlm:createRootSysdef epocroot="E:\sdk" destFile="E:\sdk\sysdef_root.xml" &gt;
 *     &lt;fileset dir="E:\sdk" includes="root/&#42;&#42;/package_definition.xml"&gt;
-* &lt;/hlm:createPackageMapping&gt;
+* &lt;/hlm:createRootSysdef&gt;
 * </pre>
 *
 * @ant.task name="createRootSysdef" category="Sysdef"
 */
 public class CreateRootSysdefTask extends Task {
 private File destFile;
 private List<ResourceCollection> resourceCollections = new ArrayList<ResourceCollection>();
-private Map<String, Map<String, List<String>>> roots = new HashMap<String, Map<String, List<String>>>();
+private Map<String, Map<String, List<Map<String, Object>>>> roots = new HashMap<String, Map<String, List<Map<String, Object>>>>();
 private Map<String, List<String>> layers = new HashMap<String, List<String>>();
 private File epocroot;
 private boolean failOnError = true;
 private boolean checkPackageExists;
 private File template;
+private String idNamespace;
 /**
 * {@inheritDoc}
 */
 @SuppressWarnings("unchecked")
 File pkgMapFile  = new File(pkgDir, CreatePackageMappingTask.PACKAGE_MAP_FILENAME);
 try {
 if (pkgMapFile.exists()) {
 log("Package map file: " + pkgMapFile);
 if (!checkPackageExists) {
-addPackage(pkgMapFile, pkgDir.getName());
+addPackage(pkgDefFile, pkgMapFile, pkgDir.getName());
 } else {
 PackageMap pkgMap = new PackageMap(pkgMapFile);
 File destPkg = new File(epocroot, pkgMap.getRoot() + File.separator +
 pkgMap.getLayer() + File.separator + pkgDir.getName() + File.separator +
 CreatePackageMappingTask.PACKAGE_DEFINITION_FILENAME);
 if (destPkg.exists()) {
-addPackage(pkgMapFile, pkgDir.getName());
+addPackage(pkgDefFile, pkgMapFile, pkgDir.getName());
 } else {
 log("Could not find " + destPkg.getAbsolutePath() +
 " so entry is not added to the root system definition.", Project.MSG_ERR);
 }
 }
 } else {
 pkgMapFile = new File(pkgDir.getParentFile().getParentFile(), CreatePackageMappingTask.PACKAGE_MAP_FILENAME);
 log("Package map file: " + pkgMapFile);
 if (pkgMapFile.exists()) {
 if (!checkPackageExists) {
-addPackage(pkgMapFile, pkgDir.getName());
+// slash must be use to generate correct path.
+addPackage(pkgDefFile, pkgMapFile, pkgMapFile.getParentFile().getName() + "/" +
+pkgDir.getParentFile().getName() + "/" + pkgDir.getName());
 } else {
 PackageMap pkgMap = new PackageMap(pkgMapFile);
 File destPkg = new File(epocroot, pkgMap.getRoot() + File.separator +
 pkgMap.getLayer() + File.separator +
 pkgMapFile.getParentFile().getName() + File.separator +
 pkgDir.getParentFile().getName() + File.separator + pkgDir.getName() +
 File.separator +
 CreatePackageMappingTask.PACKAGE_DEFINITION_FILENAME);
 if (destPkg.exists()) {
-addPackage(pkgMapFile, pkgDir.getParentFile().getName() +
+addPackage(destPkg, pkgMapFile, pkgMapFile.getParentFile().getName() + "/" +
-File.separator + pkgDir.getName());
+pkgDir.getParentFile().getName() + "/" + pkgDir.getName());
 } else {
 log("Could not find " + destPkg.getAbsolutePath() +
 " so entry is not added to the root system definition.", Project.MSG_ERR);
 }
 }
 } else {
-log("Could not find: " + pkgMapFile.toString(), Project.MSG_ERR);
+log("Could not find package_map.xml file for " + pkgDefFile.toString(), Project.MSG_ERR);
 if (shouldFailOnError()) {
-throw new BuildException("Could not find:" + pkgMapFile.toString());
+throw new BuildException("Could not find package_map.xml file for " + pkgDefFile.toString());
 }
 }
 }
 } catch (PackageMapParsingException e) {
 log("Invalid " + CreatePackageMappingTask.PACKAGE_MAP_FILENAME
 + " file: " + pkgMapFile.toString()
 + "(" + e.getMessage() + ")", Project.MSG_ERR);
 if (shouldFailOnError()) {
 throw new BuildException(e.getMessage(), e);
 }
+} catch (PackageDefinitionParsingException e) {
+log("Invalid " + CreatePackageMappingTask.PACKAGE_DEFINITION_FILENAME
++ "(" + e.getMessage() + ")", Project.MSG_ERR);
+if (shouldFailOnError()) {
+throw new BuildException(e.getMessage(), e);
+}
 }
 }
 }
 generateRootSysdef();
 }
-private void addPackage(File pkgMapFile, String pkgPath) throws
+private void addPackage(File pkgDefinition, File pkgMapFile, String pkgPath) throws
-PackageMapParsingException {
+PackageMapParsingException, PackageDefinitionParsingException {
+// Some quick validity checking.
+PackageDefinition pkg = new PackageDefinition(pkgDefinition);
+if (idNamespace == null && (pkg.getIdNamespace() != null && pkg.getIdNamespace().length() > 0)) {
+idNamespace = pkg.getIdNamespace();
+} else if (idNamespace != null && !idNamespace.equals(pkg.getIdNamespace())) {
+log("Warning: " + pkgDefinition.toString() +
+" namespace doesn't match the default one. ("
++ idNamespace + " != " + pkg.getIdNamespace(), Project.MSG_WARN);
+}
+// Adding the package in the structure.
 log("Adding: " + pkgMapFile, Project.MSG_DEBUG);
-// Adding the package in the structure.
 PackageMap pkgMap = new PackageMap(pkgMapFile);
 if (!roots.containsKey(pkgMap.getRoot())) {
-roots.put(pkgMap.getRoot(), new HashMap<String, List<String>>());
+roots.put(pkgMap.getRoot(), new HashMap<String, List<Map<String, Object>>>());
 }
 if (!roots.get(pkgMap.getRoot()).containsKey(pkgMap.getLayer())) {
-roots.get(pkgMap.getRoot()).put(pkgMap.getLayer(), new ArrayList<String>());
+roots.get(pkgMap.getRoot()).put(pkgMap.getLayer(), new ArrayList<Map<String, Object>>());
 layers.put(pkgMap.getLayer(), new ArrayList<String>());
 }
-roots.get(pkgMap.getRoot()).get(pkgMap.getLayer()).add(pkgPath);
+Map<String, Object> data = new HashMap<String, Object>();
+data.put("path", pkgPath);
+data.put("id", pkg.getId());
+data.put("namespaces", pkg.getNamespaces());
+roots.get(pkgMap.getRoot()).get(pkgMap.getLayer()).add(data);
 layers.get(pkgMap.getLayer()).add(pkgPath);
 }
 /**
 * Defines the location of the generated INI file.
 Map<String, Object> data = new Hashtable<String, Object>();
 // Content by root
 data.put("roots", roots);
 // Content by layer
 data.put("layers", layers);
+// id-namespace
+if (idNamespace != null) {
+data.put("idnamespace", idNamespace);
+}
 // Environment location
 data.put("epocroot", getEpocroot().getAbsolutePath());
 // Relative path from destFile to epocroot.
 data.put("dest_dir_to_epocroot", getRelativeDiff());
 StringWriter out = new StringWriter();
 * Get the relative path to go to epocroot from destdir.
 * @return the path relative path to go to root.
 */
 protected String getRelativeDiff() {
 String rel = getEpocroot().toURI().relativize(getDestFile().getParentFile().toURI()).getPath();
-String[] relArray = rel.split("/"); // This is an URI not a File.
+if (rel.length() > 0) {
-rel = "";
+String[] relArray = rel.split("/"); // This is an URI not a File.
-for (String string : relArray) {
+rel = ""; //"." + File.separatorChar;
-rel += ".." + File.separatorChar;
+for (@SuppressWarnings("unused") String string : relArray) {
+rel += ".." + File.separatorChar;
+}
+} else {
+rel = "." + File.separatorChar;
 }
 return rel;
 }
 }

changeset 628	7c4a911dc066
parent 588	c7c26511138f