You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by rw...@apache.org on 2009/12/15 11:11:28 UTC
svn commit: r890733 - in
/geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test:
./ framework/
Author: rwonly
Date: Tue Dec 15 10:11:27 2009
New Revision: 890733
URL: http://svn.apache.org/viewvc?rev=890733&view=rev
Log:
some codes clean up
Modified:
geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/BlueprintMBeanTest.java
geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/BeanValidator.java
geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/CollectionValidator.java
geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/MapEntryValidator.java
geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/RefValidator.java
geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/ReferenceValidator.java
geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/ServiceReferenceValidator.java
geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/ServiceValidator.java
geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/ValueValidator.java
Modified: geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/BlueprintMBeanTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/BlueprintMBeanTest.java?rev=890733&r1=890732&r2=890733&view=diff
==============================================================================
--- geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/BlueprintMBeanTest.java (original)
+++ geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/BlueprintMBeanTest.java Tue Dec 15 10:11:27 2009
@@ -55,7 +55,7 @@
public static Option[] configuration()
{
- System.out.println("***************************Configuration*****************************");
+ System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Configuration");
return CoreOptions.options(CoreOptions.equinox(), CoreOptions.provision(
CoreOptions.mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.configadmin"),
CoreOptions.mavenBundle().groupId("org.ops4j.pax.logging").artifactId("pax-logging-api"),
@@ -70,7 +70,7 @@
@Before
public void setup() throws Exception {
- System.out.println("****************************Before Test*********************************");
+ System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Before Test");
// Create a MBean Server
//MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
@@ -85,17 +85,17 @@
try {
mbs.getObjectInstance(new ObjectName(BlueprintStateMBean.OBJECTNAME));
mbs.getObjectInstance(new ObjectName(BlueprintMetadataMBean.OBJECTNAME));
- System.out.println("**************************** Found MBeans *********************************");
+ System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Found MBeans");
break;
}catch(InstanceNotFoundException e){
- if (i==5) throw new Exception("****************************BlueprintStateMBean & BlueprintMetadataMBean are not found in server****************************");
+ if (i==5) throw new Exception(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> BlueprintStateMBean & BlueprintMetadataMBean are not found in server");
}
i++;
Thread.sleep(1000);
}
// Wait enough time for osgi framework and blueprint bundles to be set up
- System.out.println("**************************** Waiting *********************************");
+ System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Waiting for bundles to be set up");
Thread.sleep(5000);
}
@@ -107,7 +107,7 @@
@Test
public void BlueprintSample()throws Exception{
- System.out.println("**************************** AAA ********************************");
+ System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Start Test Blueprint Sample");
//////////////////////////////
//Test BlueprintStateMBean
Modified: geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/BeanValidator.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/BeanValidator.java?rev=890733&r1=890732&r2=890733&view=diff
==============================================================================
--- geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/BeanValidator.java (original)
+++ geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/BeanValidator.java Tue Dec 15 10:11:27 2009
@@ -11,7 +11,7 @@
import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
-public class BeanValidator extends CompositeDataValidator implements ObjectValueValidator{
+public class BeanValidator extends CompositeDataValidator implements NonNullObjectValueValidator, TargetValidator{
private boolean validateArgumentsFlag = true;
private List<BeanArgumentValidator> beanArgumentValidators = new ArrayList<BeanArgumentValidator>();
Modified: geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/CollectionValidator.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/CollectionValidator.java?rev=890733&r1=890732&r2=890733&view=diff
==============================================================================
--- geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/CollectionValidator.java (original)
+++ geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/CollectionValidator.java Tue Dec 15 10:11:27 2009
@@ -8,7 +8,7 @@
import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
-public class CollectionValidator extends CompositeDataValidator implements ObjectValueValidator {
+public class CollectionValidator extends CompositeDataValidator implements NonNullObjectValueValidator {
private List<ObjectValueValidator> collectionValueValidators = new ArrayList<ObjectValueValidator>();
Modified: geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/MapEntryValidator.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/MapEntryValidator.java?rev=890733&r1=890732&r2=890733&view=diff
==============================================================================
--- geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/MapEntryValidator.java (original)
+++ geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/MapEntryValidator.java Tue Dec 15 10:11:27 2009
@@ -7,7 +7,7 @@
public class MapEntryValidator extends CompositeDataValidator {
- ObjectValueValidator keyValidator = null;
+ NonNullObjectValueValidator keyValidator = null;
ObjectValueValidator valueValidator = null;
@@ -15,7 +15,7 @@
super(BlueprintMetadataMBean.MAP_ENTRY_TYPE);
}
- public void setKeyValueValidator(ObjectValueValidator keyValidator, ObjectValueValidator valueValidator){
+ public void setKeyValueValidator(NonNullObjectValueValidator keyValidator, ObjectValueValidator valueValidator){
this.keyValidator = keyValidator;
this.valueValidator = valueValidator;
}
Modified: geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/RefValidator.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/RefValidator.java?rev=890733&r1=890732&r2=890733&view=diff
==============================================================================
--- geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/RefValidator.java (original)
+++ geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/RefValidator.java Tue Dec 15 10:11:27 2009
@@ -2,7 +2,7 @@
import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
-public class RefValidator extends CompositeDataValidator implements ObjectValueValidator, TargetValidator {
+public class RefValidator extends CompositeDataValidator implements NonNullObjectValueValidator, TargetValidator {
public RefValidator(String componentId){
super(BlueprintMetadataMBean.REF_METADATA_TYPE);
setExpectValue(BlueprintMetadataMBean.COMPONENT_ID, componentId);
Modified: geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/ReferenceValidator.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/ReferenceValidator.java?rev=890733&r1=890732&r2=890733&view=diff
==============================================================================
--- geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/ReferenceValidator.java (original)
+++ geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/ReferenceValidator.java Tue Dec 15 10:11:27 2009
@@ -2,7 +2,7 @@
import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
-public class ReferenceValidator extends ServiceReferenceValidator {
+public class ReferenceValidator extends ServiceReferenceValidator implements TargetValidator{
public ReferenceValidator(String interfaceName, long timeout){
super(BlueprintMetadataMBean.REFERENCE_METADATA_TYPE);
Modified: geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/ServiceReferenceValidator.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/ServiceReferenceValidator.java?rev=890733&r1=890732&r2=890733&view=diff
==============================================================================
--- geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/ServiceReferenceValidator.java (original)
+++ geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/ServiceReferenceValidator.java Tue Dec 15 10:11:27 2009
@@ -10,7 +10,7 @@
import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
-public abstract class ServiceReferenceValidator extends CompositeDataValidator implements ObjectValueValidator, TargetValidator {
+public abstract class ServiceReferenceValidator extends CompositeDataValidator implements NonNullObjectValueValidator {
private List<ReferenceListenerValidator> referenceListenerValidators = new ArrayList<ReferenceListenerValidator>();
protected ServiceReferenceValidator(CompositeType type) {
Modified: geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/ServiceValidator.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/ServiceValidator.java?rev=890733&r1=890732&r2=890733&view=diff
==============================================================================
--- geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/ServiceValidator.java (original)
+++ geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/ServiceValidator.java Tue Dec 15 10:11:27 2009
@@ -10,7 +10,7 @@
import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
-public class ServiceValidator extends CompositeDataValidator implements ObjectValueValidator {
+public class ServiceValidator extends CompositeDataValidator implements NonNullObjectValueValidator {
TargetValidator serviceComponentValidator = null;
List<MapEntryValidator> servicePropertyValidators = new ArrayList<MapEntryValidator>();
Modified: geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/ValueValidator.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/ValueValidator.java?rev=890733&r1=890732&r2=890733&view=diff
==============================================================================
--- geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/ValueValidator.java (original)
+++ geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/ValueValidator.java Tue Dec 15 10:11:27 2009
@@ -2,7 +2,7 @@
import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
-public class ValueValidator extends CompositeDataValidator implements ObjectValueValidator{
+public class ValueValidator extends CompositeDataValidator implements NonNullObjectValueValidator{
public ValueValidator(String stringValue){
super(BlueprintMetadataMBean.VALUE_METADATA_TYPE);