JBoss-OSGI SVN: r94596 - projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/husky/internal.
by jboss-osgi-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-09 09:06:11 -0400 (Fri, 09 Oct 2009)
New Revision: 94596
Modified:
projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/husky/internal/AbstractConnector.java
Log:
Optimize listener lookup code a little
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/husky/internal/AbstractConnector.java
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/husky/internal/AbstractConnector.java 2009-10-09 12:48:58 UTC (rev 94595)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/husky/internal/AbstractConnector.java 2009-10-09 13:06:11 UTC (rev 94596)
@@ -80,21 +80,25 @@
{
synchronized (listeners)
{
- try
+ for (PackageListener aux : listeners)
{
- for (PackageListener aux : listeners)
+ if (aux.match(req))
{
- if (aux.match(req))
- {
- listener = aux;
- break;
- }
+ listener = aux;
+ break;
}
- listeners.wait(200);
}
- catch (InterruptedException e)
+
+ if (listener == null)
{
- // ignore
+ try
+ {
+ listeners.wait(200);
+ }
+ catch (InterruptedException e)
+ {
+ // ignore
+ }
}
}
}
16 years, 2 months
JBoss-OSGI SVN: r94595 - in projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi: testing and 1 other directories.
by jboss-osgi-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-09 08:48:58 -0400 (Fri, 09 Oct 2009)
New Revision: 94595
Modified:
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedFramework.java
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedFrameworkMBean.java
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/OSGiRuntime.java
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedRuntime.java
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteFramework.java
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteRuntime.java
Log:
Remove dependency in InvalidSyntaxException
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedFramework.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedFramework.java 2009-10-09 12:47:53 UTC (rev 94594)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedFramework.java 2009-10-09 12:48:58 UTC (rev 94595)
@@ -138,10 +138,20 @@
return new ManagedServiceReference(props);
}
- public ManagedServiceReference[] getServiceReferences(String clazz, String filter) throws InvalidSyntaxException
+ public ManagedServiceReference[] getServiceReferences(String clazz, String filter)
{
List<ManagedServiceReference> foundRefs = new ArrayList<ManagedServiceReference>();
- ServiceReference[] srefs = getBundleContext().getServiceReferences(clazz, filter);
+
+ ServiceReference[] srefs;
+ try
+ {
+ srefs = getBundleContext().getServiceReferences(clazz, filter);
+ }
+ catch (InvalidSyntaxException e)
+ {
+ throw new IllegalArgumentException("Invalid filter syntax: " + filter);
+ }
+
if (srefs != null)
{
for (ServiceReference sref : srefs)
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedFrameworkMBean.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedFrameworkMBean.java 2009-10-09 12:47:53 UTC (rev 94594)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedFrameworkMBean.java 2009-10-09 12:48:58 UTC (rev 94595)
@@ -27,8 +27,6 @@
import javax.management.ObjectName;
-import org.osgi.framework.InvalidSyntaxException;
-
/**
* The managed view of an OSGi Framework
*
@@ -67,7 +65,7 @@
* that were registered under the specified class, match the specified filter criteria,
* and the packages for the class names under which the services were registered.
*/
- ManagedServiceReference[] getServiceReferences(String clazz, String filter) throws InvalidSyntaxException;
+ ManagedServiceReference[] getServiceReferences(String clazz, String filter);
/**
* Refresh packages through the PackageAdmin service
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/OSGiRuntime.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/OSGiRuntime.java 2009-10-09 12:47:53 UTC (rev 94594)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/OSGiRuntime.java 2009-10-09 12:48:58 UTC (rev 94595)
@@ -100,7 +100,7 @@
* The returned array of ServiceReference objects contains services that were registered under the specified
* class and match the specified filter criteria.
*/
- OSGiServiceReference[] getServiceReferences(String clazz, String filter) throws InvalidSyntaxException;
+ OSGiServiceReference[] getServiceReferences(String clazz, String filter);
/**
* Get the initial naming context for this {@link OSGiRuntime}
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedRuntime.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedRuntime.java 2009-10-09 12:47:53 UTC (rev 94594)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedRuntime.java 2009-10-09 12:48:58 UTC (rev 94595)
@@ -115,10 +115,20 @@
return (sref != null ? new EmbeddedServiceReference(sref) : null);
}
- public OSGiServiceReference[] getServiceReferences(String clazz, String filter) throws InvalidSyntaxException
+ public OSGiServiceReference[] getServiceReferences(String clazz, String filter)
{
OSGiServiceReference[] retRefs = null;
- ServiceReference[] srefs = getBundleContext().getServiceReferences(clazz, filter);
+
+ ServiceReference[] srefs;
+ try
+ {
+ srefs = getBundleContext().getServiceReferences(clazz, filter);
+ }
+ catch (InvalidSyntaxException e)
+ {
+ throw new IllegalArgumentException("Invalid filter syntax: " + filter);
+ }
+
if (srefs != null)
{
retRefs = new OSGiServiceReference[srefs.length];
@@ -129,7 +139,7 @@
}
@Override
- public void addCapability(Capability capability) throws BundleException, InvalidSyntaxException
+ public void addCapability(Capability capability) throws BundleException
{
// Copy the properties to the System props
Map<String, String> props = capability.getSystemProperties();
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java 2009-10-09 12:47:53 UTC (rev 94594)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java 2009-10-09 12:48:58 UTC (rev 94595)
@@ -49,7 +49,6 @@
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
import org.osgi.framework.Constants;
-import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.Version;
/**
@@ -77,7 +76,7 @@
return helper;
}
- public void addCapability(Capability capability) throws BundleException, InvalidSyntaxException
+ public void addCapability(Capability capability) throws BundleException
{
// Add dependent capabilies
for (Capability dependency : capability.getDependencies())
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteFramework.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteFramework.java 2009-10-09 12:47:53 UTC (rev 94594)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteFramework.java 2009-10-09 12:48:58 UTC (rev 94595)
@@ -27,7 +27,6 @@
import org.jboss.osgi.spi.management.ManagedBundleMBean;
import org.jboss.osgi.spi.management.ManagedServiceReference;
-import org.osgi.framework.InvalidSyntaxException;
/**
* The supported functionality of a remote OSGi Framework
@@ -64,5 +63,5 @@
* that were registered under the specified class, match the specified filter criteria,
* and the packages for the class names under which the services were registered.
*/
- ManagedServiceReference[] getServiceReferences(String clazz, String filter) throws InvalidSyntaxException;
+ ManagedServiceReference[] getServiceReferences(String clazz, String filter);
}
\ No newline at end of file
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteRuntime.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteRuntime.java 2009-10-09 12:47:53 UTC (rev 94594)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteRuntime.java 2009-10-09 12:48:58 UTC (rev 94595)
@@ -47,7 +47,6 @@
import org.jboss.osgi.spi.util.BundleDeployment;
import org.jboss.osgi.spi.util.BundleDeploymentFactory;
import org.osgi.framework.BundleException;
-import org.osgi.framework.InvalidSyntaxException;
/**
* A remote implementation of the {@link OSGiRuntime}
@@ -167,7 +166,7 @@
return manref != null ? new RemoteServiceReference(manref) : null;
}
- public OSGiServiceReference[] getServiceReferences(String clazz, String filter) throws InvalidSyntaxException
+ public OSGiServiceReference[] getServiceReferences(String clazz, String filter)
{
OSGiServiceReference[] srefs = null;
@@ -284,7 +283,7 @@
return managedFramework.getServiceReference(clazz);
}
- public ManagedServiceReference[] getServiceReferences(String clazz, String filter) throws InvalidSyntaxException
+ public ManagedServiceReference[] getServiceReferences(String clazz, String filter)
{
return managedFramework.getServiceReferences(clazz, filter);
}
16 years, 2 months
JBoss-OSGI SVN: r94594 - projects/jboss-osgi/trunk.
by jboss-osgi-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-09 08:47:53 -0400 (Fri, 09 Oct 2009)
New Revision: 94594
Modified:
projects/jboss-osgi/trunk/pom.xml
Log:
[JBOSGI-163] Husky invocation before async extender processing
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-10-09 12:44:30 UTC (rev 94593)
+++ projects/jboss-osgi/trunk/pom.xml 2009-10-09 12:47:53 UTC (rev 94594)
@@ -46,9 +46,9 @@
<version.jboss.osgi.blueprint>1.0.0.Alpha2</version.jboss.osgi.blueprint>
<version.jboss.osgi.common>1.0.2-SNAPSHOT</version.jboss.osgi.common>
<version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
- <version.jboss.osgi.framework>1.0.0-SNAPSHOT</version.jboss.osgi.framework>
+ <version.jboss.osgi.framework>1.0.0.Alpha1</version.jboss.osgi.framework>
<version.jboss.osgi.hotdeploy>1.0.1</version.jboss.osgi.hotdeploy>
- <version.jboss.osgi.husky>1.0.0</version.jboss.osgi.husky>
+ <version.jboss.osgi.husky>1.0.1-SNAPSHOT</version.jboss.osgi.husky>
<version.jboss.osgi.jaxb>2.1.10.SP2</version.jboss.osgi.jaxb>
<version.jboss.osgi.jmx>1.0.1</version.jboss.osgi.jmx>
<version.jboss.osgi.jndi>1.0.1</version.jboss.osgi.jndi>
16 years, 2 months
JBoss-OSGI SVN: r94593 - in projects/jboss-osgi/projects/bundles/husky/trunk: harness and 8 other directories.
by jboss-osgi-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-09 08:44:30 -0400 (Fri, 09 Oct 2009)
New Revision: 94593
Added:
projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/resources/META-INF/
projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/resources/META-INF/services/
projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider
projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/resources/jboss-osgi-framework.properties
Removed:
projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/resources/jboss-osgi-felix.properties
projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider
Modified:
projects/jboss-osgi/projects/bundles/husky/trunk/harness/pom.xml
projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/husky/internal/AbstractConnector.java
projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/husky/runtime/Connector.java
projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml
projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml
projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/scripts/assembly-bundles.xml
projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/java/org/jboss/test/osgi/husky/context/ContextTestCase.java
projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/java/org/jboss/test/osgi/husky/context/MultipleMethodsTestCase.java
projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/java/org/jboss/test/osgi/husky/context/StaticContextTestCase.java
Log:
[JBOSGI-163] Husky invocation before async extender processing
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/harness/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/harness/pom.xml 2009-10-09 12:31:14 UTC (rev 94592)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/harness/pom.xml 2009-10-09 12:44:30 UTC (rev 94593)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-husky-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<!-- Dependencies -->
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/husky/internal/AbstractConnector.java
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/husky/internal/AbstractConnector.java 2009-10-09 12:31:14 UTC (rev 94592)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/husky/internal/AbstractConnector.java 2009-10-09 12:44:30 UTC (rev 94593)
@@ -50,7 +50,11 @@
public void addPackageListener(PackageListener listener)
{
- listeners.add(listener);
+ synchronized (listeners)
+ {
+ listeners.add(listener);
+ listeners.notifyAll();
+ }
}
public List<PackageListener> getPackageListeners()
@@ -60,20 +64,45 @@
public void removePackageListener(PackageListener listener)
{
- listeners.remove(listener);
+ synchronized (listeners)
+ {
+ listeners.remove(listener);
+ }
}
-
+
public Response process(Request req) throws ClassNotFoundException
{
String testClass = req.getClassName();
- for (PackageListener listener : listeners)
+
+ int timeout = 50;
+ PackageListener listener = null;
+ while (listener == null && 0 < timeout--)
{
- if (listener.match(req))
+ synchronized (listeners)
{
- return listener.runTests(req);
+ try
+ {
+ for (PackageListener aux : listeners)
+ {
+ if (aux.match(req))
+ {
+ listener = aux;
+ break;
+ }
+ }
+ listeners.wait(200);
+ }
+ catch (InterruptedException e)
+ {
+ // ignore
+ }
}
}
- throw new IllegalStateException("Cannot find listener to handle: " + testClass + ", we have " + listeners);
+
+ if (listener == null)
+ throw new IllegalStateException("Cannot find listener to handle: " + testClass + ", we have " + listeners);
+
+ return listener.runTests(req);
}
protected InputStream process(InputStream reqStream)
@@ -85,7 +114,7 @@
// Unmarshall the Request
ObjectInputStream ois = new ObjectInputStream(reqStream);
request = (Request)ois.readObject();
-
+
// Field the request through the abstract connector
response = process(request);
}
@@ -100,7 +129,7 @@
}
response.addFailure(failure);
}
-
+
// Marshall the Response
try
{
@@ -108,7 +137,7 @@
ObjectOutputStream oos = new ObjectOutputStream(baos);
oos.writeObject(response);
oos.close();
-
+
return new ByteArrayInputStream(baos.toByteArray());
}
catch (IOException ex)
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/husky/runtime/Connector.java
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/husky/runtime/Connector.java 2009-10-09 12:31:14 UTC (rev 94592)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/husky/runtime/Connector.java 2009-10-09 12:44:30 UTC (rev 94593)
@@ -47,7 +47,7 @@
* Handles the test request by dispatching to one of the
* associated {@link PackageListener}s.
*
- * @throws RuntimeException if no {@link PackageListener} can
+ * @throws RuntimeException if no {@link PackageListener} can be found
*/
Response process(Request req) throws ClassNotFoundException;
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2009-10-09 12:31:14 UTC (rev 94592)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2009-10-09 12:44:30 UTC (rev 94593)
@@ -22,21 +22,22 @@
<artifactId>jboss-osgi-husky-parent</artifactId>
<packaging>pom</packaging>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<!-- Parent -->
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-parent</artifactId>
- <version>1.0.1</version>
+ <version>1.0.3-SNAPSHOT</version>
</parent>
<!-- Properties -->
<properties>
+ <version.aqute.bnd>0.0.356</version.aqute.bnd>
<version.apache.felix.log>1.0.0</version.apache.felix.log>
- <version.jboss.osgi.jmx>1.0.0</version.jboss.osgi.jmx>
- <version.jboss.osgi.runtime.felix>1.0.0</version.jboss.osgi.runtime.felix>
- <version.osgi>r4v41</version.osgi>
+ <version.jboss.osgi.jmx>1.0.1</version.jboss.osgi.jmx>
+ <version.jboss.osgi.runtime.felix>2.0.0</version.jboss.osgi.runtime.felix>
+ <version.osgi>r4v42</version.osgi>
</properties>
<!-- Modules -->
@@ -49,6 +50,11 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>biz.aQute</groupId>
+ <artifactId>bnd</artifactId>
+ <version>${version.aqute.bnd}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.log</artifactId>
<version>${version.apache.felix.log}</version>
@@ -59,7 +65,7 @@
<version>${version.jboss.osgi.jmx}</version>
</dependency>
<dependency>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-runtime-felix</artifactId>
<version>${version.jboss.osgi.runtime.felix}</version>
</dependency>
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml 2009-10-09 12:31:14 UTC (rev 94592)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml 2009-10-09 12:44:30 UTC (rev 94593)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-husky-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<!-- Dependencies -->
@@ -36,13 +36,13 @@
<version>${version}</version>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>biz.aQute</groupId>
<artifactId>bnd</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-runtime-felix</artifactId>
</dependency>
<dependency>
@@ -53,7 +53,7 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
</dependency>
-
+
<!-- Bundle Dependencies -->
<dependency>
<groupId>org.apache.felix</groupId>
@@ -65,6 +65,13 @@
<artifactId>jboss-osgi-jmx</artifactId>
<scope>provided</scope>
</dependency>
+
+ <!-- Test Dependencies -->
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -108,9 +115,28 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>test.archive.directory</name>
+ <value>${project.build.directory}/test-libs</value>
+ </property>
+ <property>
+ <name>log4j.output.dir</name>
+ <value>${project.build.directory}</value>
+ </property>
+ <property>
+ <name>org.jboss.osgi.husky.Invoker</name>
+ <value>org.jboss.osgi.husky.internal.OSGiInvoker</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
</plugins>
</build>
-
+
<!-- Profiles -->
<profiles>
@@ -161,7 +187,7 @@
</plugins>
</build>
</profile>
-
+
</profiles>
-
+
</project>
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/scripts/assembly-bundles.xml 2009-10-09 12:31:14 UTC (rev 94592)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/scripts/assembly-bundles.xml 2009-10-09 12:44:30 UTC (rev 94593)
@@ -16,7 +16,9 @@
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>*:jboss-osgi-common:jar</include>
+ <include>*:jboss-osgi-common-core:jar</include>
<include>*:jboss-osgi-jmx:jar</include>
+ <include>*:jboss-osgi-jndi:jar</include>
<include>*:jboss-osgi-husky:jar</include>
<include>*:org.apache.felix.log:jar</include>
<include>*:org.osgi.compendium:jar</include>
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/java/org/jboss/test/osgi/husky/context/ContextTestCase.java
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/java/org/jboss/test/osgi/husky/context/ContextTestCase.java 2009-10-09 12:31:14 UTC (rev 94592)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/java/org/jboss/test/osgi/husky/context/ContextTestCase.java 2009-10-09 12:44:30 UTC (rev 94593)
@@ -54,7 +54,7 @@
private OSGiRuntime runtime;
@Before
- public void setUp() throws BundleException
+ public void setUp() throws Exception
{
if (context == null)
{
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/java/org/jboss/test/osgi/husky/context/MultipleMethodsTestCase.java
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/java/org/jboss/test/osgi/husky/context/MultipleMethodsTestCase.java 2009-10-09 12:31:14 UTC (rev 94592)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/java/org/jboss/test/osgi/husky/context/MultipleMethodsTestCase.java 2009-10-09 12:44:30 UTC (rev 94593)
@@ -54,7 +54,7 @@
private static int testCount;
@BeforeClass
- public static void beforeClass() throws BundleException
+ public static void beforeClass() throws Exception
{
if (context == null)
{
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/java/org/jboss/test/osgi/husky/context/StaticContextTestCase.java
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/java/org/jboss/test/osgi/husky/context/StaticContextTestCase.java 2009-10-09 12:31:14 UTC (rev 94592)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/java/org/jboss/test/osgi/husky/context/StaticContextTestCase.java 2009-10-09 12:44:30 UTC (rev 94593)
@@ -54,7 +54,7 @@
private static OSGiRuntime runtime;
@BeforeClass
- public static void beforeClass() throws BundleException
+ public static void beforeClass() throws Exception
{
if (context == null)
{
Copied: projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider (from rev 94555, projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider)
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider (rev 0)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-10-09 12:44:30 UTC (rev 94593)
@@ -0,0 +1 @@
+org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
\ No newline at end of file
Deleted: projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/resources/jboss-osgi-felix.properties
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/resources/jboss-osgi-felix.properties 2009-10-09 12:31:14 UTC (rev 94592)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/resources/jboss-osgi-felix.properties 2009-10-09 12:44:30 UTC (rev 94593)
@@ -1,40 +0,0 @@
-#
-# Properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
-#
-# $Id$
-#
-
-# The OSGiFramework implementation
-org.jboss.osgi.spi.framework.impl=org.jboss.osgi.felix.framework.FelixIntegration
-
-# Properties to configure the Framework
-org.osgi.framework.storage=${test.archive.directory}/../osgi-store
-org.osgi.framework.storage.clean=onFirstInit
-
-# Husky socket connector properties
-org.jboss.osgi.husky.runtime.connector.host=localhost
-org.jboss.osgi.husky.runtime.connector.port=5401
-
-# Framework bootdelegation
-# org.osgi.framework.bootdelegation=org.osgi.service.log
-
-# Extra System Packages
-org.osgi.framework.system.packages.extra=\
- org.jboss.logging, \
- org.jboss.osgi.spi;version=1.0, \
- org.jboss.osgi.spi.capability;version=1.0, \
- org.jboss.osgi.spi.logging;version=1.0, \
- org.jboss.osgi.spi.management;version=1.0, \
- org.jboss.osgi.spi.service;version=1.0, \
- org.jboss.osgi.spi.testing;version=1.0, \
- org.jboss.osgi.spi.util;version=1.0, \
- org.osgi.framework;version=1.4
-
-# Bundles that need to be installed with the Framework automatically
-org.jboss.osgi.spi.framework.autoInstall=\
- file://${test.archive.directory}/bundles/org.osgi.compendium.jar
-
-# Bundles that need to be started automatically
-org.jboss.osgi.spi.framework.autoStart=\
- file://${test.archive.directory}/bundles/org.apache.felix.log.jar \
- file://${test.archive.directory}/bundles/jboss-osgi-common.jar
Copied: projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/resources/jboss-osgi-framework.properties (from rev 94555, projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/resources/jboss-osgi-felix.properties)
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/resources/jboss-osgi-framework.properties (rev 0)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/resources/jboss-osgi-framework.properties 2009-10-09 12:44:30 UTC (rev 94593)
@@ -0,0 +1,40 @@
+#
+# Properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
+#
+# $Id$
+#
+
+# The OSGiFramework implementation
+org.jboss.osgi.spi.framework.impl=org.jboss.osgi.felix.framework.FelixIntegration
+
+# Properties to configure the Framework
+org.osgi.framework.storage=${test.archive.directory}/../osgi-store
+org.osgi.framework.storage.clean=onFirstInit
+
+# Husky socket connector properties
+org.jboss.osgi.husky.runtime.connector.host=localhost
+org.jboss.osgi.husky.runtime.connector.port=5401
+
+# Framework bootdelegation
+# org.osgi.framework.bootdelegation=org.osgi.service.log
+
+# Extra System Packages
+org.osgi.framework.system.packages.extra=\
+ org.jboss.logging, \
+ org.jboss.osgi.spi;version=1.0, \
+ org.jboss.osgi.spi.capability;version=1.0, \
+ org.jboss.osgi.spi.logging;version=1.0, \
+ org.jboss.osgi.spi.management;version=1.0, \
+ org.jboss.osgi.spi.service;version=1.0, \
+ org.jboss.osgi.spi.testing;version=1.0, \
+ org.jboss.osgi.spi.util;version=1.0, \
+ org.osgi.framework;version=1.4
+
+# Bundles that need to be installed with the Framework automatically
+org.jboss.osgi.spi.framework.autoInstall=\
+ file://${test.archive.directory}/bundles/org.osgi.compendium.jar
+
+# Bundles that need to be started automatically
+org.jboss.osgi.spi.framework.autoStart=\
+ file://${test.archive.directory}/bundles/org.apache.felix.log.jar \
+ file://${test.archive.directory}/bundles/jboss-osgi-common.jar
Deleted: projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-10-09 12:31:14 UTC (rev 94592)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-10-09 12:44:30 UTC (rev 94593)
@@ -1 +0,0 @@
-org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
\ No newline at end of file
16 years, 2 months
JBoss-OSGI SVN: r94555 - projects/jboss-osgi/trunk/reactor/framework.
by jboss-osgi-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-09 04:51:58 -0400 (Fri, 09 Oct 2009)
New Revision: 94555
Modified:
projects/jboss-osgi/trunk/reactor/framework/pom.xml
Log:
version=1.0.0.Alpha1
Modified: projects/jboss-osgi/trunk/reactor/framework/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/pom.xml 2009-10-09 08:37:32 UTC (rev 94554)
+++ projects/jboss-osgi/trunk/reactor/framework/pom.xml 2009-10-09 08:51:58 UTC (rev 94555)
@@ -28,7 +28,7 @@
<artifactId>jboss-osgi-framework</artifactId>
<packaging>bundle</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Alpha1</version>
<parent>
<groupId>org.jboss.osgi</groupId>
16 years, 2 months
JBoss-OSGI SVN: r94554 - in projects/jboss-osgi/trunk/reactor: framework and 4 other directories.
by jboss-osgi-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-09 04:37:32 -0400 (Fri, 09 Oct 2009)
New Revision: 94554
Added:
projects/jboss-osgi/trunk/reactor/framework/src/test/resources/log4j.xml
Removed:
projects/jboss-osgi/trunk/reactor/framework/src/test/resources/log4j-example.xml
Modified:
projects/jboss-osgi/trunk/reactor/framework/pom.xml
projects/jboss-osgi/trunk/reactor/framework/scripts/assembly-bundles.xml
projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/BundleResolverTest.java
projects/jboss-osgi/trunk/reactor/pom.xml
projects/jboss-osgi/trunk/reactor/remotejmx/pom.xml
Log:
Move framework to jboss-osgi reactor
Modified: projects/jboss-osgi/trunk/reactor/framework/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/pom.xml 2009-10-09 08:33:09 UTC (rev 94553)
+++ projects/jboss-osgi/trunk/reactor/framework/pom.xml 2009-10-09 08:37:32 UTC (rev 94554)
@@ -23,7 +23,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <name>JBossOSGi Runtime - Microcontainer</name>
+ <name>JBossOSGi Framework</name>
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-framework</artifactId>
<packaging>bundle</packaging>
@@ -32,42 +32,24 @@
<parent>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-parent</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <artifactId>jboss-osgi</artifactId>
+ <version>1.0.0.Beta4</version>
</parent>
<!-- Properties -->
<properties>
- <version.aqute.bnd>0.0.356</version.aqute.bnd>
- <version.apache.felix.configadmin>1.0.10</version.apache.felix.configadmin>
- <version.apache.felix.http.jetty>1.0.1</version.apache.felix.http.jetty>
- <version.apache.felix.log>1.0.0</version.apache.felix.log>
- <version.apache.felix.metatype>1.0.2</version.apache.felix.metatype>
<version.jboss.aop>2.1.0.CR3</version.jboss.aop>
<version.jboss.classloading>2.0.7-SNAPSHOT</version.jboss.classloading>
<version.jboss.deployers>2.0.8.GA</version.jboss.deployers>
<version.jboss.logging.log4j>2.1.0.GA</version.jboss.logging.log4j>
- <version.jboss.osgi.apache.xerces>2.9.1.SP2</version.jboss.osgi.apache.xerces>
- <version.jboss.osgi.common>1.0.2-SNAPSHOT</version.jboss.osgi.common>
- <version.jboss.osgi.common-core>2.2.13.GA</version.jboss.osgi.common-core>
- <version.jboss.osgi.hotdeploy>1.0.1</version.jboss.osgi.hotdeploy>
- <version.jboss.osgi.husky>1.0.0</version.jboss.osgi.husky>
- <version.jboss.osgi.jaxb>2.1.10.SP2</version.jboss.osgi.jaxb>
- <version.jboss.osgi.jmx>1.0.1</version.jboss.osgi.jmx>
- <version.jboss.osgi.jndi>1.0.1</version.jboss.osgi.jndi>
- <version.jboss.osgi.runtime.deployers>1.0.2-SNAPSHOT</version.jboss.osgi.runtime.deployers>
- <version.jboss.osgi.spi>1.0.2-SNAPSHOT</version.jboss.osgi.spi>
- <version.jboss.osgi.xml.binding>2.0.1.SP1</version.jboss.osgi.xml.binding>
<version.jboss.microcontainer>2.0.9.GA</version.jboss.microcontainer>
<version.jboss.test>1.1.4.GA</version.jboss.test>
- <version.osgi>r4v42</version.osgi>
</properties>
<dependencies>
<dependency>
<groupId>biz.aQute</groupId>
<artifactId>bnd</artifactId>
- <version>${version.aqute.bnd}</version>
</dependency>
<dependency>
<groupId>org.jboss.aop</groupId>
@@ -166,12 +148,10 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${version.osgi}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>${version.osgi}</version>
</dependency>
<!-- Test dependencies -->
@@ -196,7 +176,6 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
- <version>${version.apache.felix.configadmin}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -211,24 +190,7 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <version>${version.apache.felix.http.jetty}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.log</artifactId>
- <version>${version.apache.felix.log}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -244,7 +206,6 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.metatype</artifactId>
- <version>${version.apache.felix.metatype}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -260,43 +221,36 @@
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-apache-xerces</artifactId>
- <version>${version.jboss.osgi.apache.xerces}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-common</artifactId>
- <version>${version.jboss.osgi.common}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-common-core</artifactId>
- <version>${version.jboss.osgi.common-core}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-husky</artifactId>
- <version>${version.jboss.osgi.husky}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-jaxb</artifactId>
- <version>${version.jboss.osgi.jaxb}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-jmx</artifactId>
- <version>${version.jboss.osgi.jmx}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-xml-binding</artifactId>
- <version>${version.jboss.osgi.xml.binding}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: projects/jboss-osgi/trunk/reactor/framework/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/scripts/assembly-bundles.xml 2009-10-09 08:33:09 UTC (rev 94553)
+++ projects/jboss-osgi/trunk/reactor/framework/scripts/assembly-bundles.xml 2009-10-09 08:37:32 UTC (rev 94554)
@@ -35,7 +35,6 @@
<include>*:jboss-osgi-jndi:jar</include>
<include>*:jboss-osgi-xml-binding:jar</include>
<include>*:org.apache.felix.configadmin:jar</include>
- <include>*:org.apache.felix.http.jetty:jar</include>
<include>*:org.apache.felix.log:jar</include>
<include>*:org.apache.felix.metatype:jar</include>
</includes>
Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/BundleResolverTest.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/BundleResolverTest.java 2009-10-09 08:33:09 UTC (rev 94553)
+++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/BundleResolverTest.java 2009-10-09 08:37:32 UTC (rev 94554)
@@ -65,7 +65,7 @@
bundlePaths.add("bundles/jboss-osgi-jndi.jar");
bundlePaths.add("bundles/jboss-osgi-xml-binding.jar");
bundlePaths.add("bundles/org.apache.felix.configadmin.jar");
- bundlePaths.add("bundles/org.apache.felix.http.jetty.jar");
+ //bundlePaths.add("bundles/org.apache.felix.http.jetty.jar");
bundlePaths.add("bundles/org.apache.felix.log.jar");
bundlePaths.add("bundles/org.apache.felix.metatype.jar");
bundlePaths.add("bundles/org.osgi.compendium.jar");
Deleted: projects/jboss-osgi/trunk/reactor/framework/src/test/resources/log4j-example.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/test/resources/log4j-example.xml 2009-10-09 08:33:09 UTC (rev 94553)
+++ projects/jboss-osgi/trunk/reactor/framework/src/test/resources/log4j-example.xml 2009-10-09 08:37:32 UTC (rev 94554)
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
- <!-- ================================= -->
- <!-- Preserve messages in a local file -->
- <!-- ================================= -->
-
- <appender name="FILE" class="org.apache.log4j.FileAppender">
- <param name="File" value="${log4j.output.dir}/test.log"/>
- <param name="Append" value="false"/>
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
- </layout>
- </appender>
-
- <!-- ============================== -->
- <!-- Append messages to the console -->
- <!-- ============================== -->
-
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <param name="Target" value="System.out" />
- <param name="Threshold" value="INFO" />
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n" />
- </layout>
- </appender>
-
- <!-- ================ -->
- <!-- Limit categories -->
- <!-- ================ -->
-
- <!-- Show jboss deployer traces
- <category name="org.jboss.deployer">
- <priority value="TRACE" />
- </category>
- -->
-
- <!-- ======================= -->
- <!-- Setup the Root category -->
- <!-- ======================= -->
-
- <root>
- <!--appender-ref ref="CONSOLE"/-->
- <appender-ref ref="FILE"/>
- </root>
-
-</log4j:configuration>
Copied: projects/jboss-osgi/trunk/reactor/framework/src/test/resources/log4j.xml (from rev 94551, projects/jboss-osgi/trunk/reactor/framework/src/test/resources/log4j-example.xml)
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/test/resources/log4j.xml (rev 0)
+++ projects/jboss-osgi/trunk/reactor/framework/src/test/resources/log4j.xml 2009-10-09 08:37:32 UTC (rev 94554)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <!-- ================================= -->
+ <!-- Preserve messages in a local file -->
+ <!-- ================================= -->
+
+ <appender name="FILE" class="org.apache.log4j.FileAppender">
+ <param name="File" value="${log4j.output.dir}/test.log"/>
+ <param name="Append" value="false"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- ============================== -->
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <param name="Target" value="System.out" />
+ <param name="Threshold" value="INFO" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n" />
+ </layout>
+ </appender>
+
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+
+ <!-- Show jboss deployer traces
+ <category name="org.jboss.deployer">
+ <priority value="TRACE" />
+ </category>
+ -->
+
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+ <!--appender-ref ref="CONSOLE"/-->
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
Modified: projects/jboss-osgi/trunk/reactor/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/pom.xml 2009-10-09 08:33:09 UTC (rev 94553)
+++ projects/jboss-osgi/trunk/reactor/pom.xml 2009-10-09 08:37:32 UTC (rev 94554)
@@ -42,6 +42,7 @@
</parent>
<modules>
+ <module>framework</module>
<module>blueprint</module>
<module>remotejmx</module>
</modules>
Modified: projects/jboss-osgi/trunk/reactor/remotejmx/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/remotejmx/pom.xml 2009-10-09 08:33:09 UTC (rev 94553)
+++ projects/jboss-osgi/trunk/reactor/remotejmx/pom.xml 2009-10-09 08:37:32 UTC (rev 94554)
@@ -14,7 +14,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <name>JBossOSGi Runtime - JMX Invoker Adaptor Client</name>
+ <name>JBossOSGi Runtime - Invoker Adaptor Client</name>
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jmx-invoker-adaptor-client</artifactId>
16 years, 2 months
JBoss-OSGI SVN: r94549 - in projects/jboss-osgi: trunk/reactor and 1 other directory.
by jboss-osgi-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-09 04:25:55 -0400 (Fri, 09 Oct 2009)
New Revision: 94549
Added:
projects/jboss-osgi/trunk/reactor/framework/
Removed:
projects/jboss-osgi/projects/runtime/microcontainer/trunk/
Log:
Move mc framework to reactor
Copied: projects/jboss-osgi/trunk/reactor/framework (from rev 94548, projects/jboss-osgi/projects/runtime/microcontainer/trunk)
16 years, 2 months
JBoss-OSGI SVN: r94545 - projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk.
by jboss-osgi-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-09 04:01:52 -0400 (Fri, 09 Oct 2009)
New Revision: 94545
Modified:
projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml
Log:
Update parent
Modified: projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml 2009-10-09 07:59:20 UTC (rev 94544)
+++ projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml 2009-10-09 08:01:52 UTC (rev 94545)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3-SNAPSHOT</version>
</parent>
<!-- Properties -->
16 years, 2 months
JBoss-OSGI SVN: r94544 - in projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi: bundle/test and 1 other directory.
by jboss-osgi-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-09 03:59:20 -0400 (Fri, 09 Oct 2009)
New Revision: 94544
Modified:
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/OSGiTestCase.java
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/bundle/test/BundleContextUnitTestCase.java
Log:
Improve event delivery assertion
Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/OSGiTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/OSGiTestCase.java 2009-10-09 07:37:48 UTC (rev 94543)
+++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/OSGiTestCase.java 2009-10-09 07:59:20 UTC (rev 94544)
@@ -447,7 +447,7 @@
protected void assertFrameworkEvent(int type, Bundle bundle, Class<? extends Throwable> expectedThrowable) throws Exception
{
- waitForEvents(frameworkEvents);
+ waitForEvent(frameworkEvents, type);
getLog().debug("frameworkEvents=" + frameworkEvents);
int size = frameworkEvents.size();
assertTrue("" + size, size > 0);
@@ -489,7 +489,7 @@
protected void assertBundleEvent(int type, Bundle bundle) throws Exception
{
- waitForEvents(bundleEvents);
+ waitForEvent(bundleEvents, type);
getLog().debug("bundleEvents=" + bundleEvents);
int size = bundleEvents.size();
@@ -535,7 +535,7 @@
protected void assertServiceEvent(int type, ServiceReference reference) throws Exception
{
- waitForEvents(serviceEvents);
+ waitForEvent(serviceEvents, type);
getLog().debug("serviceEvents=" + serviceEvents);
int size = serviceEvents.size();
assertTrue("" + size, size > 0);
@@ -546,18 +546,47 @@
}
@SuppressWarnings("unchecked")
- private void waitForEvents(List events) throws InterruptedException
+ private void waitForEvent(List events, int type) throws InterruptedException
{
// Timeout for event delivery: 3 sec
int timeout = 30;
- while (events.size() == 0 && 0 < timeout)
+ boolean eventFound = false;
+ while (eventFound == false && 0 < timeout)
{
synchronized (events)
{
events.wait(100);
- if (events.size() > 0)
- break;
+ for (Object aux : events)
+ {
+ if (aux instanceof BundleEvent)
+ {
+ BundleEvent event = (BundleEvent)aux;
+ if (type == event.getType())
+ {
+ eventFound = true;
+ break;
+ }
+ }
+ else if (aux instanceof ServiceEvent)
+ {
+ ServiceEvent event = (ServiceEvent)aux;
+ if (type == event.getType())
+ {
+ eventFound = true;
+ break;
+ }
+ }
+ else if (aux instanceof FrameworkEvent)
+ {
+ FrameworkEvent event = (FrameworkEvent)aux;
+ if (type == event.getType())
+ {
+ eventFound = true;
+ break;
+ }
+ }
+ }
}
timeout--;
}
Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/bundle/test/BundleContextUnitTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/bundle/test/BundleContextUnitTestCase.java 2009-10-09 07:37:48 UTC (rev 94543)
+++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/bundle/test/BundleContextUnitTestCase.java 2009-10-09 07:59:20 UTC (rev 94544)
@@ -408,6 +408,7 @@
{
uninstall(bundle);
}
+ assertBundleEvent(BundleEvent.STOPPING, bundle);
assertBundleEvent(BundleEvent.STOPPED, bundle);
// todo assertBundleEvent(BundleEvent.UNRESOLVED, bundle);
assertBundleEvent(BundleEvent.UNINSTALLED, bundle);
16 years, 2 months