JBoss-OSGI SVN: r97296 - projects/jboss-osgi/projects/bundles/jmx/trunk.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-12-02 09:57:34 -0500 (Wed, 02 Dec 2009)
New Revision: 97296
Modified:
projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml
Log:
Add DynamicImport-Packages: * for objects that get deserialized in JMX
Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2009-12-02 14:55:02 UTC (rev 97295)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2009-12-02 14:57:34 UTC (rev 97296)
@@ -122,6 +122,7 @@
org.jnp.interfaces;resolution:=optional,
-->
</Import-Package>
+ <DynamicImport-Package>*</DynamicImport-Package>
</instructions>
</configuration>
</plugin>
16 years, 7 months
- 1
- 0
JBoss-OSGI SVN: r97295 - in projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing: internal and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-12-02 09:55:02 -0500 (Wed, 02 Dec 2009)
New Revision: 97295
Modified:
projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/OSGiBundle.java
projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedBundle.java
projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiBundleImpl.java
projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteBundle.java
Log:
Add access to OSGiRuntime from OSGiBundle
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/OSGiBundle.java
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/OSGiBundle.java 2009-12-02 14:52:15 UTC (rev 97294)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/OSGiBundle.java 2009-12-02 14:55:02 UTC (rev 97295)
@@ -36,6 +36,11 @@
public abstract class OSGiBundle
{
/**
+ * Get the runtime associated with this bundle.
+ */
+ public abstract OSGiRuntime getRuntime();
+
+ /**
* Returns this bundle's unique identifier.
*/
public abstract long getBundleId();
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedBundle.java
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedBundle.java 2009-12-02 14:52:15 UTC (rev 97294)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedBundle.java 2009-12-02 14:55:02 UTC (rev 97295)
@@ -133,7 +133,9 @@
{
bundle.uninstall();
}
- getRuntime().unregisterBundle(this);
+
+ OSGiRuntimeImpl runtimeImpl = (OSGiRuntimeImpl)getRuntime();
+ runtimeImpl.unregisterBundle(this);
setUninstalled(true);
}
catch (RuntimeException rte)
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiBundleImpl.java
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiBundleImpl.java 2009-12-02 14:52:15 UTC (rev 97294)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiBundleImpl.java 2009-12-02 14:55:02 UTC (rev 97295)
@@ -24,6 +24,7 @@
// $Id$
import org.jboss.osgi.testing.OSGiBundle;
+import org.jboss.osgi.testing.OSGiRuntime;
/**
* An abstract implementation of a {@link OSGiBundle}
@@ -41,7 +42,7 @@
this.runtime = runtime;
}
- OSGiRuntimeImpl getRuntime()
+ public OSGiRuntime getRuntime()
{
return runtime;
}
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteBundle.java
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteBundle.java 2009-12-02 14:52:15 UTC (rev 97294)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteBundle.java 2009-12-02 14:55:02 UTC (rev 97295)
@@ -143,8 +143,9 @@
assertNotUninstalled();
try
{
- getRuntime().undeploy(bundleInfo.getRootURL());
- getRuntime().unregisterBundle(this);
+ OSGiRuntimeImpl runtimeImpl = (OSGiRuntimeImpl)getRuntime();
+ runtimeImpl.undeploy(bundleInfo.getRootURL());
+ runtimeImpl.unregisterBundle(this);
setUninstalled(true);
}
catch (RuntimeException rte)
16 years, 7 months
- 1
- 0
JBoss-OSGI SVN: r97294 - in projects/jboss-osgi/projects/runtime: equinox/trunk and 3 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-12-02 09:52:15 -0500 (Wed, 02 Dec 2009)
New Revision: 97294
Added:
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/DeploymentServicesActivator.java
Removed:
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/DeploymentActivator.java
Modified:
projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml
projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxBootstrapProvider.java
projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxIntegration.java
projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml
projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixBootstrapProvider.java
projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixIntegration.java
Log:
Use deployment-1.0.0-SNAPSHOT
Deleted: projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/DeploymentActivator.java
===================================================================
--- projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/DeploymentActivator.java 2009-12-02 14:49:42 UTC (rev 97293)
+++ projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/DeploymentActivator.java 2009-12-02 14:52:15 UTC (rev 97294)
@@ -1,101 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.osgi.deployment;
-
-//$Id$
-
-import java.util.Properties;
-
-import javax.management.MBeanServer;
-
-import org.jboss.osgi.deployment.deployer.DeployerService;
-import org.jboss.osgi.deployment.deployer.DeploymentRegistryService;
-import org.jboss.osgi.deployment.interceptor.LifecycleInterceptorService;
-import org.jboss.osgi.deployment.internal.DeploymentRegistryServiceImpl;
-import org.jboss.osgi.deployment.internal.LifecycleInterceptorServiceImpl;
-import org.jboss.osgi.deployment.internal.SystemDeployerService;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-import org.osgi.util.tracker.ServiceTracker;
-
-/**
- * The deployers activator
- *
- * @author thomas.diesler(a)jboss.com
- * @since 15-Oct-2009
- */
-public class DeploymentActivator
-{
- public void start(BundleContext context)
- {
- if (context == null)
- throw new IllegalArgumentException("Null BundleContext");
-
- // Register the DeploymentRegistryService
- DeploymentRegistryService registry = new DeploymentRegistryServiceImpl(context);
- context.registerService(DeploymentRegistryService.class.getName(), registry, null);
-
- // Register the SystemDeployerService
- Properties props = new Properties();
- props.put("provider", "system");
- final SystemDeployerService deployerService = new SystemDeployerService(context);
- context.registerService(DeployerService.class.getName(), deployerService, props);
-
- // Register the lifecycle interceptor related services
- LifecycleInterceptorService service = new LifecycleInterceptorServiceImpl(context);
- context.registerService(LifecycleInterceptorService.class.getName(), service, null);
-
- // Track other DeployerService implementations and register as MBean
- ServiceTracker serviceTracker = new ServiceTracker(context, DeployerService.class.getName(), null)
- {
- @Override
- public Object addingService(ServiceReference reference)
- {
- DeployerService service = (DeployerService)super.addingService(reference);
- ServiceReference sref = context.getServiceReference(MBeanServer.class.getName());
- if (sref != null)
- {
- MBeanServer mbeanServer = (MBeanServer)context.getService(sref);
- deployerService.registerDeployerServiceMBean(context, mbeanServer);
- }
- return service;
- }
-
- @Override
- public void removedService(ServiceReference reference, Object service)
- {
- ServiceReference sref = context.getServiceReference(MBeanServer.class.getName());
- if (sref != null)
- {
- MBeanServer mbeanServer = (MBeanServer)context.getService(sref);
- deployerService.unregisterDeployerServiceMBean(mbeanServer);
- }
- super.removedService(reference, service);
- }
- };
- serviceTracker.open();
- }
-
- public void stop(BundleContext context)
- {
- }
-}
\ No newline at end of file
Copied: projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/DeploymentServicesActivator.java (from rev 97211, projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/DeploymentActivator.java)
===================================================================
--- projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/DeploymentServicesActivator.java (rev 0)
+++ projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/DeploymentServicesActivator.java 2009-12-02 14:52:15 UTC (rev 97294)
@@ -0,0 +1,104 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.deployment;
+
+//$Id$
+
+import java.util.Properties;
+
+import javax.management.MBeanServer;
+
+import org.jboss.osgi.deployment.deployer.DeployerService;
+import org.jboss.osgi.deployment.deployer.DeploymentRegistryService;
+import org.jboss.osgi.deployment.interceptor.LifecycleInterceptorService;
+import org.jboss.osgi.deployment.internal.DeploymentRegistryServiceImpl;
+import org.jboss.osgi.deployment.internal.LifecycleInterceptorServiceImpl;
+import org.jboss.osgi.deployment.internal.SystemDeployerService;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.util.tracker.ServiceTracker;
+
+/**
+ * An activator for the deployment services.
+ *
+ * This can be used like a BundleActivator altough the deployment services
+ * are not installed as a bundle.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 15-Oct-2009
+ */
+public class DeploymentServicesActivator
+{
+ public void start(BundleContext context)
+ {
+ if (context == null)
+ throw new IllegalArgumentException("Null BundleContext");
+
+ // Register the DeploymentRegistryService
+ DeploymentRegistryService registry = new DeploymentRegistryServiceImpl(context);
+ context.registerService(DeploymentRegistryService.class.getName(), registry, null);
+
+ // Register the SystemDeployerService
+ Properties props = new Properties();
+ props.put("provider", "system");
+ final SystemDeployerService deployerService = new SystemDeployerService(context);
+ context.registerService(DeployerService.class.getName(), deployerService, props);
+
+ // Register the lifecycle interceptor related services
+ LifecycleInterceptorService service = new LifecycleInterceptorServiceImpl(context);
+ context.registerService(LifecycleInterceptorService.class.getName(), service, null);
+
+ // Track other DeployerService implementations and register as MBean
+ ServiceTracker serviceTracker = new ServiceTracker(context, DeployerService.class.getName(), null)
+ {
+ @Override
+ public Object addingService(ServiceReference reference)
+ {
+ DeployerService service = (DeployerService)super.addingService(reference);
+ ServiceReference sref = context.getServiceReference(MBeanServer.class.getName());
+ if (sref != null)
+ {
+ MBeanServer mbeanServer = (MBeanServer)context.getService(sref);
+ deployerService.registerDeployerServiceMBean(context, mbeanServer);
+ }
+ return service;
+ }
+
+ @Override
+ public void removedService(ServiceReference reference, Object service)
+ {
+ ServiceReference sref = context.getServiceReference(MBeanServer.class.getName());
+ if (sref != null)
+ {
+ MBeanServer mbeanServer = (MBeanServer)context.getService(sref);
+ deployerService.unregisterDeployerServiceMBean(mbeanServer);
+ }
+ super.removedService(reference, service);
+ }
+ };
+ serviceTracker.open();
+ }
+
+ public void stop(BundleContext context)
+ {
+ }
+}
\ No newline at end of file
Modified: projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml 2009-12-02 14:49:42 UTC (rev 97293)
+++ projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml 2009-12-02 14:52:15 UTC (rev 97294)
@@ -39,7 +39,7 @@
<!-- Properties -->
<properties>
<version.eclipse.equinox>3.5.1</version.eclipse.equinox>
- <version.jboss.osgi.deployment>1.0.0</version.jboss.osgi.deployment>
+ <version.jboss.osgi.deployment>1.0.0-SNAPSHOT</version.jboss.osgi.deployment>
<version.jboss.osgi.husky>1.0.2-SNAPSHOT</version.jboss.osgi.husky>
<version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi>
</properties>
Modified: projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxBootstrapProvider.java
===================================================================
--- projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxBootstrapProvider.java 2009-12-02 14:49:42 UTC (rev 97293)
+++ projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxBootstrapProvider.java 2009-12-02 14:52:15 UTC (rev 97294)
@@ -25,7 +25,7 @@
import java.util.Map;
-import org.jboss.osgi.deployment.DeploymentActivator;
+import org.jboss.osgi.deployment.DeploymentServicesActivator;
import org.jboss.osgi.spi.framework.PropertiesBootstrapProvider;
import org.jboss.osgi.spi.util.ServiceLoader;
import org.osgi.framework.BundleContext;
@@ -45,7 +45,7 @@
// Provide logging
final Logger log = LoggerFactory.getLogger(EquinoxBootstrapProvider.class);
- private DeploymentActivator deploymentActivator;
+ private DeploymentServicesActivator deploymentActivator;
@Override
protected Framework createFramework(Map<String, Object> properties)
@@ -64,7 +64,7 @@
@Override
protected void registerSystemServices(BundleContext context)
{
- deploymentActivator = new DeploymentActivator();
+ deploymentActivator = new DeploymentServicesActivator();
deploymentActivator.start(context);
}
Modified: projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxIntegration.java
===================================================================
--- projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxIntegration.java 2009-12-02 14:49:42 UTC (rev 97293)
+++ projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxIntegration.java 2009-12-02 14:52:15 UTC (rev 97294)
@@ -25,7 +25,7 @@
import java.util.Map;
-import org.jboss.osgi.deployment.DeploymentActivator;
+import org.jboss.osgi.deployment.DeploymentServicesActivator;
import org.jboss.osgi.spi.framework.FrameworkIntegrationBean;
import org.jboss.osgi.spi.util.ServiceLoader;
import org.osgi.framework.BundleContext;
@@ -45,7 +45,7 @@
// Provide logging
final Logger log = LoggerFactory.getLogger(EquinoxIntegration.class);
- private DeploymentActivator deploymentActivator;
+ private DeploymentServicesActivator deploymentActivator;
@Override
protected Framework createFramework(Map<String, Object> properties)
@@ -63,7 +63,7 @@
@Override
protected void registerSystemServices(BundleContext context)
{
- deploymentActivator = new DeploymentActivator();
+ deploymentActivator = new DeploymentServicesActivator();
deploymentActivator.start(context);
}
Modified: projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml 2009-12-02 14:49:42 UTC (rev 97293)
+++ projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml 2009-12-02 14:52:15 UTC (rev 97294)
@@ -38,7 +38,7 @@
<properties>
<version.felix.framework>2.0.2</version.felix.framework>
- <version.jboss.osgi.deployment>1.0.0</version.jboss.osgi.deployment>
+ <version.jboss.osgi.deployment>1.0.0-SNAPSHOT</version.jboss.osgi.deployment>
<version.jboss.osgi.husky>1.0.2-SNAPSHOT</version.jboss.osgi.husky>
<version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi>
<version.osgi>4.2.0</version.osgi>
Modified: projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixBootstrapProvider.java
===================================================================
--- projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixBootstrapProvider.java 2009-12-02 14:49:42 UTC (rev 97293)
+++ projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixBootstrapProvider.java 2009-12-02 14:52:15 UTC (rev 97294)
@@ -25,7 +25,7 @@
import java.util.Map;
-import org.jboss.osgi.deployment.DeploymentActivator;
+import org.jboss.osgi.deployment.DeploymentServicesActivator;
import org.jboss.osgi.spi.framework.PropertiesBootstrapProvider;
import org.jboss.osgi.spi.util.ServiceLoader;
import org.osgi.framework.BundleContext;
@@ -45,7 +45,7 @@
// Provide logging
final Logger log = LoggerFactory.getLogger(FelixBootstrapProvider.class);
- private DeploymentActivator deploymentActivator;
+ private DeploymentServicesActivator deploymentActivator;
@Override
protected Framework createFramework(Map<String, Object> properties)
@@ -71,7 +71,7 @@
@Override
protected void registerSystemServices(BundleContext context)
{
- deploymentActivator = new DeploymentActivator();
+ deploymentActivator = new DeploymentServicesActivator();
deploymentActivator.start(context);
}
Modified: projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixIntegration.java
===================================================================
--- projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixIntegration.java 2009-12-02 14:49:42 UTC (rev 97293)
+++ projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixIntegration.java 2009-12-02 14:52:15 UTC (rev 97294)
@@ -25,7 +25,7 @@
import java.util.Map;
-import org.jboss.osgi.deployment.DeploymentActivator;
+import org.jboss.osgi.deployment.DeploymentServicesActivator;
import org.jboss.osgi.spi.framework.FrameworkIntegrationBean;
import org.jboss.osgi.spi.util.ServiceLoader;
import org.osgi.framework.BundleContext;
@@ -46,7 +46,7 @@
// Provide logging
final Logger log = LoggerFactory.getLogger(FelixIntegration.class);
- private DeploymentActivator deploymentActivator;
+ private DeploymentServicesActivator deploymentActivator;
@Override
protected Framework createFramework(Map<String, Object> properties)
@@ -71,7 +71,7 @@
@Override
protected void registerSystemServices(BundleContext context)
{
- deploymentActivator = new DeploymentActivator();
+ deploymentActivator = new DeploymentServicesActivator();
deploymentActivator.start(context);
}
16 years, 7 months
- 1
- 0
JBoss-OSGI SVN: r97293 - in projects/jboss-osgi/projects/bundles: jboss-xml-binding/trunk and 2 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-12-02 09:49:42 -0500 (Wed, 02 Dec 2009)
New Revision: 97293
Modified:
projects/jboss-osgi/projects/bundles/apache-xerces/trunk/pom.xml
projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml
projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml
projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml
Log:
Use common-1.0.3-SNAPSHOT
Modified: projects/jboss-osgi/projects/bundles/apache-xerces/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/apache-xerces/trunk/pom.xml 2009-12-02 14:47:59 UTC (rev 97292)
+++ projects/jboss-osgi/projects/bundles/apache-xerces/trunk/pom.xml 2009-12-02 14:49:42 UTC (rev 97293)
@@ -32,7 +32,7 @@
<properties>
<version.apache.xerces>2.9.1</version.apache.xerces>
- <version.jboss.osgi.common>1.0.4-SNAPSHOT</version.jboss.osgi.common>
+ <version.jboss.osgi.common>1.0.3-SNAPSHOT</version.jboss.osgi.common>
<version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi>
<version.wutka.dtdparser>1.2.1</version.wutka.dtdparser>
<version.xml.resolver>1.2</version.xml.resolver>
Modified: projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml 2009-12-02 14:47:59 UTC (rev 97292)
+++ projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml 2009-12-02 14:49:42 UTC (rev 97293)
@@ -41,7 +41,7 @@
<properties>
<version.jboss.osgi.runtime.felix>2.0.2-SNAPSHOT</version.jboss.osgi.runtime.felix>
<version.jboss.xb>2.0.2.Beta3</version.jboss.xb>
- <version.jboss.osgi.common>1.0.4-SNAPSHOT</version.jboss.osgi.common>
+ <version.jboss.osgi.common>1.0.3-SNAPSHOT</version.jboss.osgi.common>
<version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
<version.jboss.osgi.husky>1.0.2-SNAPSHOT</version.jboss.osgi.husky>
<version.jboss.osgi.jaxb>2.1.10-SNAPSHOT</version.jboss.osgi.jaxb>
Modified: projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml 2009-12-02 14:47:59 UTC (rev 97292)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml 2009-12-02 14:49:42 UTC (rev 97293)
@@ -33,7 +33,7 @@
<!-- Properties -->
<properties>
<version.jboss.naming>5.0.1.GA</version.jboss.naming>
- <version.jboss.osgi.common>1.0.4-SNAPSHOT</version.jboss.osgi.common>
+ <version.jboss.osgi.common>1.0.3-SNAPSHOT</version.jboss.osgi.common>
<version.osgi>4.2.0</version.osgi>
</properties>
Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-12-02 14:47:59 UTC (rev 97292)
+++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-12-02 14:49:42 UTC (rev 97293)
@@ -42,9 +42,9 @@
<version.jboss.osgi.runtime.felix>2.0.2-SNAPSHOT</version.jboss.osgi.runtime.felix>
<version.jboss.deployers>2.0.9.GA</version.jboss.deployers>
<version.jboss.microcontainer>2.0.9.GA</version.jboss.microcontainer>
- <version.jboss.osgi.common>1.0.4-SNAPSHOT</version.jboss.osgi.common>
+ <version.jboss.osgi.common>1.0.3-SNAPSHOT</version.jboss.osgi.common>
<version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
- <version.jboss.osgi.deployment>1.0.0</version.jboss.osgi.deployment>
+ <version.jboss.osgi.deployment>1.0.0-SNAPSHOT</version.jboss.osgi.deployment>
<version.jboss.osgi.husky>1.0.2-SNAPSHOT</version.jboss.osgi.husky>
<version.jboss.osgi.jaxb>2.1.10-SNAPSHOT</version.jboss.osgi.jaxb>
<version.jboss.osgi.jmx>1.0.2-SNAPSHOT</version.jboss.osgi.jmx>
16 years, 7 months
- 1
- 0
JBoss-OSGI SVN: r97292 - in projects/jboss-osgi/projects/bundles/common/trunk: src/main/java/org/jboss/osgi/common/internal and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-12-02 09:47:59 -0500 (Wed, 02 Dec 2009)
New Revision: 97292
Modified:
projects/jboss-osgi/projects/bundles/common/trunk/pom.xml
projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/internal/CommonServicesActivator.java
Log:
Eagerly initialze the logging system
Modified: projects/jboss-osgi/projects/bundles/common/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/common/trunk/pom.xml 2009-12-02 14:47:14 UTC (rev 97291)
+++ projects/jboss-osgi/projects/bundles/common/trunk/pom.xml 2009-12-02 14:47:59 UTC (rev 97292)
@@ -21,7 +21,7 @@
<artifactId>jboss-osgi-common</artifactId>
<packaging>bundle</packaging>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.0.3-SNAPSHOT</version>
<!-- Parent -->
<parent>
Modified: projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/internal/CommonServicesActivator.java
===================================================================
--- projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/internal/CommonServicesActivator.java 2009-12-02 14:47:14 UTC (rev 97291)
+++ projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/internal/CommonServicesActivator.java 2009-12-02 14:47:59 UTC (rev 97292)
@@ -23,7 +23,6 @@
//$Id$
-
import org.jboss.osgi.common.log.LogServiceTracker;
import org.jboss.osgi.common.log.LoggingService;
import org.osgi.framework.BundleActivator;
@@ -31,6 +30,7 @@
import org.osgi.framework.ServiceReference;
import org.osgi.service.log.LogReaderService;
import org.osgi.util.tracker.ServiceTracker;
+import org.slf4j.LoggerFactory;
/**
* The common services activator
@@ -42,15 +42,18 @@
{
private LogServiceTracker logServiceTracker;
private ServiceTracker logReaderTracker;
-
+
public void start(BundleContext context)
{
+ // Initialize the logging systems
+ LoggerFactory.getLogger(CommonServicesActivator.class);
+
logServiceTracker = new LogServiceTracker(context);
-
+
// Track LogReaderService and add/remove LogListener
- logReaderTracker = trackLogReaderService(context);
+ logReaderTracker = new LogReaderServiceServiceTracker(context);
logReaderTracker.open();
-
+
// Register the logging marker service
context.registerService(LoggingService.class.getName(), new LoggingService(){}, null);
}
@@ -59,23 +62,24 @@
{
if (logServiceTracker != null)
logServiceTracker.close();
-
+
if (logReaderTracker != null)
logReaderTracker.close();
}
- private ServiceTracker trackLogReaderService(BundleContext context)
+ static class LogReaderServiceServiceTracker extends ServiceTracker
{
- ServiceTracker logTracker = new ServiceTracker(context, LogReaderService.class.getName(), null)
+ public LogReaderServiceServiceTracker(BundleContext context)
{
- @Override
- public Object addingService(ServiceReference reference)
- {
- LogReaderService logReader = (LogReaderService)super.addingService(reference);
- logReader.addLogListener(new LogListenerBridge());
- return logReader;
- }
- };
- return logTracker;
+ super(context, LogReaderService.class.getName(), null);
+ }
+
+ @Override
+ public Object addingService(ServiceReference reference)
+ {
+ LogReaderService logReader = (LogReaderService)super.addingService(reference);
+ logReader.addLogListener(new LogListenerBridge());
+ return logReader;
+ }
}
}
\ No newline at end of file
16 years, 7 months
- 1
- 0
JBoss-OSGI SVN: r97291 - in projects/jboss-osgi/trunk: distribution/installer/src/main/resources/runtime/server/conf and 2 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-12-02 09:47:14 -0500 (Wed, 02 Dec 2009)
New Revision: 97291
Modified:
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-all.properties
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties
Log:
Equinox remote example testing
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-all.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-all.properties 2009-12-02 14:12:58 UTC (rev 97290)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-all.properties 2009-12-02 14:47:14 UTC (rev 97291)
@@ -35,6 +35,7 @@
org.jboss.net.protocol, \
org.jboss.osgi.deployment.deployer;version=1.0, \
org.jboss.osgi.deployment.interceptor;version=1.0, \
+ org.jboss.osgi.deployment.internal;version=1.0, \
org.jboss.osgi.spi;version=1.0, \
org.jboss.osgi.spi.capability;version=1.0, \
org.jboss.osgi.spi.framework;version=1.0, \
@@ -42,7 +43,7 @@
org.jboss.osgi.spi.service;version=1.0, \
org.jboss.osgi.spi.util;version=1.0, \
org.jboss.virtual;version=2.1, \
- org.jboss.virtual.plugins.registry;version=2.1, \
- org.jboss.virtual.plugins.context.jar;version=2.1, \
- org.jboss.virtual.plugins.vfs.helpers;version=2.1, \
- org.jboss.virtual.protocol;version=2.1
\ No newline at end of file
+ org.jboss.virtual.plugins.registry;version=2.1, \
+ org.jboss.virtual.plugins.context.jar;version=2.1, \
+ org.jboss.virtual.plugins.vfs.helpers;version=2.1, \
+ org.jboss.virtual.protocol;version=2.1
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-12-02 14:12:58 UTC (rev 97290)
+++ projects/jboss-osgi/trunk/pom.xml 2009-12-02 14:47:14 UTC (rev 97291)
@@ -51,7 +51,7 @@
<version.izpack>4.3.1</version.izpack>
<version.jboss.osgi.apache.xerces>2.9.1-SNAPSHOT</version.jboss.osgi.apache.xerces>
<version.jboss.osgi.blueprint>1.0.0.Alpha3</version.jboss.osgi.blueprint>
- <version.jboss.osgi.common>1.0.4-SNAPSHOT</version.jboss.osgi.common>
+ <version.jboss.osgi.common>1.0.3-SNAPSHOT</version.jboss.osgi.common>
<version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
<version.jboss.osgi.deployment>1.0.0-SNAPSHOT</version.jboss.osgi.deployment>
<version.jboss.osgi.framework>1.0.0.Alpha2-SNAPSHOT</version.jboss.osgi.framework>
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41TestCase.java 2009-12-02 14:12:58 UTC (rev 97290)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41TestCase.java 2009-12-02 14:47:14 UTC (rev 97291)
@@ -77,7 +77,8 @@
private File getBundleDataFile(OSGiBundle bundleA, String filename)
{
- String storageRoot = bundleA.getProperty("org.osgi.framework.storage");
+ OSGiBundle systemBundle = bundleA.getRuntime().getBundle(0);
+ String storageRoot = systemBundle.getProperty("org.osgi.framework.storage");
assertNotNull("Storage dir not null", storageRoot);
File dataFile;
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties 2009-12-02 14:12:58 UTC (rev 97290)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties 2009-12-02 14:47:14 UTC (rev 97291)
@@ -25,7 +25,7 @@
org.jboss.osgi.spi.management;version=1.0, \
org.jboss.osgi.spi.service;version=1.0, \
org.jboss.osgi.spi.util;version=1.0, \
- org.jboss.virtual;version=2.1, \
+ org.jboss.virtual;version=2.1, \
org.jboss.virtual.plugins.registry;version=2.1, \
org.jboss.virtual.plugins.context.jar;version=2.1, \
org.jboss.virtual.plugins.vfs.helpers;version=2.1, \
16 years, 7 months
- 1
- 0
JBoss-OSGI SVN: r97290 - in projects/jboss-osgi/trunk/reactor/framework/src: test/java/org/jboss/test/osgi and 6 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: alesj
Date: 2009-12-02 09:12:58 -0500 (Wed, 02 Dec 2009)
New Revision: 97290
Added:
projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/DeployersTest.java
projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/DeployersTestDelegate.java
projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/ServiceMixUnitTestCase.java
projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/support/c/
projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/support/c/C.java
projects/jboss-osgi/trunk/reactor/framework/src/test/resources/bundles/service/service-bundle3/
projects/jboss-osgi/trunk/reactor/framework/src/test/resources/bundles/service/service-bundle3/META-INF/
projects/jboss-osgi/trunk/reactor/framework/src/test/resources/bundles/service/service-bundle3/META-INF/MANIFEST.MF
Modified:
projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java
projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/FrameworkTest.java
projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/FrameworkTestDelegate.java
Log:
Add initial service-mix tests.
Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java 2009-12-02 13:20:12 UTC (rev 97289)
+++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java 2009-12-02 14:12:58 UTC (rev 97290)
@@ -367,8 +367,13 @@
if (unit != null)
{
OSGiBundleState bundleState = unit.getAttachment(OSGiBundleState.class);
- if (bundleState != null)
- return bundleState;
+ if (bundleState == null)
+ {
+ bundleState = addDeployment(unit);
+ bundleState.changeState(Bundle.ACTIVE);
+ unit.addAttachment(OSGiBundleState.class, bundleState);
+ }
+ return bundleState;
}
return systemBundle;
Copied: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/DeployersTest.java (from rev 97282, projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/FrameworkTest.java)
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/DeployersTest.java (rev 0)
+++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/DeployersTest.java 2009-12-02 14:12:58 UTC (rev 97290)
@@ -0,0 +1,94 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.osgi;
+
+import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
+import org.jboss.deployers.client.spi.Deployment;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.virtual.AssembledDirectory;
+import org.jboss.virtual.VirtualFile;
+import org.jboss.osgi.framework.bundle.OSGiBundleState;
+import org.osgi.framework.Bundle;
+
+/**
+ * Deployers test - generic deployment test.
+ *
+ * @author <a href="ales.justin(a)jboss.org">Ales Justin</a>
+ */
+public abstract class DeployersTest extends FrameworkTest
+{
+ protected DeployersTest(String name)
+ {
+ super(name);
+ }
+
+ public static DeployersTestDelegate getDelegate(Class<?> clazz) throws Exception
+ {
+ return new DeployersTestDelegate(clazz);
+ }
+
+ protected DeployersTestDelegate getDelegate()
+ {
+ return (DeployersTestDelegate)super.getDelegate();
+ }
+
+ protected Deployment assertDeploy(VirtualFile file) throws Exception
+ {
+ return getDelegate().assertDeploy(file);
+ }
+
+ protected <T> Deployment assertDeploy(VirtualFile file, T metadata, Class<T> expectedType) throws Exception
+ {
+ return getDelegate().assertDeploy(file, metadata, expectedType);
+ }
+
+ protected DeploymentUnit getDeploymentUnit(Deployment deployment) throws Exception
+ {
+ return getDelegate().getDeploymentUnit(deployment);
+ }
+
+ protected void undeploy(Deployment deployment) throws Exception
+ {
+ getDelegate().undeploy(deployment);
+ }
+
+ protected Deployment assertBean(String name, Class<?> beanClass) throws Exception
+ {
+ AssembledDirectory dir = createAssembledDirectory(name, "");
+ addPackage(dir, beanClass);
+ BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(beanClass.getSimpleName(), beanClass.getName());
+ return assertDeploy(dir, builder.getBeanMetaData(), BeanMetaData.class);
+ }
+
+ protected Bundle getBundle(Deployment deployment) throws Exception
+ {
+ return getBundle(getDeploymentUnit(deployment));
+ }
+
+ protected Bundle getBundle(DeploymentUnit unit) throws Exception
+ {
+ OSGiBundleState bundle = unit.getAttachment(OSGiBundleState.class);
+ assertNotNull(bundle);
+ return bundle;
+ }
+}
\ No newline at end of file
Added: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/DeployersTestDelegate.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/DeployersTestDelegate.java (rev 0)
+++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/DeployersTestDelegate.java 2009-12-02 14:12:58 UTC (rev 97290)
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.osgi;
+
+import org.jboss.deployers.client.spi.Deployment;
+import org.jboss.deployers.client.spi.DeployerClient;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.structure.spi.main.MainDeployerStructure;
+import org.jboss.virtual.VirtualFile;
+
+/**
+ * Deployers test - generic deployment test delegate.
+ *
+ * @author <a href="ales.justin(a)jboss.org">Ales Justin</a>
+ */
+public class DeployersTestDelegate extends FrameworkTestDelegate
+{
+ public DeployersTestDelegate(Class<?> clazz) throws Exception
+ {
+ super(clazz);
+ }
+
+ public Deployment assertDeploy(VirtualFile file) throws Exception
+ {
+ return assertDeploy(file, null, null);
+ }
+
+ public <T> Deployment assertDeploy(VirtualFile file, T metadata, Class<T> expectedType) throws Exception
+ {
+ Deployment deployment = createDeployment(file, metadata, expectedType);
+ DeployerClient deployerClient = getDeployerClient();
+ deployerClient.deploy(deployment);
+ return deployment;
+ }
+
+ public DeploymentUnit getDeploymentUnit(Deployment deployment) throws Exception
+ {
+ DeployerClient deployerClient = getDeployerClient();
+ MainDeployerStructure deployerStructure = (MainDeployerStructure) deployerClient;
+ return deployerStructure.getDeploymentUnit(deployment.getName());
+ }
+
+ public void undeploy(Deployment deployment) throws Exception
+ {
+ DeployerClient deployerClient = getDeployerClient();
+ deployerClient.undeploy(deployment);
+ }
+}
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/FrameworkTest.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/FrameworkTest.java 2009-12-02 13:20:12 UTC (rev 97289)
+++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/FrameworkTest.java 2009-12-02 14:12:58 UTC (rev 97290)
@@ -426,6 +426,13 @@
assertEquals(expected, actual);
}
+ protected void assertBundle(Bundle b1, Bundle b2)
+ {
+ assertNotNull(b1);
+ assertNotNull(b2);
+ assertEquals(b1.getBundleId(), b2.getBundleId());
+ }
+
protected void assertObjectClass(String expected, ServiceReference reference)
{
assertObjectClass(new String[] { expected }, reference);
Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/FrameworkTestDelegate.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/FrameworkTestDelegate.java 2009-12-02 13:20:12 UTC (rev 97289)
+++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/FrameworkTestDelegate.java 2009-12-02 14:12:58 UTC (rev 97290)
@@ -65,6 +65,8 @@
/**
* Create a new OSGiTestDelegate.
+ * @param clazz test class
+ * @throws Exception for any error
*/
FrameworkTestDelegate(Class<?> clazz) throws Exception
{
@@ -107,7 +109,7 @@
{
try
{
- Method method = clazz.getMethod("deployBundles", new Class[] { FrameworkTestDelegate.class });
+ Method method = clazz.getMethod("deployBundles", FrameworkTestDelegate.class);
log.debug("Deploying Bundles...");
method.invoke(null, this);
}
@@ -295,12 +297,28 @@
}
}
+ public Deployment createDeployment(VirtualFile virtualFile) throws Exception
+ {
+ return createDeployment(virtualFile, null);
+ }
+
public Deployment createDeployment(VirtualFile virtualFile, OSGiMetaData metaData) throws Exception
{
+ return createDeployment(virtualFile, metaData, OSGiMetaData.class);
+ }
+
+ @SuppressWarnings({"unchecked"})
+ public <T> Deployment createDeployment(VirtualFile virtualFile, T metaData, Class<T> expectedType) throws Exception
+ {
VFSDeployment deployment = VFSDeploymentFactory.getInstance().createVFSDeployment(virtualFile);
- MutableAttachments att = (MutableAttachments)deployment.getPredeterminedManagedObjects();
if (metaData != null)
- att.addAttachment(OSGiMetaData.class, metaData);
+ {
+ if (expectedType == null)
+ expectedType = (Class<T>)metaData.getClass();
+
+ MutableAttachments att = (MutableAttachments)deployment.getPredeterminedManagedObjects();
+ att.addAttachment(expectedType, metaData);
+ }
return deployment;
}
Added: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/ServiceMixUnitTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/ServiceMixUnitTestCase.java (rev 0)
+++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/ServiceMixUnitTestCase.java 2009-12-02 14:12:58 UTC (rev 97290)
@@ -0,0 +1,94 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.osgi.service;
+
+import junit.framework.Test;
+
+import org.jboss.deployers.client.spi.Deployment;
+import org.jboss.test.osgi.DeployersTest;
+import org.jboss.test.osgi.service.support.a.A;
+import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.dependency.spi.ControllerState;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+
+/**
+ * Test MC's service mixture.
+ *
+ * @author <a href="mailto:ales.justin@jboss.org">Ales Justin</a>
+ */
+public class ServiceMixUnitTestCase extends DeployersTest
+{
+ public ServiceMixUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite()
+ {
+ return suite(ServiceMixUnitTestCase.class);
+ }
+
+ public void testGetServiceReferenceFromMC() throws Throwable
+ {
+ Deployment bean = assertBean("beanA", A.class);
+ try
+ {
+ Bundle bundle1 = assembleBundle("simple1", "/bundles/service/service-bundle1", A.class);
+ try
+ {
+ bundle1.start();
+ BundleContext bundleContext1 = bundle1.getBundleContext();
+ assertNotNull(bundleContext1);
+
+ ServiceReference ref1 = bundleContext1.getServiceReference(A.class.getName());
+ assertNotNull(ref1);
+ try
+ {
+ Bundle refsBundle = ref1.getBundle();
+ assertBundle(refsBundle, getBundle(bean));
+
+ assertNotNull(bundleContext1.getService(ref1));
+ assertUsingBundles(ref1, bundle1);
+ }
+ finally
+ {
+ bundleContext1.ungetService(ref1);
+ }
+
+ KernelControllerContext beanKCC = getControllerContext("A");
+ change(beanKCC, ControllerState.DESCRIBED);
+
+ assertNull(bundleContext1.getServiceReference(A.class.getName()));
+ }
+ finally
+ {
+ uninstall(bundle1);
+ }
+ }
+ finally
+ {
+ undeploy(bean);
+ }
+ }
+}
Added: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/support/c/C.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/support/c/C.java (rev 0)
+++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/support/c/C.java 2009-12-02 14:12:58 UTC (rev 97290)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.osgi.service.support.c;
+
+import org.jboss.test.osgi.service.support.a.A;
+
+/**
+ * @author <a href="mailto:ales.justin@jboss.org">Ales Justin</a>
+ */
+public class C
+{
+ private A a;
+
+ public C()
+ {
+ }
+
+ public C(A a)
+ {
+ this.a = a;
+ }
+
+ public A getA()
+ {
+ return a;
+ }
+
+ public void setA(A a)
+ {
+ this.a = a;
+ }
+}
Copied: projects/jboss-osgi/trunk/reactor/framework/src/test/resources/bundles/service/service-bundle3/META-INF/MANIFEST.MF (from rev 97282, projects/jboss-osgi/trunk/reactor/framework/src/test/resources/bundles/service/service-bundle1/META-INF/MANIFEST.MF)
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/test/resources/bundles/service/service-bundle3/META-INF/MANIFEST.MF (rev 0)
+++ projects/jboss-osgi/trunk/reactor/framework/src/test/resources/bundles/service/service-bundle3/META-INF/MANIFEST.MF 2009-12-02 14:12:58 UTC (rev 97290)
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Implementation-Title: JBoss OSGi tests
+Implementation-Version: test
+Implementation-Vendor: jboss.org
+Bundle-Name: Service3
+Bundle-SymbolicName: org.jboss.test.osgi.service3
+Import-Package: org.jboss.test.osgi.service.support.a;org.jboss.test.osgi.service.support.c
16 years, 7 months
- 1
- 0
JBoss-OSGI SVN: r97289 - in projects/jboss-osgi/trunk: distribution/installer/src/main/resources/installer and 3 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-12-02 08:20:12 -0500 (Wed, 02 Dec 2009)
New Revision: 97289
Added:
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-all.properties
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-default.properties
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-minimal.properties
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-web.properties
Removed:
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-all.properties
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-default.properties
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-minimal.properties
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-web.properties
Modified:
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties
projects/jboss-osgi/trunk/pom.xml
Log:
Equinox remote example testing - WIP
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-12-02 13:17:04 UTC (rev 97288)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-12-02 13:20:12 UTC (rev 97289)
@@ -248,13 +248,13 @@
<singlefile condition="isFelix" src="@{runtime.dir}/conf/jboss-osgi-felix.properties" target="$INSTALL_PATH/runtime/conf/jboss-osgi-framework.properties"
override="true" />
- <singlefile condition="isFelix" src="@{runtime.dir}/server/conf/jboss-osgi-felix-minimal.properties" target="$INSTALL_PATH/runtime/server/minimal/conf/jboss-osgi-extra.properties"
+ <singlefile condition="isFelix" src="@{runtime.dir}/server/conf/jboss-osgi-extra-minimal.properties" target="$INSTALL_PATH/runtime/server/minimal/conf/jboss-osgi-extra.properties"
override="true" />
- <singlefile condition="isFelix" src="@{runtime.dir}/server/conf/jboss-osgi-felix-default.properties" target="$INSTALL_PATH/runtime/server/default/conf/jboss-osgi-extra.properties"
+ <singlefile condition="isFelix" src="@{runtime.dir}/server/conf/jboss-osgi-extra-default.properties" target="$INSTALL_PATH/runtime/server/default/conf/jboss-osgi-extra.properties"
override="true" />
- <singlefile condition="isFelix" src="@{runtime.dir}/server/conf/jboss-osgi-felix-web.properties" target="$INSTALL_PATH/runtime/server/web/conf/jboss-osgi-extra.properties"
+ <singlefile condition="isFelix" src="@{runtime.dir}/server/conf/jboss-osgi-extra-web.properties" target="$INSTALL_PATH/runtime/server/web/conf/jboss-osgi-extra.properties"
override="true" />
- <singlefile condition="isFelix" src="@{runtime.dir}/server/conf/jboss-osgi-felix-all.properties" target="$INSTALL_PATH/runtime/server/all/conf/jboss-osgi-extra.properties"
+ <singlefile condition="isFelix" src="@{runtime.dir}/server/conf/jboss-osgi-extra-all.properties" target="$INSTALL_PATH/runtime/server/all/conf/jboss-osgi-extra.properties"
override="true" />
<fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/lib" override="true">
<include name="jboss-osgi-runtime-felix.jar" />
@@ -273,12 +273,21 @@
<singlefile condition="isEquinox" src="@{runtime.dir}/conf/jboss-osgi-equinox.properties" target="$INSTALL_PATH/runtime/conf/jboss-osgi-framework.properties"
override="true" />
+ <singlefile condition="isEquinox" src="@{runtime.dir}/server/conf/jboss-osgi-extra-minimal.properties" target="$INSTALL_PATH/runtime/server/minimal/conf/jboss-osgi-extra.properties"
+ override="true" />
+ <singlefile condition="isEquinox" src="@{runtime.dir}/server/conf/jboss-osgi-extra-default.properties" target="$INSTALL_PATH/runtime/server/default/conf/jboss-osgi-extra.properties"
+ override="true" />
+ <singlefile condition="isEquinox" src="@{runtime.dir}/server/conf/jboss-osgi-extra-web.properties" target="$INSTALL_PATH/runtime/server/web/conf/jboss-osgi-extra.properties"
+ override="true" />
+ <singlefile condition="isEquinox" src="@{runtime.dir}/server/conf/jboss-osgi-extra-all.properties" target="$INSTALL_PATH/runtime/server/all/conf/jboss-osgi-extra.properties"
+ override="true" />
<fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/lib" override="true">
<include name="jboss-osgi-runtime-equinox.jar" />
<include name="org.eclipse.osgi.jar" />
</fileset>
<fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/minimal/deploy" override="true">
<include name="org.eclipse.osgi.services.jar" />
+ <include name="org.eclipse.osgi.util.jar" />
</fileset>
<fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/all/deploy" override="true">
<include name="org.apache.felix.configadmin.jar" />
@@ -428,6 +437,7 @@
<include name="org.apache.felix.configadmin.jar" />
<include name="org.apache.felix.metatype.jar" />
<include name="org.eclipse.osgi.services.jar" />
+ <include name="org.eclipse.osgi.util.jar" />
</fileset>
<fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/resources/jbossas" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
<include name="microcontainer-service-jboss-beans.xml" />
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2009-12-02 13:17:04 UTC (rev 97288)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2009-12-02 13:20:12 UTC (rev 97289)
@@ -26,11 +26,14 @@
<entry>
<key>org.osgi.framework.system.packages.extra</key>
<value>
-
<!-- log4j -->
org.apache.log4j;version=1.2,
<!-- jboss-osgi -->
+ org.jboss.osgi.deployment.common;version=1.0,
+ org.jboss.osgi.deployment.deployer;version=1.0,
+ org.jboss.osgi.deployment.interceptor;version=1.0,
+ org.jboss.osgi.microcontainer;version=1.0,
org.jboss.osgi.spi;version=1.0,
org.jboss.osgi.spi.capability;version=1.0,
org.jboss.osgi.spi.management;version=1.0,
@@ -47,14 +50,11 @@
org.jboss.logging,
org.jboss.reflect.spi;version=2.0,
org.jboss.util.xml;version=2.2,
- org.jboss.virtual;version=2.1,
- org.jboss.virtual.plugins.registry;version=2.1,
- org.jboss.virtual.plugins.context.jar;version=2.1,
- org.jboss.virtual.plugins.vfs.helpers;version=2.1,
- org.jboss.virtual.protocol;version=2.1,
- org.jboss.xb.annotations;version=2.0,
- org.jboss.xb.binding;version=2.0,
- org.jboss.xb.binding.sunday.unmarshalling;version=2.0,
+ org.jboss.virtual;version=2.1,
+ org.jboss.virtual.plugins.registry;version=2.1,
+ org.jboss.virtual.plugins.context.jar;version=2.1,
+ org.jboss.virtual.plugins.vfs.helpers;version=2.1,
+ org.jboss.virtual.protocol;version=2.1
</value>
</entry>
<!--
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties 2009-12-02 13:17:04 UTC (rev 97288)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties 2009-12-02 13:20:12 UTC (rev 97289)
@@ -4,6 +4,9 @@
# $Id$
#
+# Extra server specific properties
+org.jboss.osgi.spi.framework.extra=${osgi.server.home}/conf/jboss-osgi-extra.properties
+
# Properties to configure the Framework
org.osgi.framework.storage=${osgi.server.home}/data/osgi-store
org.osgi.framework.storage.clean=onFirstInit
@@ -11,88 +14,13 @@
# Hot Deployement
org.jboss.osgi.hotdeploy.scandir=${osgi.server.home}/deploy
-# HTTP Service Port
-org.osgi.service.http.port=8090
-
-# Config Admin Service
-felix.cm.dir=${osgi.server.home}/data/osgi-configadmin
-
-# JMX bundle properties
-org.jboss.osgi.jmx.host=${jboss.bind.address}
-org.jboss.osgi.jmx.rmi.port=1098
-
-# JNDI bundle properties
-org.jboss.osgi.jndi.host=${jboss.bind.address}
-org.jboss.osgi.jndi.rmi.port=1098
-org.jboss.osgi.jndi.port=1099
-
-# Remote Logging
-org.jboss.osgi.service.remote.log.sender=true
-org.jboss.osgi.service.remote.log.host=${jboss.bind.address}
-org.jboss.osgi.service.remote.log.port=5400
-
-# Husky socket connector properties
-org.jboss.osgi.husky.runtime.connector.host=${jboss.bind.address}
-org.jboss.osgi.husky.runtime.connector.port=5401
-
-# System Packages
-org.osgi.framework.system.packages=\
- com.wutka.dtd, \
- javassist;version=3.9, \
- javassist.bytecode;version=3.9, \
- javassist.bytecode.annotation;version=3.9, \
- javax.imageio, \
- javax.imageio.stream, \
- javax.management, \
- javax.management.remote, \
- javax.naming, \
- javax.naming.event, \
- javax.naming.spi, \
- javax.net, \
- javax.net.ssl, \
- javax.xml.datatype, \
- javax.xml.namespace, \
- javax.xml.parsers, \
- javax.xml.validation, \
- javax.xml.transform, \
- javax.xml.transform.dom, \
- javax.xml.transform.sax, \
- javax.xml.transform.stream, \
- org.apache.log4j;version=1.2, \
- org.jboss.logging, \
- org.jboss.net.protocol, \
- org.jboss.osgi.deployment.common, \
- org.jboss.osgi.deployment.deployer, \
- org.jboss.osgi.deployment.interceptor,\
- org.jboss.osgi.spi;version=1.0, \
- org.jboss.osgi.spi.capability;version=1.0, \
- org.jboss.osgi.spi.management;version=1.0, \
- org.jboss.osgi.spi.service;version=1.0, \
- org.jboss.osgi.spi.util;version=1.0, \
- org.jboss.virtual, \
- org.jboss.virtual.plugins.registry, \
- org.jboss.virtual.plugins.context.jar, \
- org.jboss.virtual.plugins.vfs.helpers, \
- org.jboss.virtual.protocol, \
- org.osgi.service.prefs, \
- org.osgi.util.xml;version=1.0, \
- org.w3c.dom, \
- org.w3c.dom.bootstrap, \
- org.w3c.dom.events, \
- org.w3c.dom.ls, \
- org.w3c.dom.ranges, \
- org.w3c.dom.views, \
- org.w3c.dom.traversal, \
- org.xml.sax, \
- org.xml.sax.ext, \
- org.xml.sax.helpers
-
# Bundles that need to be installed with the Framework automatically
org.jboss.osgi.spi.framework.autoInstall=\
- file://${osgi.home}/server/minimal/deploy/org.eclipse.osgi.services.jar
+ file://${osgi.home}/server/minimal/deploy/org.eclipse.osgi.services.jar \
+ file://${osgi.home}/server/minimal/deploy/org.eclipse.osgi.util.jar
# Bundles that need to be started automatically
org.jboss.osgi.spi.framework.autoStart=\
file://${osgi.home}/server/minimal/deploy/org.apache.felix.log.jar \
file://${osgi.home}/server/minimal/deploy/jboss-osgi-common.jar \
- file://${osgi.home}/server/minimal/deploy/jboss-osgi-hotdeploy.jar
\ No newline at end of file
+ file://${osgi.home}/server/minimal/deploy/jboss-osgi-hotdeploy.jar
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties 2009-12-02 13:17:04 UTC (rev 97288)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties 2009-12-02 13:20:12 UTC (rev 97289)
@@ -22,6 +22,4 @@
org.jboss.osgi.spi.framework.autoStart=\
file://${osgi.home}/server/minimal/deploy/org.apache.felix.log.jar \
file://${osgi.home}/server/minimal/deploy/jboss-osgi-common.jar \
- file://${osgi.home}/server/minimal/deploy/jboss-osgi-hotdeploy.jar
-
-
\ No newline at end of file
+ file://${osgi.home}/server/minimal/deploy/jboss-osgi-hotdeploy.jar
\ No newline at end of file
Copied: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-all.properties (from rev 97281, projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-all.properties)
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-all.properties (rev 0)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-all.properties 2009-12-02 13:20:12 UTC (rev 97289)
@@ -0,0 +1,48 @@
+#######################################################################################
+#
+# Extra properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
+#
+# $Id: $
+#
+#######################################################################################
+
+# HTTP Service Port
+org.osgi.service.http.port=8090
+
+# Config Admin Service
+felix.cm.dir=${osgi.server.home}/data/osgi-configadmin
+
+# JMX bundle properties
+org.jboss.osgi.jmx.host=${jboss.bind.address}
+org.jboss.osgi.jmx.rmi.port=1098
+
+# JNDI bundle properties
+org.jboss.osgi.jndi.host=${jboss.bind.address}
+org.jboss.osgi.jndi.rmi.port=1098
+org.jboss.osgi.jndi.port=1099
+
+# Husky socket connector properties
+org.jboss.osgi.husky.runtime.connector.host=${jboss.bind.address}
+org.jboss.osgi.husky.runtime.connector.port=5401
+
+# JTA ObjectStore
+com.arjuna.ats.arjuna.objectstore.objectStoreDir=${osgi.server.home}/data/ObjectStore
+
+# Extra System Packages
+org.osgi.framework.system.packages.extra=\
+ org.apache.log4j;version=1.2, \
+ org.jboss.logging, \
+ org.jboss.net.protocol, \
+ org.jboss.osgi.deployment.deployer;version=1.0, \
+ org.jboss.osgi.deployment.interceptor;version=1.0, \
+ org.jboss.osgi.spi;version=1.0, \
+ org.jboss.osgi.spi.capability;version=1.0, \
+ org.jboss.osgi.spi.framework;version=1.0, \
+ org.jboss.osgi.spi.management;version=1.0, \
+ org.jboss.osgi.spi.service;version=1.0, \
+ org.jboss.osgi.spi.util;version=1.0, \
+ org.jboss.virtual;version=2.1, \
+ org.jboss.virtual.plugins.registry;version=2.1, \
+ org.jboss.virtual.plugins.context.jar;version=2.1, \
+ org.jboss.virtual.plugins.vfs.helpers;version=2.1, \
+ org.jboss.virtual.protocol;version=2.1
\ No newline at end of file
Copied: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-default.properties (from rev 97281, projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-default.properties)
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-default.properties (rev 0)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-default.properties 2009-12-02 13:20:12 UTC (rev 97289)
@@ -0,0 +1,41 @@
+#######################################################################################
+#
+# Extra properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
+#
+# $Id: $
+#
+#######################################################################################
+
+# JMX bundle properties
+org.jboss.osgi.jmx.host=${jboss.bind.address}
+org.jboss.osgi.jmx.rmi.port=1098
+
+# JNDI bundle properties
+org.jboss.osgi.jndi.host=${jboss.bind.address}
+org.jboss.osgi.jndi.rmi.port=1098
+org.jboss.osgi.jndi.port=1099
+
+# Husky socket connector properties
+org.jboss.osgi.husky.runtime.connector.host=${jboss.bind.address}
+org.jboss.osgi.husky.runtime.connector.port=5401
+
+# Extra System Packages
+org.osgi.framework.system.packages.extra=\
+ org.apache.log4j;version=1.2, \
+ org.jboss.logging, \
+ org.jboss.net.protocol, \
+ org.jboss.osgi.deployment.deployer;version=1.0, \
+ org.jboss.osgi.deployment.interceptor;version=1.0, \
+ org.jboss.osgi.spi;version=1.0, \
+ org.jboss.osgi.spi.capability;version=1.0, \
+ org.jboss.osgi.spi.framework;version=1.0, \
+ org.jboss.osgi.spi.management;version=1.0, \
+ org.jboss.osgi.spi.service;version=1.0, \
+ org.jboss.osgi.spi.util;version=1.0, \
+ org.jboss.virtual;version=2.1, \
+ org.jboss.virtual.plugins.registry;version=2.1, \
+ org.jboss.virtual.plugins.context.jar;version=2.1, \
+ org.jboss.virtual.plugins.vfs.helpers;version=2.1, \
+ org.jboss.virtual.protocol;version=2.1
+
+
\ No newline at end of file
Copied: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-minimal.properties (from rev 97281, projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-minimal.properties)
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-minimal.properties (rev 0)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-minimal.properties 2009-12-02 13:20:12 UTC (rev 97289)
@@ -0,0 +1,21 @@
+#######################################################################################
+#
+# Extra properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
+#
+# $Id: $
+#
+#######################################################################################
+
+# Extra System Packages
+org.osgi.framework.system.packages.extra=\
+ org.apache.log4j;version=1.2, \
+ org.jboss.logging, \
+ org.jboss.osgi.deployment.deployer;version=1.0, \
+ org.jboss.osgi.deployment.interceptor;version=1.0, \
+ org.jboss.osgi.spi;version=1.0, \
+ org.jboss.osgi.spi.capability;version=1.0, \
+ org.jboss.osgi.spi.framework;version=1.0, \
+ org.jboss.osgi.spi.management;version=1.0, \
+ org.jboss.osgi.spi.service;version=1.0, \
+ org.jboss.osgi.spi.util;version=1.0
+
\ No newline at end of file
Copied: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-web.properties (from rev 97281, projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-web.properties)
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-web.properties (rev 0)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-web.properties 2009-12-02 13:20:12 UTC (rev 97289)
@@ -0,0 +1,45 @@
+#######################################################################################
+#
+# Extra properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
+#
+# $Id: $
+#
+#######################################################################################
+
+# HTTP Service Port
+org.osgi.service.http.port=8090
+
+# Config Admin Service
+felix.cm.dir=${osgi.server.home}/data/osgi-configadmin
+
+# JMX bundle properties
+org.jboss.osgi.jmx.host=${jboss.bind.address}
+org.jboss.osgi.jmx.rmi.port=1098
+
+# JNDI bundle properties
+org.jboss.osgi.jndi.host=${jboss.bind.address}
+org.jboss.osgi.jndi.rmi.port=1098
+org.jboss.osgi.jndi.port=1099
+
+# Husky socket connector properties
+org.jboss.osgi.husky.runtime.connector.host=${jboss.bind.address}
+org.jboss.osgi.husky.runtime.connector.port=5401
+
+# Extra System Packages
+org.osgi.framework.system.packages.extra=\
+ org.apache.log4j;version=1.2, \
+ org.jboss.logging, \
+ org.jboss.net.protocol, \
+ org.jboss.osgi.deployment.deployer;version=1.0, \
+ org.jboss.osgi.deployment.interceptor;version=1.0, \
+ org.jboss.osgi.spi;version=1.0, \
+ org.jboss.osgi.spi.capability;version=1.0, \
+ org.jboss.osgi.spi.framework;version=1.0, \
+ org.jboss.osgi.spi.management;version=1.0, \
+ org.jboss.osgi.spi.service;version=1.0, \
+ org.jboss.osgi.spi.util;version=1.0, \
+ org.jboss.virtual;version=2.1, \
+ org.jboss.virtual.plugins.registry;version=2.1, \
+ org.jboss.virtual.plugins.context.jar;version=2.1, \
+ org.jboss.virtual.plugins.vfs.helpers;version=2.1, \
+ org.jboss.virtual.protocol;version=2.1
Deleted: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-all.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-all.properties 2009-12-02 13:17:04 UTC (rev 97288)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-all.properties 2009-12-02 13:20:12 UTC (rev 97289)
@@ -1,48 +0,0 @@
-#######################################################################################
-#
-# Extra properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
-#
-# $Id: $
-#
-#######################################################################################
-
-# HTTP Service Port
-org.osgi.service.http.port=8090
-
-# Config Admin Service
-felix.cm.dir=${osgi.server.home}/data/osgi-configadmin
-
-# JMX bundle properties
-org.jboss.osgi.jmx.host=${jboss.bind.address}
-org.jboss.osgi.jmx.rmi.port=1098
-
-# JNDI bundle properties
-org.jboss.osgi.jndi.host=${jboss.bind.address}
-org.jboss.osgi.jndi.rmi.port=1098
-org.jboss.osgi.jndi.port=1099
-
-# Husky socket connector properties
-org.jboss.osgi.husky.runtime.connector.host=${jboss.bind.address}
-org.jboss.osgi.husky.runtime.connector.port=5401
-
-# JTA ObjectStore
-com.arjuna.ats.arjuna.objectstore.objectStoreDir=${osgi.server.home}/data/ObjectStore
-
-# Extra System Packages
-org.osgi.framework.system.packages.extra=\
- org.apache.log4j;version=1.2, \
- org.jboss.logging, \
- org.jboss.net.protocol, \
- org.jboss.osgi.deployment.deployer;version=1.0, \
- org.jboss.osgi.deployment.interceptor;version=1.0, \
- org.jboss.osgi.spi;version=1.0, \
- org.jboss.osgi.spi.capability;version=1.0, \
- org.jboss.osgi.spi.framework;version=1.0, \
- org.jboss.osgi.spi.management;version=1.0, \
- org.jboss.osgi.spi.service;version=1.0, \
- org.jboss.osgi.spi.util;version=1.0, \
- org.jboss.virtual;version=2.1, \
- org.jboss.virtual.plugins.registry;version=2.1, \
- org.jboss.virtual.plugins.context.jar;version=2.1, \
- org.jboss.virtual.plugins.vfs.helpers;version=2.1, \
- org.jboss.virtual.protocol;version=2.1
\ No newline at end of file
Deleted: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-default.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-default.properties 2009-12-02 13:17:04 UTC (rev 97288)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-default.properties 2009-12-02 13:20:12 UTC (rev 97289)
@@ -1,41 +0,0 @@
-#######################################################################################
-#
-# Extra properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
-#
-# $Id: $
-#
-#######################################################################################
-
-# JMX bundle properties
-org.jboss.osgi.jmx.host=${jboss.bind.address}
-org.jboss.osgi.jmx.rmi.port=1098
-
-# JNDI bundle properties
-org.jboss.osgi.jndi.host=${jboss.bind.address}
-org.jboss.osgi.jndi.rmi.port=1098
-org.jboss.osgi.jndi.port=1099
-
-# Husky socket connector properties
-org.jboss.osgi.husky.runtime.connector.host=${jboss.bind.address}
-org.jboss.osgi.husky.runtime.connector.port=5401
-
-# Extra System Packages
-org.osgi.framework.system.packages.extra=\
- org.apache.log4j;version=1.2, \
- org.jboss.logging, \
- org.jboss.net.protocol, \
- org.jboss.osgi.deployment.deployer;version=1.0, \
- org.jboss.osgi.deployment.interceptor;version=1.0, \
- org.jboss.osgi.spi;version=1.0, \
- org.jboss.osgi.spi.capability;version=1.0, \
- org.jboss.osgi.spi.framework;version=1.0, \
- org.jboss.osgi.spi.management;version=1.0, \
- org.jboss.osgi.spi.service;version=1.0, \
- org.jboss.osgi.spi.util;version=1.0, \
- org.jboss.virtual;version=2.1, \
- org.jboss.virtual.plugins.registry;version=2.1, \
- org.jboss.virtual.plugins.context.jar;version=2.1, \
- org.jboss.virtual.plugins.vfs.helpers;version=2.1, \
- org.jboss.virtual.protocol;version=2.1
-
-
\ No newline at end of file
Deleted: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-minimal.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-minimal.properties 2009-12-02 13:17:04 UTC (rev 97288)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-minimal.properties 2009-12-02 13:20:12 UTC (rev 97289)
@@ -1,21 +0,0 @@
-#######################################################################################
-#
-# Extra properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
-#
-# $Id: $
-#
-#######################################################################################
-
-# Extra System Packages
-org.osgi.framework.system.packages.extra=\
- org.apache.log4j;version=1.2, \
- org.jboss.logging, \
- org.jboss.osgi.deployment.deployer;version=1.0, \
- org.jboss.osgi.deployment.interceptor;version=1.0, \
- org.jboss.osgi.spi;version=1.0, \
- org.jboss.osgi.spi.capability;version=1.0, \
- org.jboss.osgi.spi.framework;version=1.0, \
- org.jboss.osgi.spi.management;version=1.0, \
- org.jboss.osgi.spi.service;version=1.0, \
- org.jboss.osgi.spi.util;version=1.0
-
\ No newline at end of file
Deleted: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-web.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-web.properties 2009-12-02 13:17:04 UTC (rev 97288)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-web.properties 2009-12-02 13:20:12 UTC (rev 97289)
@@ -1,45 +0,0 @@
-#######################################################################################
-#
-# Extra properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
-#
-# $Id: $
-#
-#######################################################################################
-
-# HTTP Service Port
-org.osgi.service.http.port=8090
-
-# Config Admin Service
-felix.cm.dir=${osgi.server.home}/data/osgi-configadmin
-
-# JMX bundle properties
-org.jboss.osgi.jmx.host=${jboss.bind.address}
-org.jboss.osgi.jmx.rmi.port=1098
-
-# JNDI bundle properties
-org.jboss.osgi.jndi.host=${jboss.bind.address}
-org.jboss.osgi.jndi.rmi.port=1098
-org.jboss.osgi.jndi.port=1099
-
-# Husky socket connector properties
-org.jboss.osgi.husky.runtime.connector.host=${jboss.bind.address}
-org.jboss.osgi.husky.runtime.connector.port=5401
-
-# Extra System Packages
-org.osgi.framework.system.packages.extra=\
- org.apache.log4j;version=1.2, \
- org.jboss.logging, \
- org.jboss.net.protocol, \
- org.jboss.osgi.deployment.deployer;version=1.0, \
- org.jboss.osgi.deployment.interceptor;version=1.0, \
- org.jboss.osgi.spi;version=1.0, \
- org.jboss.osgi.spi.capability;version=1.0, \
- org.jboss.osgi.spi.framework;version=1.0, \
- org.jboss.osgi.spi.management;version=1.0, \
- org.jboss.osgi.spi.service;version=1.0, \
- org.jboss.osgi.spi.util;version=1.0, \
- org.jboss.virtual;version=2.1, \
- org.jboss.virtual.plugins.registry;version=2.1, \
- org.jboss.virtual.plugins.context.jar;version=2.1, \
- org.jboss.virtual.plugins.vfs.helpers;version=2.1, \
- org.jboss.virtual.protocol;version=2.1
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-12-02 13:17:04 UTC (rev 97288)
+++ projects/jboss-osgi/trunk/pom.xml 2009-12-02 13:20:12 UTC (rev 97289)
@@ -55,7 +55,7 @@
<version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
<version.jboss.osgi.deployment>1.0.0-SNAPSHOT</version.jboss.osgi.deployment>
<version.jboss.osgi.framework>1.0.0.Alpha2-SNAPSHOT</version.jboss.osgi.framework>
- <version.jboss.osgi.hotdeploy>1.0.3</version.jboss.osgi.hotdeploy>
+ <version.jboss.osgi.hotdeploy>1.0.3-SNAPSHOT</version.jboss.osgi.hotdeploy>
<version.jboss.osgi.husky>1.0.2-SNAPSHOT</version.jboss.osgi.husky>
<version.jboss.osgi.jaxb>2.1.10-SNAPSHOT</version.jboss.osgi.jaxb>
<version.jboss.osgi.jmx>1.0.2-SNAPSHOT</version.jboss.osgi.jmx>
16 years, 7 months
- 1
- 0
JBoss-OSGI SVN: r97288 - in projects/jboss-osgi/projects/bundles: jaxb/trunk and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-12-02 08:17:04 -0500 (Wed, 02 Dec 2009)
New Revision: 97288
Modified:
projects/jboss-osgi/projects/bundles/apache-xerces/trunk/pom.xml
projects/jboss-osgi/projects/bundles/jaxb/trunk/pom.xml
Log:
Remove lazy activation policy
Modified: projects/jboss-osgi/projects/bundles/apache-xerces/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/apache-xerces/trunk/pom.xml 2009-12-02 13:15:54 UTC (rev 97287)
+++ projects/jboss-osgi/projects/bundles/apache-xerces/trunk/pom.xml 2009-12-02 13:17:04 UTC (rev 97288)
@@ -98,7 +98,6 @@
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Bundle-Activator>org.jboss.osgi.xml.XMLParserActivatorExt</Bundle-Activator>
- <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
<Privat-Package>
org.jboss.osgi.xml.internal
</Privat-Package>
Modified: projects/jboss-osgi/projects/bundles/jaxb/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jaxb/trunk/pom.xml 2009-12-02 13:15:54 UTC (rev 97287)
+++ projects/jboss-osgi/projects/bundles/jaxb/trunk/pom.xml 2009-12-02 13:17:04 UTC (rev 97288)
@@ -81,7 +81,6 @@
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Bundle-Activator>org.jboss.osgi.jaxb.internal.JAXBServiceActivator</Bundle-Activator>
- <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
<Private-Package>
org.jboss.osgi.jaxb.internal
</Private-Package>
16 years, 7 months
- 1
- 0
JBoss-OSGI SVN: r97287 - projects/jboss-osgi/projects/bundles/hotdeploy/trunk.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-12-02 08:15:54 -0500 (Wed, 02 Dec 2009)
New Revision: 97287
Modified:
projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml
Log:
Update versions
Modified: projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml 2009-12-02 13:13:29 UTC (rev 97286)
+++ projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml 2009-12-02 13:15:54 UTC (rev 97287)
@@ -21,7 +21,7 @@
<artifactId>jboss-osgi-hotdeploy</artifactId>
<packaging>bundle</packaging>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.0.3-SNAPSHOT</version>
<!-- Parent -->
<parent>
@@ -39,9 +39,9 @@
<!-- Properties -->
<properties>
- <version.jboss.osgi.common>1.0.3</version.jboss.osgi.common>
- <version.jboss.osgi.deployment>1.0.0</version.jboss.osgi.deployment>
- <version.jboss.osgi.spi>1.0.3</version.jboss.osgi.spi>
+ <version.jboss.osgi.common>1.0.3-SNAPSHOT</version.jboss.osgi.common>
+ <version.jboss.osgi.deployment>1.0.0-SNAPSHOT</version.jboss.osgi.deployment>
+ <version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi>
<version.osgi>4.2.0</version.osgi>
</properties>
16 years, 7 months
- 1
- 0