[jboss-cvs] JBossAS SVN: r77416 - in projects/jboss-osgi/trunk: osgi-int and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Aug 25 07:17:19 EDT 2008
Author: alesj
Date: 2008-08-25 07:17:18 -0400 (Mon, 25 Aug 2008)
New Revision: 77416
Modified:
projects/jboss-osgi/trunk/build/pom.xml
projects/jboss-osgi/trunk/osgi-int/pom.xml
projects/jboss-osgi/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/BundleActivatorDeployer.java
projects/jboss-osgi/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/OSGiStructure.java
projects/jboss-osgi/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployment/xml/OSGiSchemaBindingHelper.java
projects/jboss-osgi/trunk/osgi-int/src/main/org/jboss/osgi/plugins/facade/AbstractServiceEvent.java
projects/jboss-osgi/trunk/osgi-int/src/main/org/jboss/osgi/plugins/facade/BundleContextImpl.java
projects/jboss-osgi/trunk/osgi-int/src/main/org/jboss/osgi/plugins/facade/ServiceRegistrationImpl.java
projects/jboss-osgi/trunk/osgi-int/src/resources/tests/bootstrap/bootstrap.xml
projects/jboss-osgi/trunk/osgi-int/src/tests/org/jboss/test/bundle/helper/BundleEntryHelperTestCase.java
Log:
Updating project to match the rest of MC.
Modified: projects/jboss-osgi/trunk/build/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/build/pom.xml 2008-08-25 10:04:15 UTC (rev 77415)
+++ projects/jboss-osgi/trunk/build/pom.xml 2008-08-25 11:17:18 UTC (rev 77416)
@@ -31,13 +31,13 @@
</scm>
<properties>
- <version.jboss.microcontainer>2.0.0.Beta14</version.jboss.microcontainer>
- <version.jboss.deployers>2.0.0.Beta15</version.jboss.deployers>
- <version.jboss.common.core>2.2.4.GA</version.jboss.common.core>
- <version.jboss.common.logging.spi>2.0.4.GA</version.jboss.common.logging.spi>
- <version.jboss.common.logging.log4j>2.0.4.GA</version.jboss.common.logging.log4j>
+ <version.jboss.microcontainer>2.0.0.Beta17</version.jboss.microcontainer>
+ <version.jboss.deployers>2.0.0.Beta20</version.jboss.deployers>
+ <version.jboss.common.core>2.2.7.GA</version.jboss.common.core>
+ <version.jboss.logging.spi>2.0.5.GA</version.jboss.logging.spi>
+ <version.jboss.logging.log4j>2.0.5.GA</version.jboss.logging.log4j>
<version.osgi.r4.core>1.0</version.osgi.r4.core>
- <version.jboss.aop>2.0.0.CR9</version.jboss.aop>
+ <version.jboss.aop>2.0.0.CR15</version.jboss.aop>
<version.org.jboss.test>1.0.5.GA</version.org.jboss.test>
<version.junit>4.4</version.junit>
</properties>
@@ -181,19 +181,24 @@
<version>${version.jboss.deployers}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ <version>${version.jboss.deployers}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
<version>${version.jboss.common.core}</version>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
- <version>${version.jboss.common.logging.spi}</version>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ <version>${version.jboss.logging.spi}</version>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-log4j</artifactId>
- <version>${version.jboss.common.logging.log4j}</version>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <version>${version.jboss.logging.log4j}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -224,12 +229,6 @@
<version>${version.jboss.deployers}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs</artifactId>
- <version>${version.jboss.deployers}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</dependencyManagement>
Modified: projects/jboss-osgi/trunk/osgi-int/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/osgi-int/pom.xml 2008-08-25 10:04:15 UTC (rev 77415)
+++ projects/jboss-osgi/trunk/osgi-int/pom.xml 2008-08-25 11:17:18 UTC (rev 77416)
@@ -61,6 +61,10 @@
<artifactId>jboss-deployers-vfs-spi</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi_R4_core</artifactId>
</dependency>
@@ -81,12 +85,12 @@
<artifactId>jboss-common-core</artifactId>
</exclusion>
<exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
</exclusion>
<exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-log4j</artifactId>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.microcontainer</groupId>
@@ -96,6 +100,14 @@
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-dependency</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- Test dependencies -->
@@ -105,12 +117,12 @@
<scope>test</scope>
<exclusions>
<exclusion>
- <groupId>jboss</groupId>
+ <groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
</exclusion>
<exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -119,11 +131,6 @@
<artifactId>jboss-deployers-impl</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: projects/jboss-osgi/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/BundleActivatorDeployer.java
===================================================================
--- projects/jboss-osgi/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/BundleActivatorDeployer.java 2008-08-25 10:04:15 UTC (rev 77415)
+++ projects/jboss-osgi/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/BundleActivatorDeployer.java 2008-08-25 11:17:18 UTC (rev 77416)
@@ -27,7 +27,6 @@
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.helpers.AbstractRealDeployerWithInput;
import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.kernel.Kernel;
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.osgi.plugins.facade.BundleContextImpl;
import org.jboss.osgi.spi.metadata.OSGiMetaData;
@@ -42,12 +41,12 @@
{
private final KernelController controller;
- public BundleActivatorDeployer(Kernel kernel)
+ public BundleActivatorDeployer(KernelController controller)
{
super(OSGiMetaData.class);
- if (kernel == null)
- throw new IllegalArgumentException("Null kernel");
- controller = kernel.getController();
+ if (controller == null)
+ throw new IllegalArgumentException("Null controller");
+ this.controller = controller;
setDeploymentVisitor(new BundleActivatorDeploymentVisitor());
}
Modified: projects/jboss-osgi/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/OSGiStructure.java
===================================================================
--- projects/jboss-osgi/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/OSGiStructure.java 2008-08-25 10:04:15 UTC (rev 77415)
+++ projects/jboss-osgi/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/OSGiStructure.java 2008-08-25 11:17:18 UTC (rev 77416)
@@ -21,11 +21,9 @@
*/
package org.jboss.osgi.plugins.deployers;
-import org.jboss.deployers.spi.structure.StructureMetaData;
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.vfs.spi.structure.VFSStructuralDeployers;
-import org.jboss.deployers.vfs.spi.structure.helpers.AbstractStructureDeployer;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.deployers.vfs.plugins.structure.AbstractVFSStructureDeployer;
+import org.jboss.deployers.vfs.spi.structure.StructureContext;
/**
* OSGi structure deployer.
@@ -33,7 +31,7 @@
*
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
-public class OSGiStructure extends AbstractStructureDeployer
+public class OSGiStructure extends AbstractVFSStructureDeployer
{
public OSGiStructure()
{
@@ -41,9 +39,8 @@
setRelativeOrder(10001);
}
- public boolean determineStructure(VirtualFile root, VirtualFile parent, VirtualFile file, StructureMetaData metaData, VFSStructuralDeployers deployers) throws DeploymentException
+ public boolean determineStructure(StructureContext context) throws DeploymentException
{
- // todo - see JarStructure
return false;
}
}
Modified: projects/jboss-osgi/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployment/xml/OSGiSchemaBindingHelper.java
===================================================================
--- projects/jboss-osgi/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployment/xml/OSGiSchemaBindingHelper.java 2008-08-25 10:04:15 UTC (rev 77415)
+++ projects/jboss-osgi/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployment/xml/OSGiSchemaBindingHelper.java 2008-08-25 11:17:18 UTC (rev 77416)
@@ -21,9 +21,6 @@
*/
package org.jboss.osgi.plugins.deployment.xml;
-import org.jboss.kernel.plugins.deployment.xml.BeanPropertyInterceptor;
-import org.jboss.kernel.plugins.deployment.xml.BeanSchemaBinding20;
-import org.jboss.kernel.plugins.deployment.xml.ValueMetaDataElementInterceptor;
import org.jboss.xb.binding.sunday.unmarshalling.TypeBinding;
/**
@@ -31,23 +28,23 @@
*
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
+// TODO - remove this --> move xml handling to jbossxb; JBOSGI-25
public class OSGiSchemaBindingHelper
{
-
public static void initServiceHandler(TypeBinding serviceType)
{
serviceType.setHandler(ServiceHandler.HANDLER);
// handle interfaces
- serviceType.pushInterceptor(BeanSchemaBinding20.setQName, ValueMetaDataElementInterceptor.VALUES);
+// serviceType.pushInterceptor(BeanSchemaBinding20.setQName, ValueMetaDataElementInterceptor.VALUES);
// handle service-properties
- serviceType.pushInterceptor(BeanSchemaBinding20.mapQName, ValueMetaDataElementInterceptor.VALUES);
+// serviceType.pushInterceptor(BeanSchemaBinding20.mapQName, ValueMetaDataElementInterceptor.VALUES);
}
public static void initReferenceHandler(TypeBinding referenceType)
{
referenceType.setHandler(ReferenceHandler.HANDLER);
// handle properties
- referenceType.pushInterceptor(BeanSchemaBinding20.propertyQName, BeanPropertyInterceptor.INTERCEPTOR);
+// referenceType.pushInterceptor(BeanSchemaBinding20.propertyQName, BeanPropertyInterceptor.INTERCEPTOR);
// handle listener
referenceType.pushInterceptor(OSGiSchemaBinding.listenerQName, ListenerInterceptor.INTERCEPTOR);
}
@@ -56,5 +53,4 @@
{
listenerType.setHandler(ListenerHandler.HANDLER);
}
-
}
Modified: projects/jboss-osgi/trunk/osgi-int/src/main/org/jboss/osgi/plugins/facade/AbstractServiceEvent.java
===================================================================
--- projects/jboss-osgi/trunk/osgi-int/src/main/org/jboss/osgi/plugins/facade/AbstractServiceEvent.java 2008-08-25 10:04:15 UTC (rev 77415)
+++ projects/jboss-osgi/trunk/osgi-int/src/main/org/jboss/osgi/plugins/facade/AbstractServiceEvent.java 2008-08-25 11:17:18 UTC (rev 77416)
@@ -30,6 +30,7 @@
*
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
+ at SuppressWarnings("deprecation")
public class AbstractServiceEvent extends AbstractEvent implements ServiceEventAdapter
{
// todo - ServiceReference
Modified: projects/jboss-osgi/trunk/osgi-int/src/main/org/jboss/osgi/plugins/facade/BundleContextImpl.java
===================================================================
--- projects/jboss-osgi/trunk/osgi-int/src/main/org/jboss/osgi/plugins/facade/BundleContextImpl.java 2008-08-25 10:04:15 UTC (rev 77415)
+++ projects/jboss-osgi/trunk/osgi-int/src/main/org/jboss/osgi/plugins/facade/BundleContextImpl.java 2008-08-25 11:17:18 UTC (rev 77416)
@@ -121,7 +121,7 @@
public String getProperty(String string)
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return null; // TODO
}
public Bundle getBundle()
@@ -145,12 +145,12 @@
public Bundle getBundle(long id)
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return null; // TODO
}
public Bundle[] getBundles()
{
- return new Bundle[0]; //To change body of implemented methods use File | Settings | File Templates.
+ return new Bundle[0]; // TODO
}
public void addServiceListener(ServiceListener serviceListener, String filter) throws InvalidSyntaxException
@@ -304,7 +304,7 @@
}
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "deprecation"})
public ServiceRegistration registerService(String[] clazzes, Object service, Dictionary properties)
{
validateBundle();
Modified: projects/jboss-osgi/trunk/osgi-int/src/main/org/jboss/osgi/plugins/facade/ServiceRegistrationImpl.java
===================================================================
--- projects/jboss-osgi/trunk/osgi-int/src/main/org/jboss/osgi/plugins/facade/ServiceRegistrationImpl.java 2008-08-25 10:04:15 UTC (rev 77415)
+++ projects/jboss-osgi/trunk/osgi-int/src/main/org/jboss/osgi/plugins/facade/ServiceRegistrationImpl.java 2008-08-25 11:17:18 UTC (rev 77416)
@@ -30,7 +30,6 @@
import org.jboss.kernel.spi.dependency.KernelControllerContext;
import org.jboss.kernel.spi.event.KernelEvent;
import org.jboss.kernel.spi.event.KernelEventEmitter;
-import org.jboss.kernel.spi.registry.KernelRegistry;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
@@ -40,6 +39,7 @@
*
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
+ at SuppressWarnings("deprecation")
public class ServiceRegistrationImpl implements ServiceRegistration
{
protected KernelEventEmitter emitter;
@@ -59,7 +59,7 @@
}
protected void init()
{
- KernelEvent event = new AbstractServiceEvent(this, KernelRegistry.KERNEL_REGISTRY_REGISTERED, serviceId, System.currentTimeMillis(), emitter);
+ KernelEvent event = new AbstractServiceEvent(this, org.jboss.kernel.spi.registry.KernelRegistry.KERNEL_REGISTRY_REGISTERED, serviceId, System.currentTimeMillis(), emitter);
emitter.fireKernelEvent(event);
}
@@ -76,7 +76,7 @@
public ServiceReference getReference()
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return null; // TODO
}
@SuppressWarnings("unchecked")
@@ -97,7 +97,7 @@
this.properties.put(key, properties.get(key));
}
}
- KernelEvent event = new AbstractServiceEvent(this, KernelRegistry.KERNEL_REGISTRY_MODIFIED, serviceId, System.currentTimeMillis(), emitter);
+ KernelEvent event = new AbstractServiceEvent(this, org.jboss.kernel.spi.registry.KernelRegistry.KERNEL_REGISTRY_MODIFIED, serviceId, System.currentTimeMillis(), emitter);
emitter.fireKernelEvent(event);
}
}
@@ -106,7 +106,7 @@
{
validateServiceRegistration();
isRegistered = false;
- KernelEvent event = new AbstractServiceEvent(this, KernelRegistry.KERNEL_REGISTRY_UNREGISTERED, serviceId, System.currentTimeMillis(), emitter);
+ KernelEvent event = new AbstractServiceEvent(this, org.jboss.kernel.spi.registry.KernelRegistry.KERNEL_REGISTRY_UNREGISTERED, serviceId, System.currentTimeMillis(), emitter);
emitter.fireKernelEvent(event);
}
}
Modified: projects/jboss-osgi/trunk/osgi-int/src/resources/tests/bootstrap/bootstrap.xml
===================================================================
--- projects/jboss-osgi/trunk/osgi-int/src/resources/tests/bootstrap/bootstrap.xml 2008-08-25 10:04:15 UTC (rev 77415)
+++ projects/jboss-osgi/trunk/osgi-int/src/resources/tests/bootstrap/bootstrap.xml 2008-08-25 11:17:18 UTC (rev 77416)
@@ -30,7 +30,7 @@
</bean>
<!-- A declared structure descriptor deployer -->
- <bean name="DeclaredStructure" class="org.jboss.deployers.vfs.plugins.structure.explicit.DeclaredStructure"></bean>
+ <bean name="DeclaredStructure" class="org.jboss.deployers.vfs.plugins.structure.explicit.DeclaredStructure"/>
<!-- JAR Structure -->
<bean name="JARStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure">
@@ -85,20 +85,15 @@
</bean>
<!-- POJO Deployment -->
- <bean name="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer">
- <property name="type">beans</property>
- </bean>
- <bean name="KernelDeploymentDeployer" class="org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer">
- <property name="type">beans</property>
- </bean>
+ <bean name="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer"/>
+ <bean name="KernelDeploymentDeployer" class="org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer"/>
<bean name="BeanMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer">
- <constructor><parameter><inject bean="jboss.kernel:service=Kernel"/></parameter></constructor>
- <property name="type">beans</property>
+ <constructor><parameter class="org.jboss.dependency.spi.Controller"><inject bean="jboss.kernel:service=KernelController"/></parameter></constructor>
</bean>
<!-- OSGI Deployment -->
<bean name="BundleActivatorDeployer" class="org.jboss.osgi.plugins.deployers.BundleActivatorDeployer">
- <constructor><parameter><inject bean="jboss.kernel:service=Kernel"/></parameter></constructor>
+ <constructor><parameter class="org.jboss.kernel.spi.dependency.KernelController"><inject bean="jboss.kernel:service=KernelController"/></parameter></constructor>
</bean>
<bean name="OSGIMetaDataDeployer" class="org.jboss.osgi.plugins.deployers.OSGiMetaDataDeployer"/>
@@ -122,6 +117,7 @@
<classloading xmlns="urn:jboss:classloading:1.0" export-all="NON_EMPTY" import-all="true"/>
</property>
</bean>
+ <bean name="ClassLoaderClassPathDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderClassPathDeployer"/>
<bean name="ClassLoaderDescribeDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderDescribeDeployer">
<property name="classLoading"><inject bean="ClassLoading"/></property>
</bean>
Modified: projects/jboss-osgi/trunk/osgi-int/src/tests/org/jboss/test/bundle/helper/BundleEntryHelperTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/osgi-int/src/tests/org/jboss/test/bundle/helper/BundleEntryHelperTestCase.java 2008-08-25 10:04:15 UTC (rev 77415)
+++ projects/jboss-osgi/trunk/osgi-int/src/tests/org/jboss/test/bundle/helper/BundleEntryHelperTestCase.java 2008-08-25 11:17:18 UTC (rev 77416)
@@ -23,9 +23,10 @@
import java.net.URL;
import java.util.Enumeration;
+import java.util.Set;
+import java.util.TreeSet;
import junit.framework.Test;
-
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.osgi.plugins.facade.helpers.BundleEntryHelper;
@@ -127,12 +128,12 @@
{
Enumeration<String> entries = BundleEntryHelper.getEntryPaths(deploymentUnit, "META-INF/");
assertNotNull(entries);
- assertTrue(entries.hasMoreElements());
- assertEquals("simple.jar/META-INF/jboss-service.xml", entries.nextElement());
- assertTrue(entries.hasMoreElements());
- assertEquals("simple.jar/META-INF/Manifest.mf", entries.nextElement());
- assertFalse(entries.hasMoreElements());
-
+ Set<String> expected = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
+ expected.add("simple.jar/META-INF/jboss-service.xml");
+ expected.add("simple.jar/META-INF/Manifest.mf");
+ while (entries.hasMoreElements())
+ expected.remove(entries.nextElement());
+ assertEmpty("Missing " + expected, expected);
}
/**
More information about the jboss-cvs-commits
mailing list