You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by gn...@apache.org on 2009/06/17 21:06:15 UTC
svn commit: r785758 [2/2] - in /geronimo/sandbox/blueprint: ./
blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/
blueprint-cm/src/main/java/org/apache/geronimo/blueprint/compendium/cm/
blueprint-core/src/main/java/org/apache/geronimo/blue...
Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ServiceMetadataImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ServiceMetadataImpl.java?rev=785758&r1=785757&r2=785758&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ServiceMetadataImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ServiceMetadataImpl.java Wed Jun 17 19:06:04 2009
@@ -52,7 +52,7 @@
public ServiceMetadataImpl(ServiceMetadata source) {
super(source);
this.serviceComponent = MetadataUtil.cloneTarget(source.getServiceComponent());
- this.interfaceNames = new ArrayList<String>(source.getInterfaceNames());
+ this.interfaceNames = new ArrayList<String>(source.getInterfaces());
this.autoExport = source.getAutoExport();
for (MapEntry serviceProperty : source.getServiceProperties()) {
addServiceProperty(new MapEntryImpl(serviceProperty));
@@ -71,7 +71,7 @@
this.serviceComponent = exportedComponent;
}
- public List<String> getInterfaceNames() {
+ public List<String> getInterfaces() {
if (this.interfaceNames == null) {
return Collections.emptyList();
} else {
@@ -83,14 +83,14 @@
this.interfaceNames = interfaceNames != null ? new ArrayList<String>(interfaceNames) : null;
}
- public void addInterfaceName(String interfaceName) {
+ public void addInterface(String interfaceName) {
if (this.interfaceNames == null) {
this.interfaceNames = new ArrayList<String>();
}
this.interfaceNames.add(interfaceName);
}
- public void removeInterfaceName(String interfaceName) {
+ public void removeInterface(String interfaceName) {
if (this.interfaceNames != null) {
this.interfaceNames.remove(interfaceName);
}
@@ -181,7 +181,7 @@
", initialization=" + initialization +
", dependsOn=" + dependsOn +
", exportedComponent=" + serviceComponent +
- ", interfaceNames=" + interfaceNames +
+ ", interfaces=" + interfaceNames +
", autoExportMode=" + autoExport +
", serviceProperties=" + serviceProperties +
", ranking=" + ranking +
Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ServiceReferenceMetadataImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ServiceReferenceMetadataImpl.java?rev=785758&r1=785757&r2=785758&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ServiceReferenceMetadataImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ServiceReferenceMetadataImpl.java Wed Jun 17 19:06:04 2009
@@ -48,7 +48,7 @@
public ServiceReferenceMetadataImpl(ServiceReferenceMetadata source) {
super(source);
this.availability = source.getAvailability();
- this.interfaceName = source.getInterfaceName();
+ this.interfaceName = source.getInterface();
this.componentName = source.getComponentName();
this.filter = source.getFilter();
for (ReferenceListener listener : source.getReferenceListeners()) {
@@ -64,11 +64,11 @@
this.availability = availability;
}
- public String getInterfaceName() {
+ public String getInterface() {
return interfaceName;
}
- public void setInterfaceName(String interfaceName) {
+ public void setInterface(String interfaceName) {
this.interfaceName = interfaceName;
}
Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ValueMetadataImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ValueMetadataImpl.java?rev=785758&r1=785757&r2=785758&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ValueMetadataImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ValueMetadataImpl.java Wed Jun 17 19:06:04 2009
@@ -30,7 +30,7 @@
public class ValueMetadataImpl implements MutableValueMetadata {
private String stringValue;
- private String typeName;
+ private String type;
public ValueMetadataImpl() {
}
@@ -39,14 +39,14 @@
this.stringValue = stringValue;
}
- public ValueMetadataImpl(String stringValue, String typeName) {
+ public ValueMetadataImpl(String stringValue, String type) {
this.stringValue = stringValue;
- this.typeName = typeName;
+ this.type = type;
}
public ValueMetadataImpl(ValueMetadata source) {
this.stringValue = source.getStringValue();
- this.typeName = source.getTypeName();
+ this.type = source.getType();
}
public String getStringValue() {
@@ -57,19 +57,19 @@
this.stringValue = stringValue;
}
- public String getTypeName() {
- return typeName;
+ public String getType() {
+ return type;
}
- public void setTypeName(String typeName) {
- this.typeName = typeName;
+ public void setType(String typeName) {
+ this.type = typeName;
}
@Override
public String toString() {
return "ValueMetadata[" +
"stringValue='" + stringValue + '\'' +
- ", typeName='" + typeName + '\'' +
+ ", type='" + type + '\'' +
']';
}
}
Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/utils/TypeUtils.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/utils/TypeUtils.java?rev=785758&r1=785757&r2=785758&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/utils/TypeUtils.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/utils/TypeUtils.java Wed Jun 17 19:06:04 2009
@@ -25,9 +25,12 @@
import java.lang.reflect.TypeVariable;
import java.util.Map;
import java.util.HashMap;
+import java.util.Collection;
import org.osgi.framework.Bundle;
+import org.osgi.service.blueprint.container.BlueprintContainer;
import org.apache.geronimo.blueprint.di.ExecutionContext;
+import org.apache.geronimo.blueprint.ExtendedBlueprintContainer;
/**
* @version $Rev: 6687 $ $Date: 2005-12-28T21:08:56.733437Z $
@@ -198,6 +201,8 @@
return ((Bundle) loader).loadClass(type);
} else if (loader instanceof ExecutionContext) {
return ((ExecutionContext) loader).loadClass(type);
+ } else if (loader instanceof ExtendedBlueprintContainer) {
+ return ((ExtendedBlueprintContainer) loader).loadClass(type);
} else {
throw new IllegalArgumentException("Unsupported loader: " + loader);
}
@@ -266,4 +271,5 @@
return type.toString();
}
}
+
}
Modified: geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/ParserTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/ParserTest.java?rev=785758&r1=785757&r2=785758&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/ParserTest.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/ParserTest.java Wed Jun 17 19:06:04 2009
@@ -71,7 +71,7 @@
assertNotNull(param.getValue());
assertTrue(param.getValue() instanceof ValueMetadata);
assertEquals("val0", ((ValueMetadata) param.getValue()).getStringValue());
- assertNull(((ValueMetadata) param.getValue()).getTypeName());
+ assertNull(((ValueMetadata) param.getValue()).getType());
param = params.get(1);
assertNotNull(param);
assertEquals(-1, param.getIndex());
@@ -92,7 +92,7 @@
assertNotNull(param.getValue());
assertTrue(param.getValue() instanceof ValueMetadata);
assertEquals("val3", ((ValueMetadata) param.getValue()).getStringValue());
- assertNull(((ValueMetadata) param.getValue()).getTypeName());
+ assertNull(((ValueMetadata) param.getValue()).getType());
param = params.get(4);
assertNotNull(param);
assertEquals(-1, param.getIndex());
@@ -100,7 +100,7 @@
assertNotNull(param.getValue());
assertTrue(param.getValue() instanceof CollectionMetadata);
CollectionMetadata array = (CollectionMetadata) param.getValue();
- assertNull(array.getValueTypeName());
+ assertNull(array.getValueType());
assertNotNull(array.getValues());
assertEquals(3, array.getValues().size());
assertTrue(array.getValues().get(0) instanceof ValueMetadata);
Modified: geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/TestBlueprintContainer.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/TestBlueprintContainer.java?rev=785758&r1=785757&r2=785758&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/TestBlueprintContainer.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/TestBlueprintContainer.java Wed Jun 17 19:06:04 2009
@@ -19,7 +19,6 @@
package org.apache.geronimo.blueprint;
import org.apache.geronimo.blueprint.container.BlueprintContainerImpl;
-import org.apache.geronimo.blueprint.container.BlueprintObjectInstantiator;
import org.apache.geronimo.blueprint.namespace.ComponentDefinitionRegistryImpl;
public class TestBlueprintContainer extends BlueprintContainerImpl {
@@ -41,8 +40,4 @@
return registry;
}
- public BlueprintObjectInstantiator getInstantiator() throws Exception {
- return super.getInstantiator();
- }
-
}
Modified: geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/WiringTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/WiringTest.java?rev=785758&r1=785757&r2=785758&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/WiringTest.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/WiringTest.java Wed Jun 17 19:06:04 2009
@@ -28,9 +28,6 @@
import java.util.Set;
import org.apache.geronimo.blueprint.CallbackTracker.Callback;
-import org.apache.geronimo.blueprint.container.BlueprintObjectInstantiator;
-import org.apache.geronimo.blueprint.di.DefaultRepository;
-import org.apache.geronimo.blueprint.container.RecipeBuilder;
import org.apache.geronimo.blueprint.namespace.ComponentDefinitionRegistryImpl;
import org.apache.geronimo.blueprint.pojos.BeanD;
import org.apache.geronimo.blueprint.pojos.Multiple;
@@ -46,16 +43,16 @@
public void testWiring() throws Exception {
ComponentDefinitionRegistryImpl registry = parse("/test-wiring.xml");
- BlueprintObjectInstantiator graph = new TestBlueprintContainer(registry).getInstantiator();
+ Repository repository = new TestBlueprintContainer(registry).getRepository();
- Object obj1 = graph.create("pojoA");
+ Object obj1 = repository.create("pojoA");
assertNotNull(obj1);
assertTrue(obj1 instanceof PojoA);
PojoA pojoa = (PojoA) obj1;
// test singleton scope
- assertTrue(obj1 == graph.create("pojoA"));
+ assertTrue(obj1 == repository.create("pojoA"));
- Object obj2 = graph.create("pojoB");
+ Object obj2 = repository.create("pojoB");
assertNotNull(obj2);
assertTrue(obj2 instanceof PojoB);
PojoB pojob = (PojoB) obj2;
@@ -116,17 +113,17 @@
assertEquals(true, pojob.getInitCalled());
// test service
- Object obj3 = graph.create("service1");
+ Object obj3 = repository.create("service1");
assertNotNull(obj3);
assertTrue(obj3 instanceof ServiceRegistration);
// tests 'prototype' scope
- Object obj4 = graph.create("pojoC");
+ Object obj4 = repository.create("pojoC");
assertNotNull(obj4);
- assertTrue(obj4 != graph.create("pojoC"));
+ assertTrue(obj4 != repository.create("pojoC"));
- graph.getRepository().destroy();
+ repository.destroy();
// test destroy-method
assertEquals(true, pojob.getDestroyCalled());
@@ -134,16 +131,16 @@
public void testCompoundProperties() throws Exception {
ComponentDefinitionRegistryImpl registry = parse("/test-wiring.xml");
- BlueprintObjectInstantiator graph = new TestBlueprintContainer(registry).getInstantiator();
+ Repository repository = new TestBlueprintContainer(registry).getRepository();
- Object obj5 = graph.create("compound");
+ Object obj5 = repository.create("compound");
assertNotNull(obj5);
assertTrue(obj5 instanceof PojoB);
PojoB pojob = (PojoB) obj5;
assertEquals("hello bean property", pojob.getBean().getName());
- Object obj = graph.create("goodIdRef");
+ Object obj = repository.create("goodIdRef");
assertNotNull(obj);
assertTrue(obj instanceof BeanD);
BeanD bean = (BeanD) obj;
@@ -153,11 +150,9 @@
public void testIdRefs() throws Exception {
ComponentDefinitionRegistryImpl registry = parse("/test-bad-id-ref.xml");
- RecipeBuilder i = new RecipeBuilder(new TestBlueprintContainer(registry));
- Repository repository = i.createRepository();
try {
- new BlueprintObjectInstantiator(new TestBlueprintContainer(registry), repository);
+ new TestBlueprintContainer(registry).getRepository();
fail("Did not throw exception");
} catch (RuntimeException e) {
// we expect exception
@@ -169,8 +164,8 @@
CallbackTracker.clear();
ComponentDefinitionRegistryImpl registry = parse("/test-depends-on.xml");
- BlueprintObjectInstantiator graph = new TestBlueprintContainer(registry).getInstantiator();
- Map instances = graph.createAll("c", "d", "e");
+ Repository repository = new TestBlueprintContainer(registry).getRepository();
+ Map instances = repository.createAll("c", "d", "e");
List<Callback> callback = CallbackTracker.getCallbacks();
assertEquals(3, callback.size());
@@ -178,7 +173,7 @@
checkInitCallback(instances.get("c"), callback.get(1));
checkInitCallback(instances.get("e"), callback.get(2));
- graph.getRepository().destroy();
+ repository.destroy();
assertEquals(6, callback.size());
checkDestroyCallback(instances.get("e"), callback.get(3));
@@ -198,35 +193,35 @@
public void testConstructor() throws Exception {
ComponentDefinitionRegistryImpl registry = parse("/test-constructor.xml");
- BlueprintObjectInstantiator graph = new TestBlueprintContainer(registry).getInstantiator();
+ Repository repository = new TestBlueprintContainer(registry).getRepository();
- Object obj1 = graph.create("pojoA");
+ Object obj1 = repository.create("pojoA");
assertNotNull(obj1);
assertTrue(obj1 instanceof PojoA);
PojoA pojoa = (PojoA) obj1;
- Object obj2 = graph.create("pojoB");
+ Object obj2 = repository.create("pojoB");
testPojoB(obj2, URI.create("urn:myuri"), 10);
assertEquals(obj2, pojoa.getPojob());
assertEquals(new BigInteger("10"), pojoa.getNumber());
- Object obj3 = graph.create("pojoC");
+ Object obj3 = repository.create("pojoC");
testPojoB(obj3, URI.create("urn:myuri-static"), 15);
- Object obj4 = graph.create("pojoD");
+ Object obj4 = repository.create("pojoD");
testPojoB(obj4, URI.create("urn:myuri-static"), 15);
- Object obj5 = graph.create("pojoE");
+ Object obj5 = repository.create("pojoE");
testPojoB(obj5, URI.create("urn:myuri-dynamic"), 20);
- Object obj6 = graph.create("multipleInt");
+ Object obj6 = repository.create("multipleInt");
testMultiple(obj6, null, 123, null);
- Object obj7 = graph.create("multipleInteger");
+ Object obj7 = repository.create("multipleInteger");
testMultiple(obj7, null, -1, new Integer(123));
- Object obj8 = graph.create("multipleString");
+ Object obj8 = repository.create("multipleString");
testMultiple(obj8, "123", -1, null);
// TODO: check the below tests when the incoherence between TCK / spec is solved
@@ -237,28 +232,28 @@
// // we expect exception
// }
- Object obj10 = graph.create("multipleFactory1");
+ Object obj10 = repository.create("multipleFactory1");
testMultiple(obj10, null, 1234, null);
- Object obj11 = graph.create("multipleFactory2");
+ Object obj11 = repository.create("multipleFactory2");
testMultiple(obj11, "helloCreate-boolean", -1, null);
try {
- graph.create("multipleFactoryNull");
+ repository.create("multipleFactoryNull");
fail("Did not throw exception");
} catch (RuntimeException e) {
// we expect exception
// TODO: check the exception string?
}
- Object obj12 = graph.create("multipleFactoryTypedNull");
+ Object obj12 = repository.create("multipleFactoryTypedNull");
testMultiple(obj12, "hello-boolean", -1, null);
// TODO: check the below tests when the incoherence between TCK / spec is solved
// Object obj13 = graph.create("mapConstruction");
// Object obj14 = graph.create("propsConstruction");
- BeanF obj15 = (BeanF) graph.create("booleanWrapped");
+ BeanF obj15 = (BeanF) repository.create("booleanWrapped");
assertNotNull(obj15.getWrapped());
assertEquals(false, (boolean) obj15.getWrapped());
assertNull(obj15.getPrim());
@@ -288,7 +283,7 @@
public void testGenerics() throws Exception {
ComponentDefinitionRegistryImpl registry = parse("/test-generics.xml");
- BlueprintObjectInstantiator graph = new TestBlueprintContainer(registry).getInstantiator();
+ Repository repository = new TestBlueprintContainer(registry).getRepository();
List<Integer> expectedList = new ArrayList<Integer>();
expectedList.add(new Integer(10));
@@ -308,7 +303,7 @@
Object obj;
PojoGenerics pojo;
- obj = graph.create("method");
+ obj = repository.create("method");
assertTrue(obj instanceof PojoGenerics);
pojo = (PojoGenerics) obj;
@@ -316,19 +311,19 @@
assertEquals(expectedSet, pojo.getSet());
assertEquals(expectedMap, pojo.getMap());
- obj = graph.create("constructorList");
+ obj = repository.create("constructorList");
assertTrue(obj instanceof PojoGenerics);
pojo = (PojoGenerics) obj;
assertEquals(expectedList, pojo.getList());
- obj = graph.create("constructorSet");
+ obj = repository.create("constructorSet");
assertTrue(obj instanceof PojoGenerics);
pojo = (PojoGenerics) obj;
assertEquals(expectedSet, pojo.getSet());
- obj = graph.create("constructorMap");
+ obj = repository.create("constructorMap");
assertTrue(obj instanceof PojoGenerics);
pojo = (PojoGenerics) obj;
@@ -337,10 +332,10 @@
public void testCircular() throws Exception {
ComponentDefinitionRegistryImpl registry = parse("/test-circular.xml");
- BlueprintObjectInstantiator graph = new TestBlueprintContainer(registry).getInstantiator();
+ Repository repository = new TestBlueprintContainer(registry).getRepository();
// this should pass (we allow circular dependencies for components without init method)
- Object obj1 = graph.create("a");
+ Object obj1 = repository.create("a");
// // this should fail (we do not allow circular dependencies for components with init method)
// try {
@@ -351,11 +346,11 @@
// }
// test service and listener circular dependencies
- Object obj2 = graph.create("service");
+ Object obj2 = repository.create("service");
assertNotNull(obj2);
assertTrue(obj2 instanceof ServiceRegistration);
- Object obj3 = graph.create("listener");
+ Object obj3 = repository.create("listener");
assertNotNull(obj3);
assertTrue(obj3 instanceof PojoListener);
Modified: geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/BlueprintContainerTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/BlueprintContainerTest.java?rev=785758&r1=785757&r2=785758&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/BlueprintContainerTest.java (original)
+++ geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/BlueprintContainerTest.java Wed Jun 17 19:06:04 2009
@@ -34,12 +34,10 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
import static org.ops4j.pax.exam.CoreOptions.mavenConfiguration;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.OptionUtils;
import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.profile;
import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.rawPaxRunnerOption;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
@@ -123,25 +121,21 @@
// this is how you set the default log level when using pax logging (logProfile)
- systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
+ systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
// Bundles
mavenBundle("org.apache.geronimo", "blueprint-bundle"),
mavenBundle("org.apache.geronimo", "blueprint-sample").noStart(),
-// org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
+ org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
- rawPaxRunnerOption("", ""),
-
- felix().snapshotVersion(),
- equinox().snapshotVersion()
+// customFramework( "file:" + System.getProperty("basedir") + "/target/test-classes/felix-1.9.0-SNAPSHOT.xml" ),
+// customFramework( "file:" + System.getProperty("basedir") + "/target/test-classes/equinox-3.5.0.v20090429-1630.xml" ),
+
+// rawPaxRunnerOption("config", "file:" + System.getProperty("basedir") + "/target/test-classes/.runner.properties"),
+// felix().snapshotVersion(),
+ equinox().snapshotVersion()
);
-
- // use config generated by the Maven plugin (until PAXEXAM-62/64 get resolved)
- if (BlueprintContainerTest.class.getClassLoader().getResource("META-INF/maven/paxexam-config.args") != null) {
- options = OptionUtils.combine(options, mavenConfiguration());
- }
-
return options;
}
Modified: geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestConfigAdmin.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestConfigAdmin.java?rev=785758&r1=785757&r2=785758&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestConfigAdmin.java (original)
+++ geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestConfigAdmin.java Wed Jun 17 19:06:04 2009
@@ -31,6 +31,7 @@
import static org.ops4j.pax.exam.CoreOptions.mavenConfiguration;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+import static org.ops4j.pax.exam.CoreOptions.customFramework;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.OptionUtils;
import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
@@ -186,8 +187,8 @@
// org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
- felix().snapshotVersion(),
- equinox().snapshotVersion()
+ customFramework( "file:" + System.getProperty("basedir") + "/target/test-classes/felix-1.9.0-SNAPSHOT.xml" ),
+ customFramework( "file:" + System.getProperty("basedir") + "/target/test-classes/equinox-3.5.0.v20090429-1630.xml" )
);
// use config generated by the Maven plugin (until PAXEXAM-62/64 get resolved)
Modified: geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestReferences.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestReferences.java?rev=785758&r1=785757&r2=785758&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestReferences.java (original)
+++ geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestReferences.java Wed Jun 17 19:06:04 2009
@@ -148,8 +148,8 @@
// org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
- customFramework( "file:target/test-classes/felix-1.9.0-SNAPSHOT.xml" ),
- customFramework( "file:target/test-classes/equinox-3.5.0-v20090429-1630.xml" )
+ customFramework( "file:" + System.getProperty("basedir") + "/target/test-classes/felix-1.9.0-SNAPSHOT.xml" ),
+ customFramework( "file:" + System.getProperty("basedir") + "/target/test-classes/equinox-3.5.0.v20090429-1630.xml" )
);
return options;
}
Added: geronimo/sandbox/blueprint/blueprint-itests/src/test/resources/.runner.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-itests/src/test/resources/.runner.properties?rev=785758&view=auto
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-itests/src/test/resources/.runner.properties (added)
+++ geronimo/sandbox/blueprint/blueprint-itests/src/test/resources/.runner.properties Wed Jun 17 19:06:04 2009
@@ -0,0 +1,23 @@
+handler.service=org.ops4j.pax.runner.handler.internal.Activator
+provision.service=org.ops4j.pax.runner.provision.internal.Activator
+platform.service=org.ops4j.pax.runner.platform.internal.Activator
+
+handler.mvn=org.ops4j.pax.url.mvn.internal.Activator
+
+scanner.bundle=org.ops4j.pax.runner.scanner.bundle.internal.Activator
+scanner.composite=org.ops4j.pax.runner.scanner.composite.internal.Activator
+scanner.dir=org.ops4j.pax.runner.scanner.dir.internal.Activator
+scanner.features=org.ops4j.pax.runner.scanner.features.internal.Activator
+scanner.file=org.ops4j.pax.runner.scanner.file.internal.Activator
+scanner.obr=org.ops4j.pax.runner.scanner.obr.internal.Activator
+scanner.pom=org.ops4j.pax.runner.scanner.pom.internal.Activator
+
+
+default.handlers=handler.mvn
+default.scanners=scanner.bundle,scanner.composite,scanner.dir,scanner.features,scanner.file,scanner.obr,scanner.pom
+
+default.felix.snapshot.definition.url=file:target/test-classes/felix-1.9.0-SNAPSHOT.xml
+default.equinox.snapshot.definition.url=file:target/test-classes/equinox-3.5.0.v20090429-1630.xml
+
+felix.SNAPSHOT=org.ops4j.pax.runner.platform.felix.internal.Activator
+equinox.SNAPSHOT=org.ops4j.pax.runner.platform.equinox.internal.Activator
Modified: geronimo/sandbox/blueprint/blueprint-itests/src/test/resources/equinox-3.5.0.v20090429-1630.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-itests/src/test/resources/equinox-3.5.0.v20090429-1630.xml?rev=785758&r1=785757&r2=785758&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-itests/src/test/resources/equinox-3.5.0.v20090429-1630.xml (original)
+++ geronimo/sandbox/blueprint/blueprint-itests/src/test/resources/equinox-3.5.0.v20090429-1630.xml Wed Jun 17 19:06:04 2009
@@ -1,6 +1,18 @@
<platform>
- <name>Equinox 3.5.0-v20090429-1630</name>
- <system>mvn:org.eclipse/osgi/3.5.0-v20090429-1630</system>
+ <name>Equinox 3.5.0.v20090429-1630</name>
+ <system>mvn:org.eclipse/osgi/3.5.0.v20090429-1630</system>
+
+ <profile name="minimal" default="true">
+ <bundle>
+ <name>Eclipse utilities</name>
+ <url>http://download.eclipse.org/equinox/drops/S-3.5RC4-200906051444/org.eclipse.osgi.util_3.2.0.v20090520-1800.jar</url>
+ </bundle>
+ <bundle>
+ <name>Eclipse compendium services</name>
+ <url>http://download.eclipse.org/equinox/drops/S-3.5RC4-200906051444/org.eclipse.osgi.services_3.2.0.v20090520-1800.jar</url>
+ </bundle>
+ </profile>
+
</platform>
Modified: geronimo/sandbox/blueprint/blueprint-itests/src/test/resources/felix-1.9.0-SNAPSHOT.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-itests/src/test/resources/felix-1.9.0-SNAPSHOT.xml?rev=785758&r1=785757&r2=785758&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-itests/src/test/resources/felix-1.9.0-SNAPSHOT.xml (original)
+++ geronimo/sandbox/blueprint/blueprint-itests/src/test/resources/felix-1.9.0-SNAPSHOT.xml Wed Jun 17 19:06:04 2009
@@ -3,13 +3,9 @@
<name>Felix 1.9.0-SNAPSHOT</name>
<system>mvn:org.apache.felix/org.apache.felix.main/1.9.0-SNAPSHOT</system>
- <packages>
- org.osgi.framework; version=1.5.0,
- org.osgi.framework.hooks.service; version=1.0.0,
- org.osgi.service.packageadmin; version=1.2.0,
- org.osgi.service.startlevel; version=1.1.0,
- org.osgi.service.url; version=1.0.0,
- org.osgi.util.tracker; version=1.3.3
- </packages>
+ <packages>org.osgi.framework; version=1.5.0, org.osgi.framework.hooks.service; version=1.0.0, org.osgi.service.packageadmin; version=1.2.0, org.osgi.service.startlevel; version=1.1.0, org.osgi.service.url; version=1.0.0, org.osgi.util.tracker; version=1.3.3</packages>
+
+ <profile name="minimal" default="true">
+ </profile>
</platform>
Modified: geronimo/sandbox/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/pom.xml?rev=785758&r1=785757&r2=785758&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/pom.xml (original)
+++ geronimo/sandbox/blueprint/pom.xml Wed Jun 17 19:06:04 2009
@@ -208,7 +208,9 @@
<module>blueprint-cm</module>
<module>blueprint-bundle</module>
<module>blueprint-sample</module>
+ <!--
<module>blueprint-itests</module>
+ -->
</modules>
</project>
Re: [blueprint] itests broken? (Re: svn commit: r785758)
Posted by Guillaume Nodet <gn...@gmail.com>.
Since I had the API to actually match the one defined by the specs, It
introduced a dependency on OSGI 4.2. I have problems configuring
pax-exam to use the felix snapshots. It should work with equinox
though so I'll try to enable the tests with equinox only until I can
find a way to put back felix snapshots.
On 06/18/2009, David Blevins <da...@visi.com> wrote:
> On Jun 17, 2009, at 12:06 PM, gnodet@apache.org wrote:
>
>> Modified: geronimo/sandbox/blueprint/pom.xml
>> URL:
>> http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/pom.xml?rev=785758&r1=785757&r2=785758&view=diff
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> ======================================================================
>> --- geronimo/sandbox/blueprint/pom.xml (original)
>> +++ geronimo/sandbox/blueprint/pom.xml Wed Jun 17 19:06:04 2009
>> @@ -208,7 +208,9 @@
>> <module>blueprint-cm</module>
>> <module>blueprint-bundle</module>
>> <module>blueprint-sample</module>
>> + <!--
>> <module>blueprint-itests</module>
>> + -->
>> </modules>
>>
>> </project>
>
> Itests not working?
>
>
> -David
>
>
>
>
--
Cheers,
Guillaume Nodet
------------------------
Blog: http://gnodet.blogspot.com/
------------------------
Open Source SOA
http://fusesource.com
[blueprint] itests broken? (Re: svn commit: r785758)
Posted by David Blevins <da...@visi.com>.
On Jun 17, 2009, at 12:06 PM, gnodet@apache.org wrote:
> Modified: geronimo/sandbox/blueprint/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/pom.xml?rev=785758&r1=785757&r2=785758&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- geronimo/sandbox/blueprint/pom.xml (original)
> +++ geronimo/sandbox/blueprint/pom.xml Wed Jun 17 19:06:04 2009
> @@ -208,7 +208,9 @@
> <module>blueprint-cm</module>
> <module>blueprint-bundle</module>
> <module>blueprint-sample</module>
> + <!--
> <module>blueprint-itests</module>
> + -->
> </modules>
>
> </project>
Itests not working?
-David