[Join-cvs] join1/src/main/org/figure8/join/services/properties DeploymentPropertiesExtractor.java, 1.1, 1.2 PhysicalEnvironmentPropertiesExtractor.java, 1.2, 1.3

[Laurent B. <lbr...@us...>]

Update of /cvsroot/join/join1/src/main/org/figure8/join/services/properties
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv29706/services/properties

Modified Files:
	DeploymentPropertiesExtractor.java 
	PhysicalEnvironmentPropertiesExtractor.java 
Log Message:
Complete extracted properties set

Index: PhysicalEnvironmentPropertiesExtractor.java
===================================================================
RCS file: /cvsroot/join/join1/src/main/org/figure8/join/services/properties/PhysicalEnvironmentPropertiesExtractor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PhysicalEnvironmentPropertiesExtractor.java	3 Oct 2006 19:21:37 -0000	1.2
--- PhysicalEnvironmentPropertiesExtractor.java	8 Apr 2007 19:00:41 -0000	1.3
***************
*** 74,79 ****
           String key = resource.getResourceType().getKey();
           props.setProperty(prefix + "resources." + key + ".name", resource.getName());
!          props.setProperty(prefix + "resources." + key + ".machine.name", resource.getMachine().getName());
!          props.setProperty(prefix + "resources." + key + ".machine.ip", resource.getMachine().getIpAddress());
        }
        // Return properties.
--- 74,81 ----
           String key = resource.getResourceType().getKey();
           props.setProperty(prefix + "resources." + key + ".name", resource.getName());
!          if (resource.getMachine() != null){
!             props.setProperty(prefix + "resources." + key + ".machine.name", resource.getMachine().getName());
!             props.setProperty(prefix + "resources." + key + ".machine.ip", resource.getMachine().getIpAddress());
!          }
        }
        // Return properties.
***************
*** 93,97 ****
        // Check that it is a deployment.
        if (!(obj instanceof PhysicalEnvironment))
!          throw new InvalidParameterException("This implementation of PropertiesExtract can only process PhysicalEnvironment");
        // Extract the properties of deployment.
        return extract((PhysicalEnvironment)obj);
--- 95,100 ----
        // Check that it is a deployment.
        if (!(obj instanceof PhysicalEnvironment))
!          throw new InvalidParameterException("This implementation of PropertiesExtractor "
!                  + " can only process PhysicalEnvironment");
        // Extract the properties of deployment.
        return extract((PhysicalEnvironment)obj);

Index: DeploymentPropertiesExtractor.java
===================================================================
RCS file: /cvsroot/join/join1/src/main/org/figure8/join/services/properties/DeploymentPropertiesExtractor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DeploymentPropertiesExtractor.java	4 Jul 2006 20:03:02 -0000	1.1
--- DeploymentPropertiesExtractor.java	8 Apr 2007 19:00:41 -0000	1.2
***************
*** 67,72 ****
        props.setProperty(prefix + "applicant.comments", deployment.getApplicantComments());
        // Add environment related properties.
!       props.setProperty(prefix + "logicalenv.key", deployment.getEnvironmentMapping().getLogicalEnvironment().getKey());
!       props.setProperty(prefix + "logicalenv.label", deployment.getEnvironmentMapping().getLogicalEnvironment().getLabel());
        // Add target related properties.
        props.setProperty(prefix + "target.name", deployment.getTarget().getName());
--- 67,74 ----
        props.setProperty(prefix + "applicant.comments", deployment.getApplicantComments());
        // Add environment related properties.
!       props.setProperty(prefix + "logicalenv.key", deployment.getEnvironmentMapping()
!                                                                .getLogicalEnvironment().getKey());
!       props.setProperty(prefix + "logicalenv.label", deployment.getEnvironmentMapping()
!                                                                   .getLogicalEnvironment().getLabel());
        // Add target related properties.
        props.setProperty(prefix + "target.name", deployment.getTarget().getName());
***************
*** 75,78 ****
--- 77,84 ----
        AssemblyPropertiesExtractor extractor = new AssemblyPropertiesExtractor();
        props.putAll(extractor.extract(deployment.getAssembly(), prefix + "assembly."));
+       // Add properties corresponding to physical environment.
+       PhysicalEnvironmentPropertiesExtractor envExtractor = new PhysicalEnvironmentPropertiesExtractor();
+       props.putAll(envExtractor.extract(deployment.getEnvironmentMapping().getPhysicalEnvironment(),
+               prefix + "physicalenv."));
        return props;
     }