[jboss-osgi-commits] JBoss-OSGI SVN: r87323 - in projects/jboss-osgi/trunk: bundle/remotelog/src/main/java/org/jboss/osgi/service and 11 other directories.
jboss-osgi-commits at lists.jboss.org
jboss-osgi-commits at lists.jboss.org
Wed Apr 15 05:51:25 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-04-15 05:51:24 -0400 (Wed, 15 Apr 2009)
New Revision: 87323
Added:
projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/
projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/NotImplementedException.java
projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/RemoteLogActivator.java
projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/RemoteLogListener.java
projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/RemoteLogReaderService.java
projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/internal/
projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/service/
projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/service/microcontainer/
Removed:
projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remlog/
projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/service/mc/
projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/service/package.html
Modified:
projects/jboss-osgi/trunk/bundle/remotelog/pom.xml
projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/internal/RemoteLogEntry.java
projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/internal/RemoteLogReaderServiceImpl.java
projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml
projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml
projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml
projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/service/microcontainer/MicrocontainerService.java
projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/log/LogServiceRemoteTestCase.java
projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/microcontainer/bundle/MBeanTestService.java
Log:
Clarify package structure of SPI provided services
Modified: projects/jboss-osgi/trunk/bundle/remotelog/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/remotelog/pom.xml 2009-04-15 09:44:13 UTC (rev 87322)
+++ projects/jboss-osgi/trunk/bundle/remotelog/pom.xml 2009-04-15 09:51:24 UTC (rev 87323)
@@ -78,8 +78,8 @@
<configuration>
<instructions>
<Bundle-SymbolicName>org.jboss.osgi.service.remote.log</Bundle-SymbolicName>
- <Bundle-Activator>org.jboss.osgi.service.remlog.RemoteLogActivator</Bundle-Activator>
- <Export-Package>org.jboss.osgi.service.remlog;version=${version}</Export-Package>
+ <Bundle-Activator>org.jboss.osgi.service.remotelog.RemoteLogActivator</Bundle-Activator>
+ <Export-Package>org.jboss.osgi.service.remotelog;version=${version}</Export-Package>
<Import-Package>
org.osgi.framework,
org.osgi.service.log,
Copied: projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/NotImplementedException.java (from rev 87317, projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remlog/NotImplementedException.java)
===================================================================
--- projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/NotImplementedException.java (rev 0)
+++ projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/NotImplementedException.java 2009-04-15 09:51:24 UTC (rev 87323)
@@ -0,0 +1,43 @@
+/*
+ * 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.service.remotelog;
+
+// $Id$
+
+/**
+ * A RuntimeException that should be thrown for unimplemented features
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 18-Jun-2008
+ */
+ at SuppressWarnings("serial")
+public class NotImplementedException extends RuntimeException
+{
+ public NotImplementedException()
+ {
+ }
+
+ public NotImplementedException(String message)
+ {
+ super(message);
+ }
+}
Copied: projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/RemoteLogActivator.java (from rev 87317, projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remlog/RemoteLogActivator.java)
===================================================================
--- projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/RemoteLogActivator.java (rev 0)
+++ projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/RemoteLogActivator.java 2009-04-15 09:51:24 UTC (rev 87323)
@@ -0,0 +1,113 @@
+/*
+ * 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.service.remotelog;
+
+//$Id$
+
+import java.util.Properties;
+
+import org.jboss.osgi.service.remotelog.internal.RemoteLogReaderServiceImpl;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
+
+/**
+ * [TODO]
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 23-Jan-2009
+ */
+public class RemoteLogActivator implements BundleActivator
+{
+ public static final String REMOTE_LOG_SENDER = "org.jboss.osgi.service.remote.log.sender";
+ public static final String REMOTE_LOG_READER = "org.jboss.osgi.service.remote.log.reader";
+ public static final String REMOTE_LOG_HOST = "org.jboss.osgi.service.remote.log.host";
+ public static final String REMOTE_LOG_PORT = "org.jboss.osgi.service.remote.log.port";
+
+ private Boolean isReader = Boolean.FALSE;
+ private Boolean isSender = Boolean.FALSE;
+ private RemoteLogReaderServiceImpl readerService;
+ private ServiceRegistration readerRegistration;
+ private RemoteLogListener remoteSender;
+
+ public void start(BundleContext context)
+ {
+ String readerProp = context.getProperty(REMOTE_LOG_READER);
+ String senderProp = context.getProperty(REMOTE_LOG_SENDER);
+ String hostProp = context.getProperty(REMOTE_LOG_HOST);
+ String portProp = context.getProperty(REMOTE_LOG_PORT);
+
+ if (readerProp != null)
+ isReader = Boolean.valueOf(readerProp);
+
+ if (senderProp != null)
+ isSender = Boolean.valueOf(senderProp);
+
+ String host = hostProp != null ? hostProp : "localhost";
+ String port = portProp != null ? portProp : "5400";
+
+ Properties props = new Properties();
+ props.put(REMOTE_LOG_HOST, host);
+ props.put(REMOTE_LOG_PORT, port);
+
+ ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
+ try
+ {
+ Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
+
+ if (isReader == true)
+ {
+ readerService = new RemoteLogReaderServiceImpl(context, props);
+ readerRegistration = context.registerService(RemoteLogReaderService.class.getName(), readerService, props);
+ readerService.start();
+ }
+
+ if (isSender == true)
+ {
+ remoteSender = new RemoteLogListener(context, props);
+ remoteSender.start();
+ }
+ }
+ finally
+ {
+ Thread.currentThread().setContextClassLoader(ctxLoader);
+ }
+ }
+
+ public void stop(BundleContext context) throws Exception
+ {
+ if (isReader == true)
+ {
+ readerRegistration.unregister();
+ readerRegistration = null;
+
+ readerService.stop();
+ readerService = null;
+ }
+
+ if (isSender == true)
+ {
+ remoteSender.stop();
+ remoteSender = null;
+ }
+ }
+}
\ No newline at end of file
Copied: projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/RemoteLogListener.java (from rev 87317, projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remlog/RemoteLogListener.java)
===================================================================
--- projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/RemoteLogListener.java (rev 0)
+++ projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/RemoteLogListener.java 2009-04-15 09:51:24 UTC (rev 87323)
@@ -0,0 +1,117 @@
+/*
+ * 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.service.remotelog;
+
+//$Id$
+
+import java.util.Properties;
+
+import org.jboss.osgi.service.remotelog.internal.RemoteLogEntry;
+import org.jboss.remoting.Client;
+import org.jboss.remoting.InvokerLocator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.log.LogEntry;
+import org.osgi.service.log.LogListener;
+import org.osgi.service.log.LogReaderService;
+import org.osgi.util.tracker.ServiceTracker;
+
+/**
+ * [TODO]
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 12-Apr-2009
+ */
+public class RemoteLogListener implements LogListener
+{
+ private BundleContext context;
+ private ServiceTracker tracker;
+ private String host;
+ private Integer port;
+
+ private Client remotingClient;
+
+ public RemoteLogListener(BundleContext context, Properties props)
+ {
+ this.context = context;
+ this.host = props.getProperty(RemoteLogActivator.REMOTE_LOG_HOST);
+ this.port = new Integer(props.getProperty(RemoteLogActivator.REMOTE_LOG_PORT));
+
+ // Get the remoting client
+ try
+ {
+ String locatorURI = "socket://" + host + ":" + port;
+ InvokerLocator locator = new InvokerLocator(locatorURI);
+ remotingClient = new Client(locator);
+ }
+ catch (Exception ex)
+ {
+ ex.printStackTrace();
+ }
+ }
+
+ public void start()
+ {
+ final LogListener logListener = this;
+ tracker = new ServiceTracker(context, LogReaderService.class.getName(), null)
+ {
+ @Override
+ public Object addingService(ServiceReference reference)
+ {
+ LogReaderService logReader = (LogReaderService)super.addingService(reference);
+ logReader.addLogListener(logListener);
+ return logReader;
+ }
+ };
+ tracker.open();
+ }
+
+ public void stop()
+ {
+ System.out.println("remotingClient.disconnect");
+ remotingClient.disconnect();
+
+ LogReaderService logReader = (LogReaderService)tracker.getService();
+ if (logReader != null)
+ logReader.removeLogListener(this);
+ }
+
+ public void logged(LogEntry entry)
+ {
+ RemoteLogEntry remoteEntry = new RemoteLogEntry(entry);
+ try
+ {
+ if (remotingClient.isConnected() == false)
+ {
+ System.out.println("remotingClient.connect");
+ remotingClient.connect();
+ }
+
+ System.out.println("invoke: " + remoteEntry);
+ remotingClient.invoke(remoteEntry);
+ }
+ catch (Throwable ex)
+ {
+ ex.printStackTrace();
+ }
+ }
+}
\ No newline at end of file
Added: projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/RemoteLogReaderService.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/RemoteLogReaderService.java (rev 0)
+++ projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/RemoteLogReaderService.java 2009-04-15 09:51:24 UTC (rev 87323)
@@ -0,0 +1,36 @@
+/*
+ * 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.service.remotelog;
+
+//$Id$
+
+import org.osgi.service.log.LogReaderService;
+
+/**
+ * [TODO]
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 12-Apr-2009
+ */
+public interface RemoteLogReaderService extends LogReaderService
+{
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/RemoteLogReaderService.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/internal (from rev 87317, projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remlog/internal)
Modified: projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/internal/RemoteLogEntry.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remlog/internal/RemoteLogEntry.java 2009-04-15 08:43:19 UTC (rev 87317)
+++ projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/internal/RemoteLogEntry.java 2009-04-15 09:51:24 UTC (rev 87323)
@@ -19,7 +19,7 @@
* 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.service.remlog.internal;
+package org.jboss.osgi.service.remotelog.internal;
// $Id$
@@ -32,7 +32,7 @@
import java.util.Dictionary;
import java.util.Enumeration;
-import org.jboss.osgi.service.remlog.NotImplementedException;
+import org.jboss.osgi.service.remotelog.NotImplementedException;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
Modified: projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/internal/RemoteLogReaderServiceImpl.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remlog/internal/RemoteLogReaderServiceImpl.java 2009-04-15 08:43:19 UTC (rev 87317)
+++ projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/internal/RemoteLogReaderServiceImpl.java 2009-04-15 09:51:24 UTC (rev 87323)
@@ -19,7 +19,7 @@
* 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.service.remlog.internal;
+package org.jboss.osgi.service.remotelog.internal;
//$Id$
@@ -30,9 +30,9 @@
import javax.management.MBeanServer;
-import org.jboss.osgi.service.remlog.NotImplementedException;
-import org.jboss.osgi.service.remlog.RemoteLogActivator;
-import org.jboss.osgi.service.remlog.RemoteLogReaderService;
+import org.jboss.osgi.service.remotelog.NotImplementedException;
+import org.jboss.osgi.service.remotelog.RemoteLogActivator;
+import org.jboss.osgi.service.remotelog.RemoteLogReaderService;
import org.jboss.remoting.InvocationRequest;
import org.jboss.remoting.InvokerLocator;
import org.jboss.remoting.ServerInvocationHandler;
Modified: projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml 2009-04-15 09:44:13 UTC (rev 87322)
+++ projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml 2009-04-15 09:51:24 UTC (rev 87323)
@@ -17,7 +17,7 @@
javax.management,
javax.xml.parsers,
org.jboss.logging,
- org.jboss.osgi.service,
+ org.jboss.osgi.spi.service,
org.jboss.osgi.spi.management,
org.osgi.framework; version=1.4,
org.osgi.service.packageadmin; version=1.2,
@@ -40,7 +40,7 @@
</bean>
<!-- A Service that gives access to the Microcontainer Kernel -->
- <bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.service.mc.MicrocontainerService">
+ <bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.spi.service.microcontainer.MicrocontainerService">
<property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext"/></property>
<property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
<property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property>
Modified: projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml 2009-04-15 09:44:13 UTC (rev 87322)
+++ projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml 2009-04-15 09:51:24 UTC (rev 87323)
@@ -16,7 +16,7 @@
javax.management,
javax.xml.parsers,
org.jboss.logging,
- org.jboss.osgi.service.mc,
+ org.jboss.osgi.spi.service.microcontainer,
org.jboss.osgi.spi.management,
org.osgi.framework; version=1.4,
org.osgi.service.packageadmin; version=1.2,
@@ -62,7 +62,7 @@
</bean>
<!-- A Service that gives access to the Microcontainer Kernel -->
- <bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.service.mc.MicrocontainerService">
+ <bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.spi.service.microcontainer.MicrocontainerService">
<property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext"/></property>
<property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
<property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property>
Modified: projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml 2009-04-15 09:44:13 UTC (rev 87322)
+++ projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml 2009-04-15 09:51:24 UTC (rev 87323)
@@ -16,7 +16,7 @@
javax.management,
javax.xml.parsers,
org.jboss.logging,
- org.jboss.osgi.service,
+ org.jboss.osgi.spi.service,
org.jboss.osgi.spi.management,
org.osgi.framework; version=1.4,
org.osgi.service.packageadmin; version=1.2,
@@ -39,7 +39,7 @@
</bean>
<!-- A Service that gives access to the Microcontainer Kernel -->
- <bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.service.mc.MicrocontainerService">
+ <bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.spi.service.microcontainer.MicrocontainerService">
<property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext"/></property>
<property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
<property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property>
Deleted: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/service/package.html
===================================================================
--- projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/service/package.html 2009-04-15 09:44:13 UTC (rev 87322)
+++ projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/service/package.html 2009-04-15 09:51:24 UTC (rev 87323)
@@ -1,5 +0,0 @@
-<html>
-<body>
-A collection of SPI provided services.
-</body>
-</html>
Copied: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/service/microcontainer (from rev 87316, projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/service/mc)
Modified: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/service/microcontainer/MicrocontainerService.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/service/mc/MicrocontainerService.java 2009-04-15 04:02:54 UTC (rev 87316)
+++ projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/service/microcontainer/MicrocontainerService.java 2009-04-15 09:51:24 UTC (rev 87323)
@@ -19,7 +19,7 @@
* 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.service.mc;
+package org.jboss.osgi.spi.service.microcontainer;
//$Id$
Modified: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/log/LogServiceRemoteTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/log/LogServiceRemoteTestCase.java 2009-04-15 09:44:13 UTC (rev 87322)
+++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/log/LogServiceRemoteTestCase.java 2009-04-15 09:51:24 UTC (rev 87323)
@@ -27,7 +27,7 @@
import org.jboss.osgi.common.log.LogEntryCache;
import org.jboss.osgi.common.log.LogEntryFilter;
-import org.jboss.osgi.service.remlog.RemoteLogReaderService;
+import org.jboss.osgi.service.remotelog.RemoteLogReaderService;
import org.jboss.osgi.spi.framework.OSGiBootstrap;
import org.jboss.osgi.spi.framework.OSGiFramework;
import org.jboss.osgi.spi.framework.RemoteBundle;
@@ -72,10 +72,12 @@
tracker.open();
// Install the RemoteLogReaderService in the local OSGiFramework.
+ // The 'org.jboss.osgi.service.remote.log.reader' property must be set to 'true'
installBundle(sysContext, "bundles/jboss-osgi-remotelog.jar", true);
// Deploy the RemoteLogListener to the remote OSGiFramework.
- deployBundle("bundles/jboss-osgi-service-remote-log.jar");
+ // The 'org.jboss.osgi.service.remote.log.sender' property must be set to 'true'
+ deployBundle("bundles/jboss-osgi-remotelog.jar");
// Deploy the test bundle
RemoteBundle bundleA = deployBundle("example/example-log-bundleA.jar");
Modified: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/microcontainer/bundle/MBeanTestService.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/microcontainer/bundle/MBeanTestService.java 2009-04-15 09:44:13 UTC (rev 87322)
+++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/service/microcontainer/bundle/MBeanTestService.java 2009-04-15 09:51:24 UTC (rev 87323)
@@ -26,8 +26,8 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.jboss.osgi.service.mc.MicrocontainerService;
import org.jboss.osgi.spi.management.ObjectNameFactory;
+import org.jboss.osgi.spi.service.microcontainer.MicrocontainerService;
import org.jboss.test.osgi.service.microcontainer.bundle.Foo;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceEvent;
More information about the jboss-osgi-commits
mailing list