12:45 p.m.
Author: thomas.diesler(a)jboss.com
Date: 2010-02-25 06:45:51 -0500 (Thu, 25 Feb 2010)
New Revision: 101466
Removed:
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/integration/jbossas/MicrocontainerDeployerServiceBean.java
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/integration/jbossas/MicrocontainerServiceBean.java
Modified:
projects/jboss-osgi/projects/runtime/jbossas/trunk/.classpath
projects/jboss-osgi/projects/runtime/jbossas/trunk/.project
projects/jboss-osgi/projects/runtime/jbossas/trunk/.settings/org.eclipse.jdt.core.prefs
projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml
Log:
Remove MC services. These should only be available with the native framework
Modified: projects/jboss-osgi/projects/runtime/jbossas/trunk/.classpath
===================================================================
--- projects/jboss-osgi/projects/runtime/jbossas/trunk/.classpath 2010-02-25 11:42:58 UTC
(rev 101465)
+++ projects/jboss-osgi/projects/runtime/jbossas/trunk/.classpath 2010-02-25 11:45:51 UTC
(rev 101466)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes"
path="src/main/java"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: projects/jboss-osgi/projects/runtime/jbossas/trunk/.project
===================================================================
--- projects/jboss-osgi/projects/runtime/jbossas/trunk/.project 2010-02-25 11:42:58 UTC
(rev 101465)
+++ projects/jboss-osgi/projects/runtime/jbossas/trunk/.project 2010-02-25 11:45:51 UTC
(rev 101466)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jboss-osgi-runtime-jbossas</name>
+ <name>jboss-osgi-jbossas</name>
<comment></comment>
<projects>
</projects>
Modified:
projects/jboss-osgi/projects/runtime/jbossas/trunk/.settings/org.eclipse.jdt.core.prefs
===================================================================
---
projects/jboss-osgi/projects/runtime/jbossas/trunk/.settings/org.eclipse.jdt.core.prefs 2010-02-25
11:42:58 UTC (rev 101465)
+++
projects/jboss-osgi/projects/runtime/jbossas/trunk/.settings/org.eclipse.jdt.core.prefs 2010-02-25
11:45:51 UTC (rev 101466)
@@ -1,12 +1,13 @@
-#Wed Feb 04 09:36:33 CET 2009
+#Thu Feb 25 12:26:19 CET 2010
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.6
Modified: projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml 2010-02-25 11:42:58 UTC
(rev 101465)
+++ projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml 2010-02-25 11:45:51 UTC
(rev 101466)
@@ -17,7 +17,7 @@
<name>JBossOSGi Runtime - JBossAS</name>
<groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgi-runtime-jbossas</artifactId>
+ <artifactId>jboss-osgi-jbossas</artifactId>
<packaging>jar</packaging>
<version>1.0.3-SNAPSHOT</version>
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-parent</artifactId>
- <version>1.0.4</version>
+ <version>1.0.5-SNAPSHOT</version>
</parent>
<!-- Subversion -->
@@ -38,8 +38,7 @@
<!-- Properties -->
<properties>
- <version.jboss.osgi.jta>1.0.0</version.jboss.osgi.jta>
-
<version.jboss.osgi.microcontainer>2.2.0-SNAPSHOT</version.jboss.osgi.microcontainer>
+ <version.jboss.osgi.jta>1.0.1-SNAPSHOT</version.jboss.osgi.jta>
<version.osgi>4.2.0</version.osgi>
</properties>
@@ -51,11 +50,6 @@
<version>${version.jboss.osgi.jta}</version>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-microcontainer</artifactId>
- <version>${version.jboss.osgi.microcontainer}</version>
- </dependency>
- <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${version.osgi}</version>
@@ -72,31 +66,6 @@
<!-- Build -->
<build>
<plugins>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-resources</phase>
- <goals>
- <goal>unpack-dependencies</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <outputDirectory>target/classes</outputDirectory>
- <includeGroupIds>org.jboss.osgi.bundles</includeGroupIds>
- <!--
- includeArtifactIds should trim whitespace
- http://jira.codehaus.org/browse/MDEP-175
- -->
- <includeArtifactIds>
- jboss-osgi-microcontainer
- </includeArtifactIds>
- <includes>
- org/jboss/osgi/microcontainer/*.class
- </includes>
- </configuration>
- </plugin>
</plugins>
</build>
Deleted:
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/integration/jbossas/MicrocontainerDeployerServiceBean.java
===================================================================
---
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/integration/jbossas/MicrocontainerDeployerServiceBean.java 2010-02-25
11:42:58 UTC (rev 101465)
+++
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/integration/jbossas/MicrocontainerDeployerServiceBean.java 2010-02-25
11:45:51 UTC (rev 101466)
@@ -1,89 +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.integration.jbossas;
-
-//$Id$
-
-import java.util.Properties;
-
-import org.jboss.deployers.client.spi.main.MainDeployer;
-import org.jboss.logging.Logger;
-import org.jboss.osgi.deployment.deployer.DeployerService;
-import org.jboss.osgi.microcontainer.AbstractMicrocontainerDeployerService;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
-import org.osgi.framework.ServiceRegistration;
-
-/**
- * An implementation of the {@link DeployerService} which is installed as MC bean in
jbossas.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 05-May-2009
- */
-public class MicrocontainerDeployerServiceBean extends
AbstractMicrocontainerDeployerService
-{
- // Provide logging
- private static Logger log =
Logger.getLogger(MicrocontainerDeployerServiceBean.class);
-
- private MainDeployer mainDeployer;
- private BundleContext context;
- private ServiceRegistration serviceReg;
-
- public MainDeployer getMainDeployer()
- {
- return mainDeployer;
- }
-
- public void setMainDeployer(MainDeployer mainDeployer)
- {
- this.mainDeployer = mainDeployer;
- }
-
- public BundleContext getBundleContext()
- {
- return context;
- }
-
- public void setBundleContext(BundleContext context)
- {
- this.context = context;
- }
-
- public void start()
- {
- // Register the DeployerService
- Properties props = new Properties();
- props.setProperty("provider", "microcontainer");
- props.put(Constants.SERVICE_RANKING, Integer.MAX_VALUE);
- serviceReg = context.registerService(DeployerService.class.getName(), this,
props);
- log.debug("DeployerService registered");
- }
-
- void stop()
- {
- if (serviceReg != null)
- {
- serviceReg.unregister();
- serviceReg = null;
- }
- }
-}
\ No newline at end of file
Deleted:
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/integration/jbossas/MicrocontainerServiceBean.java
===================================================================
---
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/integration/jbossas/MicrocontainerServiceBean.java 2010-02-25
11:42:58 UTC (rev 101465)
+++
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/integration/jbossas/MicrocontainerServiceBean.java 2010-02-25
11:45:51 UTC (rev 101466)
@@ -1,98 +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.integration.jbossas;
-
-
-//$Id$
-
-import javax.management.MBeanServer;
-
-import org.jboss.kernel.Kernel;
-import org.jboss.kernel.spi.dependency.KernelController;
-import org.jboss.logging.Logger;
-import org.jboss.osgi.microcontainer.AbstractMicrocontainerService;
-import org.jboss.osgi.spi.management.MicrocontainerServiceMBean;
-import org.jboss.osgi.spi.service.MicrocontainerService;
-import org.osgi.framework.BundleContext;
-
-/**
- * An implementation of the {@link MicrocontainerService}
- * which is installed as MC bean in jbossas.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 05-May-2009
- */
-public class MicrocontainerServiceBean extends AbstractMicrocontainerService implements
MicrocontainerServiceMBean
-{
- // Provide logging
- private static Logger log = Logger.getLogger(MicrocontainerServiceBean.class);
-
- private BundleContext context;
- private MBeanServer mbeanServer;
- private Kernel kernel;
-
- public void setBundleContext(BundleContext bundleContext)
- {
- this.context = bundleContext;
- }
-
- public void setMbeanServer(MBeanServer mbeanServer)
- {
- this.mbeanServer = mbeanServer;
- }
-
- public void setKernel(Kernel kernel)
- {
- this.kernel = kernel;
- }
-
- public Kernel getKernel()
- {
- return kernel;
- }
-
- public void start() throws Exception
- {
- Kernel kernel = getKernel();
- KernelController controller = kernel.getController();
-
- // Preregister some MC beans
- installBean(controller, BEAN_BUNDLE_CONTEXT, context);
- installBean(controller, BEAN_KERNEL, kernel);
- installBean(controller, BEAN_KERNEL_CONTROLLER, controller);
- installBean(controller, BEAN_MBEAN_SERVER, mbeanServer);
-
- // Register the MicrocontainerService
- log.debug("Register MicrocontainerService");
- context.registerService(MicrocontainerService.class.getName(), this, null);
- log.debug("MicrocontainerService registered");
-
- // Register the MicrocontainerServiceMBean
- registerMicrocontainerServiceMBean(mbeanServer);
- log.debug("MicrocontainerServiceMBean registered");
- }
-
- void stop()
- {
- unregisterMicrocontainerServiceMBean(mbeanServer);
- }
-}
\ No newline at end of file