[overlord-commits] Overlord SVN: r487 - in cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb: pi4soa and 1 other directory.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Tue Feb 10 13:06:51 EST 2009
Author: objectiser
Date: 2009-02-10 13:06:51 -0500 (Tue, 10 Feb 2009)
New Revision: 487
Modified:
cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/AbstractServiceValidator.java
cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/Endpoint.java
cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ServiceValidator.java
cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ServiceValidatorManager.java
cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ValidatorName.java
cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/pi4soa/Pi4SOAServiceValidator.java
Log:
Updates following testing.
Modified: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/AbstractServiceValidator.java
===================================================================
--- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/AbstractServiceValidator.java 2009-02-10 17:59:36 UTC (rev 486)
+++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/AbstractServiceValidator.java 2009-02-10 18:06:51 UTC (rev 487)
@@ -46,7 +46,9 @@
/**
* This method returns the input stream associated
- * with the model.
+ * with the model. Once the input stream has been
+ * used, it is the caller's responsibility to close
+ * the stream.
*
* @return The model's input stream, or null if
* not found
@@ -60,5 +62,9 @@
return(ret);
}
+ public String toString() {
+ return("ServiceValidator["+getValidatorName()+"]");
+ }
+
private ValidatorName m_name=null;
}
Modified: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/Endpoint.java
===================================================================
--- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/Endpoint.java 2009-02-10 17:59:36 UTC (rev 486)
+++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/Endpoint.java 2009-02-10 18:06:51 UTC (rev 487)
@@ -77,6 +77,10 @@
return(ret);
}
+ public String toString() {
+ return("Endpoint["+m_destination+"]");
+ }
+
private String m_destination=null;
private java.util.List<ServiceValidator> m_validators=
new java.util.Vector<ServiceValidator>();
Modified: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ServiceValidator.java
===================================================================
--- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ServiceValidator.java 2009-02-10 17:59:36 UTC (rev 486)
+++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ServiceValidator.java 2009-02-10 18:06:51 UTC (rev 487)
@@ -53,8 +53,10 @@
/**
* This method is called to update the model associated
* with the service validator.
+ *
+ * @throws Exception Failed to update the service validator
*/
- public void update();
+ public void update() throws Exception;
/**
* This method closes the service validator.
Modified: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ServiceValidatorManager.java
===================================================================
--- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ServiceValidatorManager.java 2009-02-10 17:59:36 UTC (rev 486)
+++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ServiceValidatorManager.java 2009-02-10 18:06:51 UTC (rev 487)
@@ -391,16 +391,22 @@
name = new ValidatorName(role);
}
- // Obtain the service container
- sm = createServiceValidator(name);
-
- if (logger.isLoggable(Level.FINE)) {
- logger.fine("Service validator for '"+modelName+
- "' and role '"+role+"' = "+sm);
- }
-
- // Remove validator name from list
- existingValidatorNames.remove(sm.getValidatorName());
+
+ try {
+ // Obtain the service container
+ sm = createServiceValidator(name);
+
+ if (logger.isLoggable(Level.FINE)) {
+ logger.fine("Service validator for '"+modelName+
+ "' and role '"+role+"' = "+sm);
+ }
+
+ // Remove validator name from list
+ existingValidatorNames.remove(sm.getValidatorName());
+ } catch(Exception e) {
+ logger.log(Level.SEVERE, "Failed to create service validator '"+
+ name+"'", e);
+ }
} else {
logger.severe("Model name must be specified in validation mode");
}
@@ -432,7 +438,9 @@
m_inputValidators.put(endpoint, svs);
}
- svs.add(sm);
+ if (svs.contains(sm) == false) {
+ svs.add(sm);
+ }
existingInputEndpoints.remove(endpoint);
}
@@ -461,7 +469,9 @@
m_outputValidators.put(endpoint, svs);
}
- svs.add(sm);
+ if (svs.contains(sm) == false) {
+ svs.add(sm);
+ }
existingOutputEndpoints.remove(endpoint);
}
@@ -571,6 +581,10 @@
ret = files[i].lastModified();
}
}
+
+ if (ret < m_modelsDir.lastModified()) {
+ ret = m_modelsDir.lastModified();
+ }
}
return(ret);
Modified: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ValidatorName.java
===================================================================
--- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ValidatorName.java 2009-02-10 17:59:36 UTC (rev 486)
+++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ValidatorName.java 2009-02-10 18:06:51 UTC (rev 487)
@@ -103,7 +103,8 @@
boolean ret=false;
if (obj instanceof ValidatorName) {
- ret = obj.toString().equals(toString());
+ ret = (obj.toString().equals(toString()) &&
+ ((ValidatorName)obj).m_validate == m_validate);
}
return(ret);
Modified: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/pi4soa/Pi4SOAServiceValidator.java
===================================================================
--- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/pi4soa/Pi4SOAServiceValidator.java 2009-02-10 17:59:36 UTC (rev 486)
+++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/pi4soa/Pi4SOAServiceValidator.java 2009-02-10 18:06:51 UTC (rev 487)
@@ -39,8 +39,10 @@
* validator implementation.
*
* @param name The validator name
+ * @throws Exception Failed to initialize service validator
*/
- public Pi4SOAServiceValidator(ValidatorName name) {
+ public Pi4SOAServiceValidator(ValidatorName name)
+ throws Exception {
super(name);
update();
@@ -59,8 +61,10 @@
/**
* This method is called to update the model associated
* with the service validator.
+ *
+ * @throws Exception Failed to update the service validator
*/
- public void update() {
+ public void update() throws Exception {
if (logger.isLoggable(Level.FINE)) {
logger.fine("Update: "+getValidatorName());
@@ -72,6 +76,13 @@
org.pi4soa.service.behavior.ServiceDescription sdesc=
org.pi4soa.service.util.DescriptionRetrievalUtil.instance().getServiceDescription(is,
getValidatorName().getRole());
+
+ try {
+ is.close();
+ } catch(Exception e) {
+ logger.log(Level.SEVERE, "Failed to close model '"+
+ getValidatorName()+"' input stream", e);
+ }
if (sdesc != null) {
@@ -134,6 +145,9 @@
} else {
logger.severe("Unable to obtain model for validator '"+
getValidatorName()+"'");
+
+ throw new java.io.IOException("Failed to locate model '"+
+ getValidatorName().getModelName()+"'");
}
}
More information about the overlord-commits
mailing list