Copied:
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java
(from r893592,
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/incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java?p2=incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java&p1=geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/BlueprintMBeanTest.java&r1=893592&r2=893648&rev=893648&view=diff
==============================================================================
---
geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/BlueprintMBeanTest.java
(original)
+++
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java
Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.test;
+package org.apache.aries.jmx.test.blueprint;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
@@ -28,20 +28,20 @@
import javax.management.ObjectName;
import javax.management.openmbean.TabularData;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
-import org.apache.geronimo.blueprint.jmx.BlueprintStateMBean;
-import org.apache.geronimo.blueprint.jmx.test.framework.BeanPropertyValidator;
-import org.apache.geronimo.blueprint.jmx.test.framework.BeanValidator;
-import
org.apache.geronimo.blueprint.jmx.test.framework.BlueprintEventValidator;
-import org.apache.geronimo.blueprint.jmx.test.framework.CollectionValidator;
-import org.apache.geronimo.blueprint.jmx.test.framework.MapEntryValidator;
-import org.apache.geronimo.blueprint.jmx.test.framework.RefValidator;
-import org.apache.geronimo.blueprint.jmx.test.framework.ReferenceListValidator;
-import
org.apache.geronimo.blueprint.jmx.test.framework.ReferenceListenerValidator;
-import org.apache.geronimo.blueprint.jmx.test.framework.ReferenceValidator;
-import
org.apache.geronimo.blueprint.jmx.test.framework.RegistrationListenerValidator;
-import org.apache.geronimo.blueprint.jmx.test.framework.ServiceValidator;
-import org.apache.geronimo.blueprint.jmx.test.framework.ValueValidator;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintStateMBean;
+import org.apache.aries.jmx.test.blueprint.framework.BeanPropertyValidator;
+import org.apache.aries.jmx.test.blueprint.framework.BeanValidator;
+import org.apache.aries.jmx.test.blueprint.framework.BlueprintEventValidator;
+import org.apache.aries.jmx.test.blueprint.framework.CollectionValidator;
+import org.apache.aries.jmx.test.blueprint.framework.MapEntryValidator;
+import org.apache.aries.jmx.test.blueprint.framework.RefValidator;
+import org.apache.aries.jmx.test.blueprint.framework.ReferenceListValidator;
+import
org.apache.aries.jmx.test.blueprint.framework.ReferenceListenerValidator;
+import org.apache.aries.jmx.test.blueprint.framework.ReferenceValidator;
+import
org.apache.aries.jmx.test.blueprint.framework.RegistrationListenerValidator;
+import org.apache.aries.jmx.test.blueprint.framework.ServiceValidator;
+import org.apache.aries.jmx.test.blueprint.framework.ValueValidator;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -72,19 +72,17 @@
@Configuration
public static Option[] configuration()
{
-
- System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Configuration");
return CoreOptions.options(CoreOptions.equinox(),
-
CoreOptions.mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.configadmin").versionAsInProject(),
+
CoreOptions.mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.configadmin").versionAsInProject(),
CoreOptions.mavenBundle().groupId("org.ops4j.pax.logging").artifactId("pax-logging-api").versionAsInProject(),
CoreOptions.mavenBundle().groupId("org.ops4j.pax.logging").artifactId("pax-logging-service").versionAsInProject(),
-
CoreOptions.mavenBundle().groupId("org.apache.geronimo.blueprint").artifactId("geronimo-blueprint").versionAsInProject(),
-
CoreOptions.mavenBundle().groupId("org.apache.geronimo.blueprint").artifactId("org.apache.geronimo.blueprint.sample").versionAsInProject(),
-
CoreOptions.mavenBundle().groupId("org.apache.geronimo.blueprint").artifactId("org.apache.geronimo.blueprint.jmx").versionAsInProject(),
-
CoreOptions.mavenBundle().groupId("org.apache.geronimo.blueprint").artifactId("org.apache.geronimo.blueprint.jmx.impl").versionAsInProject()
+
CoreOptions.mavenBundle().groupId("org.apache.aries.blueprint").artifactId("aries-blueprint").versionAsInProject(),
+
CoreOptions.mavenBundle().groupId("org.apache.aries.blueprint").artifactId("org.apache.aries.blueprint.sample").versionAsInProject(),
+
CoreOptions.mavenBundle().groupId("org.apache.aries.jmx").artifactId("aries-jmx-blueprint-api").versionAsInProject(),
+
CoreOptions.mavenBundle().groupId("org.apache.aries.jmx").artifactId("aries-jmx-blueprint-core").versionAsInProject()
);
}
-
+
@Before
public void setup() throws Exception {
System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Before Test");
@@ -134,8 +132,8 @@
long sampleBundleId = -1;
long extenderBundleId = -1; // the blueprint extender bundle
"org.apache.geronimo.blueprint.geronimo-blueprint" is also a blueprint bundle.
for (Bundle bundle : rbc.getBundles()){
- if
(bundle.getSymbolicName().equals("org.apache.geronimo.blueprint.sample"))
sampleBundleId = bundle.getBundleId();
- if
(bundle.getSymbolicName().equals("org.apache.geronimo.blueprint"))
extenderBundleId = bundle.getBundleId();
+ if
(bundle.getSymbolicName().equals("org.apache.aries.blueprint.sample"))
sampleBundleId = bundle.getBundleId();
+ if (bundle.getSymbolicName().equals("org.apache.aries.blueprint"))
extenderBundleId = bundle.getBundleId();
}
if (-1==sampleBundleId) fail("Blueprint Sample Bundle is not found!");
if (-1==extenderBundleId) fail("Blueprint Extender Bundle is not
found!");
@@ -182,7 +180,7 @@
// test getComponentMetadata
// bean: foo
- BeanValidator bv_foo = new
BeanValidator("org.apache.geronimo.blueprint.sample.Foo", "init", "destroy");
+ BeanValidator bv_foo = new
BeanValidator("org.apache.aries.blueprint.sample.Foo", "init", "destroy");
BeanPropertyValidator bpv_a = new BeanPropertyValidator("a");
bpv_a.setObjectValueValidator(new ValueValidator("5"));
@@ -214,7 +212,7 @@
BeanPropertyValidator bpv_list = new BeanPropertyValidator("list");
bpv_list.setObjectValueValidator(cv);
- BeanValidator bv_bar = new
BeanValidator("org.apache.geronimo.blueprint.sample.Bar");
+ BeanValidator bv_bar = new
BeanValidator("org.apache.aries.blueprint.sample.Bar");
bv_bar.addPropertyValidators(bpv_value, bpv_context, bpv_list);
bv_bar.validate(metadataProxy.getComponentMetadata(sampleBlueprintContainerServiceId,
"bar"));
@@ -235,44 +233,44 @@
sv.validate(metadataProxy.getComponentMetadata(sampleBlueprintContainerServiceId,
serviceComponentIds[0]));
// bean: fooRegistrationListener
- BeanValidator bv_fooRegistrationListener = new
BeanValidator("org.apache.geronimo.blueprint.sample.FooRegistrationListener");
+ BeanValidator bv_fooRegistrationListener = new
BeanValidator("org.apache.aries.blueprint.sample.FooRegistrationListener");
bv_fooRegistrationListener.validate(metadataProxy.getComponentMetadata(sampleBlueprintContainerServiceId,
"fooRegistrationListener"));
// reference: ref2
ReferenceListenerValidator rlrv_1 = new
ReferenceListenerValidator("bind", "unbind");
rlrv_1.setListenerComponentValidator(new
RefValidator("bindingListener"));
- ReferenceValidator rv = new
ReferenceValidator("org.apache.geronimo.blueprint.sample.InterfaceA", 100);
+ ReferenceValidator rv = new
ReferenceValidator("org.apache.aries.blueprint.sample.InterfaceA", 100);
rv.addReferenceListenerValidator(rlrv_1);
rv.validate(metadataProxy.getComponentMetadata(sampleBlueprintContainerServiceId,
"ref2"));
// beanï¼bindingListener
- BeanValidator bv_bindingListener = new
BeanValidator("org.apache.geronimo.blueprint.sample.BindingListener");
+ BeanValidator bv_bindingListener = new
BeanValidator("org.apache.aries.blueprint.sample.BindingListener");
bv_bindingListener.validate(metadataProxy.getComponentMetadata(sampleBlueprintContainerServiceId,
"bindingListener"));
// reference-list: ref-list
ReferenceListenerValidator rlrv_2 = new
ReferenceListenerValidator("bind", "unbind");
rlrv_2.setListenerComponentValidator(new
RefValidator("listBindingListener"));
- ReferenceListValidator rlv_ref_list = new
ReferenceListValidator("org.apache.geronimo.blueprint.sample.InterfaceA");
+ ReferenceListValidator rlv_ref_list = new
ReferenceListValidator("org.apache.aries.blueprint.sample.InterfaceA");
rlv_ref_list.addReferenceListenerValidator(rlrv_2);
rlv_ref_list.validate(metadataProxy.getComponentMetadata(sampleBlueprintContainerServiceId,
"ref-list"));
// bean: listBindingListener
- BeanValidator bv_listBindingListener = new
BeanValidator("org.apache.geronimo.blueprint.sample.BindingListener");
+ BeanValidator bv_listBindingListener = new
BeanValidator("org.apache.aries.blueprint.sample.BindingListener");
bv_listBindingListener.validate(metadataProxy.getComponentMetadata(sampleBlueprintContainerServiceId,
"listBindingListener"));
// bean: circularReference
ReferenceListenerValidator rlrv_3 = new
ReferenceListenerValidator("bind", "unbind");
rlrv_3.setListenerComponentValidator(new
RefValidator("circularReference"));
- ReferenceListValidator rlv_2 = new
ReferenceListValidator("org.apache.geronimo.blueprint.sample.InterfaceA", 2);
+ ReferenceListValidator rlv_2 = new
ReferenceListValidator("org.apache.aries.blueprint.sample.InterfaceA", 2);
rlv_2.addReferenceListenerValidator(rlrv_3);
BeanPropertyValidator bpv_list_2 = new BeanPropertyValidator("list");
bpv_list_2.setObjectValueValidator(rlv_2);
- BeanValidator bv_circularReference = new
BeanValidator("org.apache.geronimo.blueprint.sample.BindingListener", "init");
+ BeanValidator bv_circularReference = new
BeanValidator("org.apache.aries.blueprint.sample.BindingListener", "init");
bv_circularReference.addPropertyValidators(bpv_list_2);
bv_circularReference.validate(metadataProxy.getComponentMetadata(sampleBlueprintContainerServiceId,
"circularReference"));
}
Propchange:
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified:
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/AbstractArgumentPropertyValidator.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/AbstractArgumentPropertyValidator.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
---
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/AbstractArgumentPropertyValidator.java
(original)
+++
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/AbstractArgumentPropertyValidator.java
Wed Dec 23 23:16:00 2009
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.test.framework;
+package org.apache.aries.jmx.test.blueprint.framework;
import javax.management.openmbean.CompositeData;
import javax.management.openmbean.CompositeType;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
abstract class AbstractArgumentPropertyValidator extends
AbstractCompositeDataValidator {
// if not set, means do not care about the value
Modified:
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/AbstractCompositeDataValidator.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/AbstractCompositeDataValidator.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
---
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/AbstractCompositeDataValidator.java
(original)
+++
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/AbstractCompositeDataValidator.java
Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.test.framework;
+package org.apache.aries.jmx.test.blueprint.framework;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
Modified:
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/AbstractListenerComponentValidator.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/AbstractListenerComponentValidator.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
---
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/AbstractListenerComponentValidator.java
(original)
+++
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/AbstractListenerComponentValidator.java
Wed Dec 23 23:16:00 2009
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.test.framework;
+package org.apache.aries.jmx.test.blueprint.framework;
import static junit.framework.Assert.assertNotNull;
import javax.management.openmbean.CompositeData;
import javax.management.openmbean.CompositeType;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
abstract class AbstractListenerComponentValidator extends
AbstractCompositeDataValidator {
Modified:
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/AbstractServiceReferenceValidator.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/AbstractServiceReferenceValidator.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
---
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/AbstractServiceReferenceValidator.java
(original)
+++
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/AbstractServiceReferenceValidator.java
Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.test.framework;
+package org.apache.aries.jmx.test.blueprint.framework;
import static org.junit.Assert.fail;
@@ -26,7 +26,7 @@
import javax.management.openmbean.CompositeData;
import javax.management.openmbean.CompositeType;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
abstract class AbstractServiceReferenceValidator extends
AbstractCompositeDataValidator implements NonNullObjectValueValidator {
private List<ReferenceListenerValidator> referenceListenerValidators = new
ArrayList<ReferenceListenerValidator>();
Modified:
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/BeanArgumentValidator.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/BeanArgumentValidator.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
---
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/BeanArgumentValidator.java
(original)
+++
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/BeanArgumentValidator.java
Wed Dec 23 23:16:00 2009
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.test.framework;
+package org.apache.aries.jmx.test.blueprint.framework;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
public class BeanArgumentValidator extends AbstractArgumentPropertyValidator{
Modified:
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/BeanPropertyValidator.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/BeanPropertyValidator.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
---
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/BeanPropertyValidator.java
(original)
+++
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/BeanPropertyValidator.java
Wed Dec 23 23:16:00 2009
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.test.framework;
+package org.apache.aries.jmx.test.blueprint.framework;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
public class BeanPropertyValidator extends AbstractArgumentPropertyValidator{
Modified:
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/BeanValidator.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/BeanValidator.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
---
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/BeanValidator.java
(original)
+++
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/BeanValidator.java
Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.test.framework;
+package org.apache.aries.jmx.test.blueprint.framework;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -26,7 +26,7 @@
import javax.management.openmbean.CompositeData;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
public class BeanValidator extends AbstractCompositeDataValidator implements
NonNullObjectValueValidator, TargetValidator{
Modified:
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/BlueprintEventValidator.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/BlueprintEventValidator.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
---
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/BlueprintEventValidator.java
(original)
+++
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/BlueprintEventValidator.java
Wed Dec 23 23:16:00 2009
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.test.framework;
+package org.apache.aries.jmx.test.blueprint.framework;
-import org.apache.geronimo.blueprint.jmx.BlueprintStateMBean;
+import org.apache.aries.jmx.blueprint.BlueprintStateMBean;
public class BlueprintEventValidator extends AbstractCompositeDataValidator{
Modified:
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/CollectionValidator.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/CollectionValidator.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
---
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/CollectionValidator.java
(original)
+++
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/CollectionValidator.java
Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.test.framework;
+package org.apache.aries.jmx.test.blueprint.framework;
import java.util.ArrayList;
import java.util.List;
@@ -24,7 +24,7 @@
import javax.management.openmbean.CompositeData;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
public class CollectionValidator extends AbstractCompositeDataValidator
implements NonNullObjectValueValidator {
Modified:
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/MapEntryValidator.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/MapEntryValidator.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
---
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/MapEntryValidator.java
(original)
+++
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/MapEntryValidator.java
Wed Dec 23 23:16:00 2009
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.test.framework;
+package org.apache.aries.jmx.test.blueprint.framework;
import javax.management.openmbean.CompositeData;
import static junit.framework.Assert.*;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
public class MapEntryValidator extends AbstractCompositeDataValidator {
Modified:
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/NonNullObjectValueValidator.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/NonNullObjectValueValidator.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
---
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/NonNullObjectValueValidator.java
(original)
+++
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/NonNullObjectValueValidator.java
Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.test.framework;
+package org.apache.aries.jmx.test.blueprint.framework;
public interface NonNullObjectValueValidator extends ObjectValueValidator{
Modified:
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ObjectValueValidator.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ObjectValueValidator.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
---
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ObjectValueValidator.java
(original)
+++
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ObjectValueValidator.java
Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.test.framework;
+package org.apache.aries.jmx.test.blueprint.framework;
public interface ObjectValueValidator extends Validator{
Modified:
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/RefValidator.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/RefValidator.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
---
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/RefValidator.java
(original)
+++
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/RefValidator.java
Wed Dec 23 23:16:00 2009
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.test.framework;
+package org.apache.aries.jmx.test.blueprint.framework;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
public class RefValidator extends AbstractCompositeDataValidator implements
NonNullObjectValueValidator, TargetValidator {
public RefValidator(String componentId){
Modified:
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ReferenceListValidator.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ReferenceListValidator.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
---
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ReferenceListValidator.java
(original)
+++
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ReferenceListValidator.java
Wed Dec 23 23:16:00 2009
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.test.framework;
+package org.apache.aries.jmx.test.blueprint.framework;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
public class ReferenceListValidator extends AbstractServiceReferenceValidator {
Modified:
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ReferenceListenerValidator.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ReferenceListenerValidator.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
---
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ReferenceListenerValidator.java
(original)
+++
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ReferenceListenerValidator.java
Wed Dec 23 23:16:00 2009
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.test.framework;
+package org.apache.aries.jmx.test.blueprint.framework;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
public class ReferenceListenerValidator extends
AbstractListenerComponentValidator {
Modified:
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ReferenceValidator.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ReferenceValidator.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
---
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ReferenceValidator.java
(original)
+++
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ReferenceValidator.java
Wed Dec 23 23:16:00 2009
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.test.framework;
+package org.apache.aries.jmx.test.blueprint.framework;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
public class ReferenceValidator extends AbstractServiceReferenceValidator
implements TargetValidator{
Modified:
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/RegistrationListenerValidator.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/RegistrationListenerValidator.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
---
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/RegistrationListenerValidator.java
(original)
+++
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/RegistrationListenerValidator.java
Wed Dec 23 23:16:00 2009
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.test.framework;
+package org.apache.aries.jmx.test.blueprint.framework;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
public class RegistrationListenerValidator extends
AbstractListenerComponentValidator {
Modified:
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ServiceValidator.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ServiceValidator.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
---
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ServiceValidator.java
(original)
+++
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ServiceValidator.java
Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.test.framework;
+package org.apache.aries.jmx.test.blueprint.framework;
import static junit.framework.Assert.assertNotNull;
import static org.junit.Assert.fail;
@@ -26,7 +26,7 @@
import javax.management.openmbean.CompositeData;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
public class ServiceValidator extends AbstractCompositeDataValidator
implements NonNullObjectValueValidator {
// a TargetValidator can be one of BeanValidator, ReferenceValidator,
RefValidator
Modified:
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/TargetValidator.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/TargetValidator.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
---
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/TargetValidator.java
(original)
+++
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/TargetValidator.java
Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.test.framework;
+package org.apache.aries.jmx.test.blueprint.framework;
public interface TargetValidator extends Validator {
Modified:
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/Util.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/Util.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
---
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/Util.java
(original)
+++
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/Util.java
Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.test.framework;
+package org.apache.aries.jmx.test.blueprint.framework;
import java.io.ByteArrayInputStream;
import java.io.ObjectInputStream;
Modified:
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/Validator.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/Validator.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
---
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/Validator.java
(original)
+++
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/Validator.java
Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.test.framework;
+package org.apache.aries.jmx.test.blueprint.framework;
import javax.management.openmbean.CompositeData;
Modified:
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ValueValidator.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ValueValidator.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
---
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ValueValidator.java
(original)
+++
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ValueValidator.java
Wed Dec 23 23:16:00 2009
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.test.framework;
+package org.apache.aries.jmx.test.blueprint.framework;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
public class ValueValidator extends AbstractCompositeDataValidator implements
NonNullObjectValueValidator{
Modified: incubator/aries/trunk/jmx/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/pom.xml?rev=893648&r1=893647&r2=893648&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/pom.xml (original)
+++ incubator/aries/trunk/jmx/pom.xml Wed Dec 23 23:16:00 2009
@@ -53,6 +53,16 @@
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
+ <artifactId>aries-jmx-blueprint-api</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>aries-jmx-blueprint-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jmx</groupId>
<artifactId>aries-jmx</artifactId>
<version>${version}</version>
</dependency>
@@ -95,6 +105,16 @@
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-service</artifactId>
<version>1.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.jdmk</groupId>
+ <artifactId>jmxtools</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jmx</groupId>
+ <artifactId>jmxri</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
@@ -145,7 +165,9 @@
<modules>
<module>jmx-api</module>
+ <module>jmx-blueprint-api</module>
<module>jmx-core</module>
+ <module>jmx-blueprint-core</module>
<module>jmx-bundle</module>
<module>jmx-itests</module>
</modules>
