April 2009 - jboss-osgi-commits - Jboss List Archives

JBoss-OSGI SVN: r87832 - in projects/jboss-osgi/trunk: bundle/blueprint and 13 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-04-24 18:18:20 -0400 (Fri, 24 Apr 2009) New Revision: 87832 Added: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/BlueprintTest.java projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/bootstrap/ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/bootstrap/SystemBundleTestCase.java projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/jmx/ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/jmx/JMXTestCase.java projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/jmx/bundle/ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/jmx/bundle/Foo.java projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/jmx/bundle/FooMBean.java projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/jmx/bundle/JMXTestService.java projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/jmx/bundle/ServiceActivator.java projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/jmx/ projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/jmx/jmx-test.bnd projects/jboss-osgi/trunk/bundle/jmx/ projects/jboss-osgi/trunk/bundle/jmx/src/main/java/org/jboss/osgi/jmx/ projects/jboss-osgi/trunk/bundle/jmx/src/main/java/org/jboss/osgi/jmx/ServiceActivator.java projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-examples-zip.xml Removed: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/SystemBundleTestCase.java projects/jboss-osgi/trunk/bundle/jmx/src/main/java/org/jboss/osgi/blueprint/ projects/jboss-osgi/trunk/bundle/jmx/src/test/ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-examples.xml Modified: projects/jboss-osgi/trunk/bundle/blueprint/pom.xml projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/PropertiesBootstrapProvider.java projects/jboss-osgi/trunk/bundle/jmx/.classpath projects/jboss-osgi/trunk/bundle/jmx/pom.xml projects/jboss-osgi/trunk/bundle/pom.xml projects/jboss-osgi/trunk/testsuite/example/pom.xml Log: Add bundle jboss-osgi-jmx.jar Modified: projects/jboss-osgi/trunk/bundle/blueprint/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundle/blueprint/pom.xml 2009-04-24 21:37:33 UTC (rev 87831) +++ projects/jboss-osgi/trunk/bundle/blueprint/pom.xml 2009-04-24 22:18:20 UTC (rev 87832) @@ -23,6 +23,35 @@ <version>${version}</version> </dependency> <dependency> + <groupId>biz.aQute</groupId> + <artifactId>bnd</artifactId> + </dependency> + +  + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.log</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-common</artifactId> + <version>${version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-logging</artifactId> + <version>${version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-jmx</artifactId> + <version>${version}</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> <scope>provided</scope> @@ -44,6 +73,45 @@ <build> <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>bundles</id> + <phase>test-compile</phase> + <goals> + <goal>directory-single</goal> + </goals> + <configuration> + <finalName>test-libs</finalName> + <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>scripts/assembly-bundles.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>build-test-jars</id> + <phase>test-compile</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="maven.runtime.classpath" refid="maven.runtime.classpath" /> + <property name="tests.output.dir" value="${project.build.directory}" /> + <ant antfile="scripts/antrun-test-jars.xml" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/PropertiesBootstrapProvider.java =================================================================== --- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/PropertiesBootstrapProvider.java 2009-04-24 21:37:33 UTC (rev 87831) +++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/PropertiesBootstrapProvider.java 2009-04-24 22:18:20 UTC (rev 87832) @@ -26,6 +26,9 @@ import java.io.IOException; import java.io.InputStream; import java.net.URL; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; import java.util.Properties; import org.jboss.osgi.spi.NotImplementedException; @@ -91,6 +94,22 @@ throw new IllegalStateException("Cannot load framework: " + frameworkImpl, ex); } + // Process Framework props + String prefix = "framework.prop."; + Map<String,Object> frameworkProps = new HashMap<String,Object>(); + Enumeration<?> keys = props.propertyNames(); + while(keys.hasMoreElements()) + { + String key = (String)keys.nextElement(); + if (key.startsWith(prefix)) + { + String value = props.getProperty(key); + key = key.substring(prefix.length()); + frameworkProps.put(key, value); + } + } + framework.setProperties(frameworkProps); + // Start the Framework framework.start(); } Added: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/BlueprintTest.java =================================================================== --- projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/BlueprintTest.java (rev 0) +++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/BlueprintTest.java 2009-04-24 22:18:20 UTC (rev 87832) @@ -0,0 +1,57 @@ +/* + * 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.test.osgi.blueprint; + +//$Id$ + +import java.util.ArrayList; + +import javax.management.MBeanServer; +import javax.management.MBeanServerFactory; + +import org.jboss.osgi.spi.junit.OSGiTest; + +/** + * The base class for Blueprint Service tests + * + * @author thomas.diesler(a)jboss.com + * @since 24-Apr-2009 + */ +public abstract class BlueprintTest extends OSGiTest +{ + @SuppressWarnings("unchecked") + protected MBeanServer getMBeanServer() + { + ArrayList<MBeanServer> serverArr = MBeanServerFactory.findMBeanServer(null); + if (serverArr.size() > 1) + throw new IllegalStateException("Multiple MBeanServer instances not supported"); + + MBeanServer server = null; + if (serverArr.size() == 1) + server = serverArr.get(0); + + if (server == null) + server = MBeanServerFactory.createMBeanServer(); + + return server; + } +} \ No newline at end of file Property changes on: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/BlueprintTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/SystemBundleTestCase.java =================================================================== --- projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/SystemBundleTestCase.java 2009-04-24 21:37:33 UTC (rev 87831) +++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/SystemBundleTestCase.java 2009-04-24 22:18:20 UTC (rev 87832) @@ -1,50 +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. - */ - - -//$Id$ -package org.jboss.test.osgi.blueprint; - -import org.jboss.osgi.spi.framework.OSGiBootstrap; -import org.jboss.osgi.spi.framework.OSGiBootstrapProvider; -import org.jboss.osgi.spi.framework.OSGiFramework; -import org.jboss.osgi.spi.junit.OSGiTest; -import org.osgi.framework.Bundle; - -/** - * Test OSGi System bundle access - * - * @author thomas.diesler(a)jboss.com - * @since 23-Jan-2009 - */ -public class SystemBundleTestCase extends OSGiTest -{ - public void testSystemBundle() - { - OSGiBootstrapProvider configProvider = OSGiBootstrap.getBootstrapProvider(); - OSGiFramework framework = configProvider.getFramework(); - Bundle bundle = framework.getSystemBundle(); - - assertEquals("BundleId == 0", 0, bundle.getBundleId()); - assertEquals("SymbolicName", "org.apache.felix.framework", bundle.getSymbolicName()); - } -} \ No newline at end of file Copied: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/bootstrap/SystemBundleTestCase.java (from rev 87823, projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/SystemBundleTestCase.java) =================================================================== --- projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/bootstrap/SystemBundleTestCase.java (rev 0) +++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/bootstrap/SystemBundleTestCase.java 2009-04-24 22:18:20 UTC (rev 87832) @@ -0,0 +1,50 @@ +/* + * 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. + */ + + +//$Id$ +package org.jboss.test.osgi.blueprint.bootstrap; + +import org.jboss.osgi.spi.framework.OSGiBootstrap; +import org.jboss.osgi.spi.framework.OSGiBootstrapProvider; +import org.jboss.osgi.spi.framework.OSGiFramework; +import org.jboss.osgi.spi.junit.OSGiTest; +import org.osgi.framework.Bundle; + +/** + * Test OSGi System bundle access + * + * @author thomas.diesler(a)jboss.com + * @since 23-Jan-2009 + */ +public class SystemBundleTestCase extends OSGiTest +{ + public void testSystemBundle() + { + OSGiBootstrapProvider configProvider = OSGiBootstrap.getBootstrapProvider(); + OSGiFramework framework = configProvider.getFramework(); + Bundle bundle = framework.getSystemBundle(); + + assertEquals("BundleId == 0", 0, bundle.getBundleId()); + assertEquals("SymbolicName", "org.apache.felix.framework", bundle.getSymbolicName()); + } +} \ No newline at end of file Added: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/jmx/JMXTestCase.java =================================================================== --- projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/jmx/JMXTestCase.java (rev 0) +++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/jmx/JMXTestCase.java 2009-04-24 22:18:20 UTC (rev 87832) @@ -0,0 +1,62 @@ +/* + * 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.test.osgi.blueprint.jmx; + +//$Id$ + +import javax.management.ObjectName; + +import org.jboss.osgi.spi.framework.OSGiFramework; +import org.jboss.osgi.spi.management.MBeanProxy; +import org.jboss.test.osgi.blueprint.BlueprintTest; +import org.jboss.test.osgi.blueprint.jmx.bundle.FooMBean; +import org.jboss.test.osgi.blueprint.jmx.bundle.JMXTestService; +import org.osgi.framework.BundleContext; + +/** + * A test that deployes a bundle that registeres an MBean + * + * @author thomas.diesler(a)jboss.com + * @since 12-Feb-2009 + */ +public class JMXTestCase extends BlueprintTest +{ + public void testMBeanAccess() throws Exception + { + OSGiFramework framework = getBootstrapProvider().getFramework(); + try + { + BundleContext sysContext = framework.getSystemBundleContext(); + + installBundle(sysContext, "bundles/jboss-osgi-jmx.jar", true); + installBundle(sysContext, "jmx-test.jar", true); + + ObjectName oname = new ObjectName("jboss.osgi:service=mbean-test-service"); + FooMBean foo = (FooMBean)MBeanProxy.get(FooMBean.class, oname, getMBeanServer()); + assertEquals("hello", foo.echo("hello")); + } + finally + { + framework.stop(); + } + } +} \ No newline at end of file Property changes on: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/jmx/JMXTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/jmx/bundle/Foo.java =================================================================== --- projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/jmx/bundle/Foo.java (rev 0) +++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/jmx/bundle/Foo.java 2009-04-24 22:18:20 UTC (rev 87832) @@ -0,0 +1,35 @@ +/* + * 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.test.osgi.blueprint.jmx.bundle; + + + + +//$Id$ + +public class Foo implements FooMBean +{ + public String echo(String msg) + { + return msg; + } +} Property changes on: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/jmx/bundle/Foo.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/jmx/bundle/FooMBean.java =================================================================== --- projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/jmx/bundle/FooMBean.java (rev 0) +++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/jmx/bundle/FooMBean.java 2009-04-24 22:18:20 UTC (rev 87832) @@ -0,0 +1,29 @@ +/* + * 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.test.osgi.blueprint.jmx.bundle; + +//$Id$ + +public interface FooMBean +{ + String echo(String msg); +} Property changes on: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/jmx/bundle/FooMBean.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/jmx/bundle/JMXTestService.java =================================================================== --- projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/jmx/bundle/JMXTestService.java (rev 0) +++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/jmx/bundle/JMXTestService.java 2009-04-24 22:18:20 UTC (rev 87832) @@ -0,0 +1,59 @@ +/* + * 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.test.osgi.blueprint.jmx.bundle; + +//$Id$ + +import javax.management.MBeanServer; +import javax.management.ObjectName; + +import org.osgi.framework.BundleContext; +import org.osgi.util.tracker.ServiceTracker; + +/** + * A service that registers an MBean + * + * @author thomas.diesler(a)jboss.com + * @since 24-Apr-2009 + */ +public class JMXTestService +{ + public JMXTestService(BundleContext context) + { + ServiceTracker tracker = new ServiceTracker(context, MBeanServer.class.getName(), null); + tracker.open(); + + MBeanServer mbeanServer = (MBeanServer)tracker.getService(); + if (mbeanServer == null) + throw new IllegalStateException("No MBeanServer"); + + try + { + ObjectName oname = new ObjectName("jboss.osgi:service=mbean-test-service"); + mbeanServer.registerMBean(new Foo(), oname); + } + catch (Exception ex) + { + throw new IllegalStateException(ex); + } + } +} Property changes on: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/jmx/bundle/JMXTestService.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/jmx/bundle/ServiceActivator.java =================================================================== --- projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/jmx/bundle/ServiceActivator.java (rev 0) +++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/jmx/bundle/ServiceActivator.java 2009-04-24 22:18:20 UTC (rev 87832) @@ -0,0 +1,46 @@ +/* + * 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.test.osgi.blueprint.jmx.bundle; + +//$Id$ + +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; + +/** + * A Service Activator + * + * @author thomas.diesler(a)jboss.com + * @since 24-Apr-2009 + */ +public class ServiceActivator implements BundleActivator +{ + public void start(BundleContext context) + { + JMXTestService service = new JMXTestService(context); + context.registerService(JMXTestService.class.getName(), service, null); + } + + public void stop(BundleContext context) + { + } +} \ No newline at end of file Property changes on: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/jmx/bundle/ServiceActivator.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/jmx/jmx-test.bnd =================================================================== --- projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/jmx/jmx-test.bnd (rev 0) +++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/jmx/jmx-test.bnd 2009-04-24 22:18:20 UTC (rev 87832) @@ -0,0 +1,5 @@ +# bnd build -classpath target/test-classes -output target/test-libs/jmx-test.jar src/test/resources/jmx/jmx-test.bnd + +Bundle-SymbolicName: jmx-test +Bundle-Activator: org.jboss.test.osgi.blueprint.jmx.bundle.ServiceActivator +Export-Package: org.jboss.test.osgi.blueprint.jmx.bundle Copied: projects/jboss-osgi/trunk/bundle/jmx (from rev 87823, projects/jboss-osgi/trunk/bundle/blueprint) Modified: projects/jboss-osgi/trunk/bundle/jmx/.classpath =================================================================== --- projects/jboss-osgi/trunk/bundle/blueprint/.classpath 2009-04-24 17:35:14 UTC (rev 87823) +++ projects/jboss-osgi/trunk/bundle/jmx/.classpath 2009-04-24 22:18:20 UTC (rev 87832) @@ -2,6 +2,7 @@ <classpath> <classpathentry kind="src" output="target/classes" path="src/main/java"/> <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> + <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/> <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="output" path="target/classes"/> Modified: projects/jboss-osgi/trunk/bundle/jmx/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundle/blueprint/pom.xml 2009-04-24 17:35:14 UTC (rev 87823) +++ projects/jboss-osgi/trunk/bundle/jmx/pom.xml 2009-04-24 22:18:20 UTC (rev 87832) @@ -1,9 +1,9 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <name>JBossOSGi - Bundle Blueprint Service</name> - <artifactId>jboss-osgi-blueprint</artifactId> - <packaging>jar</packaging> + <name>JBossOSGi - Bundle JMX</name> + <artifactId>jboss-osgi-jmx</artifactId> + <packaging>bundle</packaging> <parent> <groupId>org.jboss.osgi</groupId> @@ -44,6 +44,21 @@ <build> <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-SymbolicName>jboss-osgi-jmx</Bundle-SymbolicName> + <Bundle-Activator>org.jboss.osgi.jmx.ServiceActivator</Bundle-Activator> + <Import-Package> + org.osgi.framework;version=1.4, + javax.management, + </Import-Package> + </instructions> + </configuration> + </plugin> </plugins> </build> Added: projects/jboss-osgi/trunk/bundle/jmx/src/main/java/org/jboss/osgi/jmx/ServiceActivator.java =================================================================== --- projects/jboss-osgi/trunk/bundle/jmx/src/main/java/org/jboss/osgi/jmx/ServiceActivator.java (rev 0) +++ projects/jboss-osgi/trunk/bundle/jmx/src/main/java/org/jboss/osgi/jmx/ServiceActivator.java 2009-04-24 22:18:20 UTC (rev 87832) @@ -0,0 +1,77 @@ +/* + * 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.jmx; + +//$Id$ + +import java.util.ArrayList; + +import javax.management.MBeanServer; +import javax.management.MBeanServerFactory; + +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; +import org.osgi.framework.ServiceRegistration; + +/** + * A Service Activator that registers an MBeanServer + * + * @author thomas.diesler(a)jboss.com + * @since 24-Apr-2009 + */ +public class ServiceActivator implements BundleActivator +{ + private ServiceRegistration registration; + + @SuppressWarnings("unchecked") + public void start(BundleContext context) + { + ServiceReference sref = context.getServiceReference(MBeanServer.class.getName()); + if (sref == null) + { + ArrayList<MBeanServer> serverArr = MBeanServerFactory.findMBeanServer(null); + if (serverArr.size() > 1) + throw new IllegalStateException("Multiple MBeanServer instances not supported"); + + MBeanServer mbeanServer = null; + if (serverArr.size() == 1) + mbeanServer = serverArr.get(0); + + if (mbeanServer == null) + mbeanServer = MBeanServerFactory.createMBeanServer(); + + System.out.println("Register MBeanServer"); + registration = context.registerService(MBeanServer.class.getName(), mbeanServer, null); + } + } + + public void stop(BundleContext context) + { + if (registration != null) + { + System.out.println("Unregister MBeanServer"); + registration.unregister(); + registration = null; + } + } +} \ No newline at end of file Property changes on: projects/jboss-osgi/trunk/bundle/jmx/src/main/java/org/jboss/osgi/jmx/ServiceActivator.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/jboss-osgi/trunk/bundle/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundle/pom.xml 2009-04-24 21:37:33 UTC (rev 87831) +++ projects/jboss-osgi/trunk/bundle/pom.xml 2009-04-24 22:18:20 UTC (rev 87832) @@ -13,8 +13,9 @@  <modules> + <module>blueprint</module> <module>common</module> - <module>blueprint</module> + <module>jmx</module> <module>logging</module> <module>remotelog</module> <module>webconsole</module> Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-04-24 21:37:33 UTC (rev 87831) +++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-04-24 22:18:20 UTC (rev 87832) @@ -111,7 +111,7 @@ <configuration> <appendAssemblyId>false</appendAssemblyId> <descriptors> - <descriptor>scripts/assembly-examples.xml</descriptor> + <descriptor>scripts/assembly-examples-zip.xml</descriptor> </descriptors> </configuration> </execution> Copied: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-examples-zip.xml (from rev 87817, projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-examples.xml) =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-examples-zip.xml (rev 0) +++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-examples-zip.xml 2009-04-24 22:18:20 UTC (rev 87832) @@ -0,0 +1,19 @@ +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + <id>examples</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory></directory> + <outputDirectory>example</outputDirectory> + <includes> + <include>scripts/**</include> + <include>src/**</include> + <include>pom.xml</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Deleted: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-examples.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-examples.xml 2009-04-24 21:37:33 UTC (rev 87831) +++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-examples.xml 2009-04-24 22:18:20 UTC (rev 87832) @@ -1,19 +0,0 @@ -<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> - <id>examples</id> - <formats> - <format>zip</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - <fileSets> - <fileSet> - <directory></directory> - <outputDirectory>example</outputDirectory> - <includes> - <include>scripts/**</include> - <include>src/**</include> - <include>pom.xml</include> - </includes> - </fileSet> - </fileSets> -</assembly> \ No newline at end of file

16 years, 8 months

1
0
0 / 0

JBoss-OSGI SVN: r87824 - in projects/jboss-osgi/trunk: bundle and 9 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-04-24 13:35:41 -0400 (Fri, 24 Apr 2009) New Revision: 87824 Modified: projects/jboss-osgi/trunk/bundle/pom.xml projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/runtime/equinox/pom.xml projects/jboss-osgi/trunk/runtime/felix/pom.xml projects/jboss-osgi/trunk/runtime/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/internal/MicrocontainerBootstrapProvider.java projects/jboss-osgi/trunk/testsuite/example/pom.xml projects/jboss-osgi/trunk/testsuite/functional/pom.xml projects/jboss-osgi/trunk/testsuite/pom.xml Log: Start blueprint prototyping Modified: projects/jboss-osgi/trunk/bundle/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundle/pom.xml 2009-04-24 17:35:14 UTC (rev 87823) +++ projects/jboss-osgi/trunk/bundle/pom.xml 2009-04-24 17:35:41 UTC (rev 87824) @@ -14,6 +14,7 @@  <modules> <module>common</module> + <module>blueprint</module> <module>logging</module> <module>remotelog</module> <module>webconsole</module> Modified: projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml =================================================================== --- projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml 2009-04-24 17:35:14 UTC (rev 87823) +++ projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml 2009-04-24 17:35:41 UTC (rev 87824) @@ -102,11 +102,6 @@ <artifactId>jboss-deployers-impl</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-04-24 17:35:14 UTC (rev 87823) +++ projects/jboss-osgi/trunk/pom.xml 2009-04-24 17:35:41 UTC (rev 87824) @@ -268,6 +268,20 @@ </dependencies> </dependencyManagement> +  + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-log4j</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + <build>  Modified: projects/jboss-osgi/trunk/runtime/equinox/pom.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-04-24 17:35:14 UTC (rev 87823) +++ projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-04-24 17:35:41 UTC (rev 87824) @@ -39,18 +39,6 @@ <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.osgi.services</artifactId> </dependency> - -  - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-log4j</artifactId> - <scope>test</scope> - </dependency> </dependencies>  Modified: projects/jboss-osgi/trunk/runtime/felix/pom.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-24 17:35:14 UTC (rev 87823) +++ projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-24 17:35:41 UTC (rev 87824) @@ -40,18 +40,6 @@ <artifactId>org.apache.felix.log</artifactId> <scope>provided</scope> </dependency> - -  - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-log4j</artifactId> - <scope>test</scope> - </dependency> </dependencies>  Modified: projects/jboss-osgi/trunk/runtime/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java 2009-04-24 17:35:14 UTC (rev 87823) +++ projects/jboss-osgi/trunk/runtime/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java 2009-04-24 17:35:41 UTC (rev 87824) @@ -112,6 +112,10 @@ public void start() { + // Create the Felix instance + if (framework == null) + create(); + // Start the System Bundle try { Modified: projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml 2009-04-24 17:35:14 UTC (rev 87823) +++ projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml 2009-04-24 17:35:41 UTC (rev 87824) @@ -39,18 +39,6 @@ <groupId>org.osgi</groupId> <artifactId>org.osgi.compendium</artifactId> </dependency> - -  - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-log4j</artifactId> - <scope>test</scope> - </dependency> </dependencies>  Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/internal/MicrocontainerBootstrapProvider.java =================================================================== --- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/internal/MicrocontainerBootstrapProvider.java 2009-04-24 17:35:14 UTC (rev 87823) +++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/internal/MicrocontainerBootstrapProvider.java 2009-04-24 17:35:41 UTC (rev 87824) @@ -42,14 +42,14 @@ */ public class MicrocontainerBootstrapProvider extends AbstractInstanceProvider implements OSGiBootstrapProvider { - /** The default framework beans property: org.jboss.osgi.default.framework.beans */ - public static final String DEFAULT_BOOTSTRAP_BEANS_PROP = "org.jboss.osgi.default.bootstrap.beans"; + /** The default framework beans property: jboss.osgi.bootstrap.config */ + public static final String OSGI_BOOTSTRAP_CONFIG = "jboss.osgi.bootstrap.config"; /** The default framework beans: jboss-osgi-bootstrap-beans.xml */ - public static final String DEFAULT_BOOTSTRAP_BEANS = "jboss-osgi-bootstrap-beans.xml"; - /** The default framework beans property: org.jboss.osgi.default.framework.beans */ - public static final String DEFAULT_FRAMEWORK_BEANS_PROP = "org.jboss.osgi.default.framework.beans"; + public static final String DEFAULT_OSGI_BOOTSTRAP_XML = "jboss-osgi-bootstrap-beans.xml"; + /** The default framework beans property: jboss.osgi.framework.config */ + public static final String OSGI_FRAMEWORK_CONFIG = "jboss.osgi.framework.config"; /** The default framework beans: jboss-osgi-beans.xml */ - public static final String DEFAULT_FRAMEWORK_BEANS = "jboss-osgi-beans.xml"; + public static final String DEFAULT_OSGI_FRAMEWORK_XML = "jboss-osgi-beans.xml"; private EmbeddedBeansDeployer deployer = new EmbeddedBeansDeployer(); private boolean bootstraped; @@ -76,12 +76,6 @@ configureWithDefaultBeans(); } - private void configureWithDefaultBeans() - { - String defaultFrameworkBeans = System.getProperty(DEFAULT_FRAMEWORK_BEANS_PROP, DEFAULT_FRAMEWORK_BEANS); - configure(defaultFrameworkBeans); - } - public void configure(InputStream streamConfig) { throw new NotImplementedException("Cannot bootstrap JBossMC from InputStream"); @@ -127,10 +121,16 @@ return retObj; } + private void configureWithDefaultBeans() + { + String defaultFrameworkBeans = System.getProperty(OSGI_FRAMEWORK_CONFIG, DEFAULT_OSGI_FRAMEWORK_XML); + configure(defaultFrameworkBeans); + } + private void bootstrapKernel() { // Deploy the bootstrap beans if DEFAULT_BOOTSTRAP_BEANS is on the classpath - String defaultBootstrapBeans = System.getProperty(DEFAULT_BOOTSTRAP_BEANS_PROP, DEFAULT_BOOTSTRAP_BEANS); + String defaultBootstrapBeans = System.getProperty(OSGI_BOOTSTRAP_CONFIG, DEFAULT_OSGI_BOOTSTRAP_XML); URL urlBootstrap = Thread.currentThread().getContextClassLoader().getResource(defaultBootstrapBeans); if (urlBootstrap != null) deployer.deploy(urlBootstrap); Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-04-24 17:35:14 UTC (rev 87823) +++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-04-24 17:35:41 UTC (rev 87824) @@ -73,18 +73,6 @@ <version>${version}</version> <scope>provided</scope> </dependency> - -  - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-log4j</artifactId> - <scope>test</scope> - </dependency> </dependencies>  Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-04-24 17:35:14 UTC (rev 87823) +++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-04-24 17:35:41 UTC (rev 87824) @@ -73,18 +73,6 @@ <version>${version}</version> <scope>provided</scope> </dependency> - -  - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-log4j</artifactId> - <scope>test</scope> - </dependency> </dependencies>  Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-04-24 17:35:14 UTC (rev 87823) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-04-24 17:35:41 UTC (rev 87824) @@ -56,7 +56,7 @@ <value>${basedir}/target</value> </property> <property> - <name>org.jboss.osgi.default.framework.beans</name> + <name>jboss.osgi.framework.config</name> <value>jboss-osgi-felix-beans.xml</value> </property> </systemProperties> @@ -100,7 +100,7 @@ <value>${basedir}/target</value> </property> <property> - <name>org.jboss.osgi.default.framework.beans</name> + <name>jboss.osgi.framework.config</name> <value>jboss-osgi-felix-beans.xml</value> </property> </systemProperties> @@ -145,7 +145,7 @@ <value>${basedir}/target</value> </property> <property> - <name>org.jboss.osgi.default.framework.beans</name> + <name>jboss.osgi.framework.config</name> <value>jboss-osgi-equinox-beans.xml</value> </property> </systemProperties> @@ -190,7 +190,7 @@ <value>${basedir}/target</value> </property> <property> - <name>org.jboss.osgi.default.framework.beans</name> + <name>jboss.osgi.framework.config</name> <value>jboss-osgi-knopflerfish-beans.xml</value> </property> </systemProperties>

16 years, 8 months

1
0
0 / 0

JBoss-OSGI SVN: r87823 - in projects/jboss-osgi/trunk/bundle: blueprint and 11 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-04-24 13:35:14 -0400 (Fri, 24 Apr 2009) New Revision: 87823 Added: projects/jboss-osgi/trunk/bundle/blueprint/ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/PropertiesBootstrapProvider.java projects/jboss-osgi/trunk/bundle/blueprint/src/test/ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/SystemBundleTestCase.java projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/ projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/jboss-osgi-framework.properties projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/log4j.xml projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider Removed: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/common/ Modified: projects/jboss-osgi/trunk/bundle/blueprint/.classpath projects/jboss-osgi/trunk/bundle/blueprint/.project projects/jboss-osgi/trunk/bundle/blueprint/pom.xml Log: Start blueprint prototyping Copied: projects/jboss-osgi/trunk/bundle/blueprint (from rev 87817, projects/jboss-osgi/trunk/bundle/common) Property changes on: projects/jboss-osgi/trunk/bundle/blueprint ___________________________________________________________________ Name: svn:ignore + target felix-cache Name: svn:mergeinfo + Modified: projects/jboss-osgi/trunk/bundle/blueprint/.classpath =================================================================== --- projects/jboss-osgi/trunk/bundle/common/.classpath 2009-04-24 15:37:29 UTC (rev 87817) +++ projects/jboss-osgi/trunk/bundle/blueprint/.classpath 2009-04-24 17:35:14 UTC (rev 87823) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" output="target/classes" path="src/main/java"/> + <classpathentry kind="src" output="target/test-classes" path="src/test/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="output" path="target/classes"/> Modified: projects/jboss-osgi/trunk/bundle/blueprint/.project =================================================================== --- projects/jboss-osgi/trunk/bundle/common/.project 2009-04-24 15:37:29 UTC (rev 87817) +++ projects/jboss-osgi/trunk/bundle/blueprint/.project 2009-04-24 17:35:14 UTC (rev 87823) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>jboss-osgi-common</name> + <name>jboss-osgi-blueprint</name> <comment></comment> <projects> </projects> Modified: projects/jboss-osgi/trunk/bundle/blueprint/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundle/common/pom.xml 2009-04-24 15:37:29 UTC (rev 87817) +++ projects/jboss-osgi/trunk/bundle/blueprint/pom.xml 2009-04-24 17:35:14 UTC (rev 87823) @@ -1,9 +1,9 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <name>JBossOSGi - Bundle Common</name> - <artifactId>jboss-osgi-common</artifactId> - <packaging>bundle</packaging> + <name>JBossOSGi - Bundle Blueprint Service</name> + <artifactId>jboss-osgi-blueprint</artifactId> + <packaging>jar</packaging> <parent> <groupId>org.jboss.osgi</groupId> @@ -18,9 +18,9 @@  <dependencies> <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-spi</artifactId> - <scope>provided</scope> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-spi</artifactId> + <version>${version}</version> </dependency> <dependency> <groupId>org.osgi</groupId> @@ -32,32 +32,18 @@ <artifactId>org.osgi.compendium</artifactId> <scope>provided</scope> </dependency> + +  + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-runtime-felix</artifactId> + <version>${version}</version> + <scope>test</scope> + </dependency> </dependencies> <build> <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-SymbolicName>org.jboss.osgi.common</Bundle-SymbolicName> - <Export-Package> - org.jboss.osgi.common, - org.jboss.osgi.common.log - </Export-Package> - <Private-Package> - org.jboss.osgi.common.log.internal - </Private-Package> - <Import-Package> - org.osgi.framework;version=1.4, - org.osgi.service.log;version=1.3, - org.osgi.util.tracker - </Import-Package> - </instructions> - </configuration> - </plugin> </plugins> </build> Copied: projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/PropertiesBootstrapProvider.java (from rev 87817, projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss/osgi/common/StringConstants.java) =================================================================== --- projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/PropertiesBootstrapProvider.java (rev 0) +++ projects/jboss-osgi/trunk/bundle/blueprint/src/main/java/org/jboss/osgi/blueprint/PropertiesBootstrapProvider.java 2009-04-24 17:35:14 UTC (rev 87823) @@ -0,0 +1,136 @@ +/* + * 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.blueprint; + +//$Id$ + +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.Properties; + +import org.jboss.osgi.spi.NotImplementedException; +import org.jboss.osgi.spi.framework.OSGiBootstrapProvider; +import org.jboss.osgi.spi.framework.OSGiFramework; + +/** + * A simple properties based bootstrap provider + * + * @author thomas.diesler(a)jboss.com + * @since 24-Apr-2009 + */ +public class PropertiesBootstrapProvider implements OSGiBootstrapProvider +{ + /** The OSGi framework integration class: osgi.framework.impl */ + public static final String PROP_OSGI_FRAMEWORK_IMPL = "framework.impl"; + + /** The default framework beans property: jboss.osgi.bootstrap.config */ + public static final String OSGI_BOOTSTRAP_CONFIG = "jboss.osgi.bootstrap.config"; + /** The default framework beans: jboss-osgi-bootstrap-beans.xml */ + public static final String DEFAULT_OSGI_BOOTSTRAP_PROPERTIES = "jboss-osgi-bootstrap.properties"; + /** The default framework beans property: jboss.osgi.framework.config */ + public static final String OSGI_FRAMEWORK_CONFIG = "jboss.osgi.framework.config"; + /** The default framework beans: jboss-osgi-beans.xml */ + public static final String DEFAULT_OSGI_FRAMEWORK_PROPERTIES = "jboss-osgi-framework.properties"; + + private OSGiFramework framework; + private boolean configured; + + public void configure() + { + throw new NotImplementedException(); + } + + public void configure(URL urlConfig) + { + // Read the configuration properties + Properties props = new Properties(); + try + { + InputStream inStream = urlConfig.openStream(); + props.load(inStream); + inStream.close(); + } + catch (IOException ex) + { + throw new IllegalStateException("Cannot load properties from: " + urlConfig, ex); + } + + String frameworkImpl = props.getProperty(PROP_OSGI_FRAMEWORK_IMPL); + if (frameworkImpl == null) + throw new IllegalStateException("Cannot get : " + urlConfig); + + // Load the framework instance + try + { + ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); + Class<?> frameworkClass = ctxLoader.loadClass(frameworkImpl); + framework = (OSGiFramework)frameworkClass.newInstance(); + } + catch (Exception ex) + { + throw new IllegalStateException("Cannot load framework: " + frameworkImpl, ex); + } + + // Start the Framework + framework.start(); + } + + public void configure(String resourceConfig) + { + URL urlConfig = Thread.currentThread().getContextClassLoader().getResource(resourceConfig); + if (urlConfig == null) + throw new IllegalStateException("Cannot find resource: " + resourceConfig); + + configure(urlConfig); + } + + public void configure(InputStream streamConfig) + { + throw new NotImplementedException(); + } + + public OSGiFramework getFramework() + { + if (configured == false) + { + String defaultFrameworkProps = System.getProperty(OSGI_FRAMEWORK_CONFIG, DEFAULT_OSGI_FRAMEWORK_PROPERTIES); + configure(defaultFrameworkProps); + } + return framework; + } + + public OSGiFramework getFramework(String name) + { + throw new NotImplementedException(); + } + + public Object getInstance(String name) + { + throw new NotImplementedException(); + } + + public <T> T getInstance(String name, Class<T> expectedType) + { + throw new NotImplementedException(); + } +} Added: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/SystemBundleTestCase.java =================================================================== --- projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/SystemBundleTestCase.java (rev 0) +++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/SystemBundleTestCase.java 2009-04-24 17:35:14 UTC (rev 87823) @@ -0,0 +1,50 @@ +/* + * 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. + */ + + +//$Id$ +package org.jboss.test.osgi.blueprint; + +import org.jboss.osgi.spi.framework.OSGiBootstrap; +import org.jboss.osgi.spi.framework.OSGiBootstrapProvider; +import org.jboss.osgi.spi.framework.OSGiFramework; +import org.jboss.osgi.spi.junit.OSGiTest; +import org.osgi.framework.Bundle; + +/** + * Test OSGi System bundle access + * + * @author thomas.diesler(a)jboss.com + * @since 23-Jan-2009 + */ +public class SystemBundleTestCase extends OSGiTest +{ + public void testSystemBundle() + { + OSGiBootstrapProvider configProvider = OSGiBootstrap.getBootstrapProvider(); + OSGiFramework framework = configProvider.getFramework(); + Bundle bundle = framework.getSystemBundle(); + + assertEquals("BundleId == 0", 0, bundle.getBundleId()); + assertEquals("SymbolicName", "org.apache.felix.framework", bundle.getSymbolicName()); + } +} \ No newline at end of file Property changes on: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/SystemBundleTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/jboss-osgi-framework.properties =================================================================== --- projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/jboss-osgi-framework.properties (rev 0) +++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/jboss-osgi-framework.properties 2009-04-24 17:35:14 UTC (rev 87823) @@ -0,0 +1,9 @@ +# +# Properties read by the org.jboss.osgi.blueprint.PropertiesBootstrapProvider +# +# $Id: $ +# +framework.impl=org.jboss.osgi.felix.framework.FelixIntegration + +# properties passed on to the framework start with: 'framework.prop' +framework.prop.org.osgi.framework.storage.clean=onFirstInit \ No newline at end of file Added: projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/log4j.xml =================================================================== --- projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/log4j.xml (rev 0) +++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/log4j.xml 2009-04-24 17:35:14 UTC (rev 87823) @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> + +  +  +  + + <appender name="FILE" class="org.apache.log4j.FileAppender"> + <param name="File" value="${log4j.output.dir}/test.log"/> + <param name="Append" value="false"/> + <layout class="org.apache.log4j.PatternLayout"> +  + <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/> + </layout> + </appender> + +  +  +  + + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <param name="Target" value="System.out" /> + <param name="Threshold" value="INFO" /> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n" /> + </layout> + </appender> + +  +  +  + + <category name="org.hibernate"> + <priority value="INFO" /> + </category> + +  + +  + <category name="org.hibernate.engine.StatefulPersistenceContext.ProxyWarnLog"> + <priority value="ERROR" /> + </category> + +  + <category name="org.hibernate.SQL"> + <priority value="DEBUG" /> + </category> + +  + +  + <category name="httpclient.wire.header"> + <priority value="INFO" /> + </category> + +  +  +  + + <root> +  + <appender-ref ref="FILE"/> + </root> + +</log4j:configuration> Property changes on: projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/log4j.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider =================================================================== --- projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider (rev 0) +++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-04-24 17:35:14 UTC (rev 87823) @@ -0,0 +1 @@ +org.jboss.osgi.blueprint.PropertiesBootstrapProvider \ No newline at end of file

16 years, 8 months

1
0
0 / 0

JBoss-OSGI SVN: r87818 - in projects/jboss-osgi/trunk: microcontainer/osgi-int and 15 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-04-24 11:59:05 -0400 (Fri, 24 Apr 2009) New Revision: 87818 Added: projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/jboss-osgi-beans.xml projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider projects/jboss-osgi/trunk/runtime/felix/src/test/resources/jboss-osgi-beans.xml projects/jboss-osgi/trunk/runtime/felix/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/jboss-osgi-beans.xml projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix-beans.xml projects/jboss-osgi/trunk/testsuite/example/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix-beans.xml projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider Removed: projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/jboss-osgi-beans.xml projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider projects/jboss-osgi/trunk/runtime/felix/src/main/resources/jboss-osgi-beans.xml projects/jboss-osgi/trunk/runtime/felix/src/main/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/jboss-osgi-beans.xml projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider Modified: projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/runtime/felix/pom.xml projects/jboss-osgi/trunk/runtime/felix/scripts/assembly-bundles.xml projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrapProvider.java projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/internal/MicrocontainerBootstrapProvider.java projects/jboss-osgi/trunk/testsuite/example/pom.xml projects/jboss-osgi/trunk/testsuite/functional/pom.xml projects/jboss-osgi/trunk/testsuite/pom.xml Log: Remove dependencies on framework-config artefacts Modified: projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml =================================================================== --- projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml 2009-04-24 15:37:29 UTC (rev 87817) +++ projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml 2009-04-24 15:59:05 UTC (rev 87818) @@ -11,6 +11,11 @@ <version>1.0.0.Beta2</version> </parent> +  + <properties> + <surefire.args>${surefire.args.root}</surefire.args> + </properties> + <dependencies>  <dependency> Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-04-24 15:37:29 UTC (rev 87817) +++ projects/jboss-osgi/trunk/pom.xml 2009-04-24 15:59:05 UTC (rev 87818) @@ -29,8 +29,8 @@ <module>microcontainer</module> <module>repository</module> <module>spi</module> - <module>bundle</module> <module>runtime</module> + <module>bundle</module> <module>testsuite</module> </modules> @@ -399,21 +399,6 @@ <profiles>  - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <properties> - <microcontainer.outputDirectory>target/classes</microcontainer.outputDirectory> - <microcontainer.testOutputDirectory>target/tests-classes</microcontainer.testOutputDirectory> - </properties> - </profile> - -  @@ -434,39 +419,6 @@ </plugins> </build> </profile> - -  - <profile> - <id>eclipse</id> - <build> - <defaultGoal>process-test-resources</defaultGoal> - <plugins> - <plugin> - <artifactId>maven-eclipse-plugin</artifactId> - <executions> - <execution> - <id>eclipse</id> - <phase>process-test-resources</phase> - <goals> - <goal>eclipse</goal> - </goals> - </execution> - </executions> - <configuration> - <downloadSources>true</downloadSources> - <buildOutputDirectory>${microcontainer.outputDirectory}</buildOutputDirectory> - </configuration> - </plugin> - </plugins> - </build> - <properties> - <microcontainer.outputDirectory>eclipse-target/classes</microcontainer.outputDirectory> - <microcontainer.testOutputDirectory>eclipse-target/tests-classes</microcontainer.testOutputDirectory> - </properties> - </profile> </profiles> </project> Deleted: projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/jboss-osgi-beans.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/jboss-osgi-beans.xml 2009-04-24 15:37:29 UTC (rev 87817) +++ projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/jboss-osgi-beans.xml 2009-04-24 15:59:05 UTC (rev 87818) @@ -1,15 +0,0 @@ - -<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0"> - -  - <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.equinox.framework.EquinoxIntegration"> - <property name="properties"> - <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> - </map> - </property> - </bean> - -</deployment> Deleted: projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider =================================================================== --- projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-04-24 15:37:29 UTC (rev 87817) +++ projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-04-24 15:59:05 UTC (rev 87818) @@ -1 +0,0 @@ -org.jboss.osgi.spi.internal.MicrocontainerBootstrapProvider \ No newline at end of file Copied: projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/jboss-osgi-beans.xml (from rev 87644, projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/jboss-osgi-beans.xml) =================================================================== --- projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/jboss-osgi-beans.xml (rev 0) +++ projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/jboss-osgi-beans.xml 2009-04-24 15:59:05 UTC (rev 87818) @@ -0,0 +1,15 @@ + +<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0"> + +  + <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.equinox.framework.EquinoxIntegration"> + <property name="properties"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> + </map> + </property> + </bean> + +</deployment> Copied: projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider (from rev 87644, projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider) =================================================================== --- projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider (rev 0) +++ projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-04-24 15:59:05 UTC (rev 87818) @@ -0,0 +1 @@ +org.jboss.osgi.spi.internal.MicrocontainerBootstrapProvider \ No newline at end of file Modified: projects/jboss-osgi/trunk/runtime/felix/pom.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-24 15:37:29 UTC (rev 87817) +++ projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-24 15:59:05 UTC (rev 87818) @@ -40,18 +40,6 @@ <artifactId>org.apache.felix.log</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-common</artifactId> - <version>${version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-logging</artifactId> - <version>${version}</version> - <scope>provided</scope> - </dependency>  <dependency> Modified: projects/jboss-osgi/trunk/runtime/felix/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/scripts/assembly-bundles.xml 2009-04-24 15:37:29 UTC (rev 87817) +++ projects/jboss-osgi/trunk/runtime/felix/scripts/assembly-bundles.xml 2009-04-24 15:59:05 UTC (rev 87818) @@ -16,8 +16,6 @@ <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> <includes> <include>*:org.apache.felix.log:jar</include> - <include>*:jboss-osgi-common:jar</include> - <include>*:jboss-osgi-logging:jar</include> </includes> <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope> Deleted: projects/jboss-osgi/trunk/runtime/felix/src/main/resources/jboss-osgi-beans.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/src/main/resources/jboss-osgi-beans.xml 2009-04-24 15:37:29 UTC (rev 87817) +++ projects/jboss-osgi/trunk/runtime/felix/src/main/resources/jboss-osgi-beans.xml 2009-04-24 15:59:05 UTC (rev 87818) @@ -1,49 +0,0 @@ - -<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0"> - -  - <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.felix.framework.FelixIntegration"> - <property name="properties"> - <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> - <entry> - <key>org.osgi.framework.system.packages</key> - <value> - org.jboss.osgi.spi.logging, - org.osgi.framework; version=1.4, - org.osgi.service.log; version=1.3, - org.osgi.util.tracker; version=1.3, - -  - javax.management, - javax.naming, - javax.net, - javax.net.ssl, - org.apache.log4j, - org.jboss.logging, - org.jboss.util, - org.jboss.util.id, - org.jboss.util.threadpool, - org.jboss.util.propertyeditor, - </value> - </entry> -  - <entry><key>org.jboss.osgi.service.remote.log.reader</key><value>true</value></entry> - <entry><key>org.jboss.osgi.service.remote.log.host</key><value>localhost</value></entry> - <entry><key>org.jboss.osgi.service.remote.log.port</key><value>5400</value></entry> - </map> - </property> - <property name="autoStart"> - <list elementClass="java.net.URL"> - <value>file://${test.archive.directory}/bundles/org.apache.felix.log.jar</value> - <value>file://${test.archive.directory}/bundles/jboss-osgi-common.jar</value> - <value>file://${test.archive.directory}/bundles/jboss-osgi-logging.jar</value> - </list> - </property> - </bean> - -</deployment> Deleted: projects/jboss-osgi/trunk/runtime/felix/src/main/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/src/main/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-04-24 15:37:29 UTC (rev 87817) +++ projects/jboss-osgi/trunk/runtime/felix/src/main/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-04-24 15:59:05 UTC (rev 87818) @@ -1 +0,0 @@ -org.jboss.osgi.spi.internal.MicrocontainerBootstrapProvider \ No newline at end of file Copied: projects/jboss-osgi/trunk/runtime/felix/src/test/resources/jboss-osgi-beans.xml (from rev 87644, projects/jboss-osgi/trunk/runtime/felix/src/main/resources/jboss-osgi-beans.xml) =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/src/test/resources/jboss-osgi-beans.xml (rev 0) +++ projects/jboss-osgi/trunk/runtime/felix/src/test/resources/jboss-osgi-beans.xml 2009-04-24 15:59:05 UTC (rev 87818) @@ -0,0 +1,15 @@ + +<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0"> + +  + <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.felix.framework.FelixIntegration"> + <property name="properties"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> + </map> + </property> + </bean> + +</deployment> Copied: projects/jboss-osgi/trunk/runtime/felix/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider (from rev 87644, projects/jboss-osgi/trunk/runtime/felix/src/main/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider) =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider (rev 0) +++ projects/jboss-osgi/trunk/runtime/felix/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-04-24 15:59:05 UTC (rev 87818) @@ -0,0 +1 @@ +org.jboss.osgi.spi.internal.MicrocontainerBootstrapProvider \ No newline at end of file Deleted: projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/jboss-osgi-beans.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/jboss-osgi-beans.xml 2009-04-24 15:37:29 UTC (rev 87817) +++ projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/jboss-osgi-beans.xml 2009-04-24 15:59:05 UTC (rev 87818) @@ -1,15 +0,0 @@ - -<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0"> - -  - <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.knopflerfish.KnopflerfishIntegration"> - <property name="properties"> - <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> - </map> - </property> - </bean> - -</deployment> Deleted: projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider =================================================================== --- projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-04-24 15:37:29 UTC (rev 87817) +++ projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-04-24 15:59:05 UTC (rev 87818) @@ -1 +0,0 @@ -org.jboss.osgi.spi.internal.MicrocontainerBootstrapProvider \ No newline at end of file Copied: projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/jboss-osgi-beans.xml (from rev 87644, projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/jboss-osgi-beans.xml) =================================================================== --- projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/jboss-osgi-beans.xml (rev 0) +++ projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/jboss-osgi-beans.xml 2009-04-24 15:59:05 UTC (rev 87818) @@ -0,0 +1,15 @@ + +<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0"> + +  + <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.knopflerfish.KnopflerfishIntegration"> + <property name="properties"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> + </map> + </property> + </bean> + +</deployment> Copied: projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider (from rev 87644, projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider) =================================================================== --- projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider (rev 0) +++ projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-04-24 15:59:05 UTC (rev 87818) @@ -0,0 +1 @@ +org.jboss.osgi.spi.internal.MicrocontainerBootstrapProvider \ No newline at end of file Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrapProvider.java =================================================================== --- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrapProvider.java 2009-04-24 15:37:29 UTC (rev 87817) +++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrapProvider.java 2009-04-24 15:59:05 UTC (rev 87818) @@ -40,10 +40,6 @@ { /** The Framework bean name - jboss.osgi:service=Framework */ public static final String DEFAULT_FRAMEWORK_NAME = "jboss.osgi:service=Framework"; - /** The default framework beans: jboss-osgi-bootstrap-beans.xml */ - public static final String DEFAULT_BOOTSTRAP_BEANS = "jboss-osgi-bootstrap-beans.xml"; - /** The default framework beans: jboss-osgi-beans.xml */ - public static final String DEFAULT_FRAMEWORK_BEANS = "jboss-osgi-beans.xml"; /** * Get the OSGiFramework that registerd with the default name Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/internal/MicrocontainerBootstrapProvider.java =================================================================== --- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/internal/MicrocontainerBootstrapProvider.java 2009-04-24 15:37:29 UTC (rev 87817) +++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/internal/MicrocontainerBootstrapProvider.java 2009-04-24 15:59:05 UTC (rev 87818) @@ -42,6 +42,15 @@ */ public class MicrocontainerBootstrapProvider extends AbstractInstanceProvider implements OSGiBootstrapProvider { + /** The default framework beans property: org.jboss.osgi.default.framework.beans */ + public static final String DEFAULT_BOOTSTRAP_BEANS_PROP = "org.jboss.osgi.default.bootstrap.beans"; + /** The default framework beans: jboss-osgi-bootstrap-beans.xml */ + public static final String DEFAULT_BOOTSTRAP_BEANS = "jboss-osgi-bootstrap-beans.xml"; + /** The default framework beans property: org.jboss.osgi.default.framework.beans */ + public static final String DEFAULT_FRAMEWORK_BEANS_PROP = "org.jboss.osgi.default.framework.beans"; + /** The default framework beans: jboss-osgi-beans.xml */ + public static final String DEFAULT_FRAMEWORK_BEANS = "jboss-osgi-beans.xml"; + private EmbeddedBeansDeployer deployer = new EmbeddedBeansDeployer(); private boolean bootstraped; private boolean configured; @@ -56,7 +65,7 @@ OSGiFramework framework = getInstance(beanName, OSGiFramework.class); if (framework == null && configured == false) { - configure(DEFAULT_FRAMEWORK_BEANS); + configureWithDefaultBeans(); framework = getInstance(beanName, OSGiFramework.class); } return framework; @@ -64,9 +73,15 @@ public void configure() { - configure(DEFAULT_FRAMEWORK_BEANS); + configureWithDefaultBeans(); } + private void configureWithDefaultBeans() + { + String defaultFrameworkBeans = System.getProperty(DEFAULT_FRAMEWORK_BEANS_PROP, DEFAULT_FRAMEWORK_BEANS); + configure(defaultFrameworkBeans); + } + public void configure(InputStream streamConfig) { throw new NotImplementedException("Cannot bootstrap JBossMC from InputStream"); @@ -115,7 +130,8 @@ private void bootstrapKernel() { // Deploy the bootstrap beans if DEFAULT_BOOTSTRAP_BEANS is on the classpath - URL urlBootstrap = Thread.currentThread().getContextClassLoader().getResource(DEFAULT_BOOTSTRAP_BEANS); + String defaultBootstrapBeans = System.getProperty(DEFAULT_BOOTSTRAP_BEANS_PROP, DEFAULT_BOOTSTRAP_BEANS); + URL urlBootstrap = Thread.currentThread().getContextClassLoader().getResource(defaultBootstrapBeans); if (urlBootstrap != null) deployer.deploy(urlBootstrap); } Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-04-24 15:37:29 UTC (rev 87817) +++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-04-24 15:59:05 UTC (rev 87818) @@ -17,7 +17,6 @@  <properties> - <surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/resources/tst.policy</surefire.security.args> </properties>  @@ -188,193 +187,6 @@  <profiles> - -  - <profile> - <id>framework-default</id> - <activation> - <property> - <name>!framework</name> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> - <version>${version}</version> - <classifier>config</classifier> - </dependency> - </dependencies> - </profile> - -  - <profile> - <id>framework-felix</id> - <activation> - <property> - <name>!framework</name> - <value>felix</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> - <version>${version}</version> - <classifier>config</classifier> - </dependency> - </dependencies> - </profile> - -  - <profile> - <id>framework-equinox</id> - <activation> - <property> - <name>!framework</name> - <value>equinox</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-equinox</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-equinox</artifactId> - <version>${version}</version> - <classifier>config</classifier> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </profile> - -  - <profile> - <id>framework-knopflerfish</id> - <activation> - <property> - <name>!framework</name> - <value>knopflerfish</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-knopflerfish</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-knopflerfish</artifactId> - <version>${version}</version> - <classifier>config</classifier> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </profile> - -  - <profile> - <id>embedded-tesing</id> - <activation> - <property> - <name>!jboss.bind.address</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> -  - <exclude>org/jboss/test/osgi/deployer/**</exclude> - <exclude>org/jboss/test/osgi/**/*RemoteTestCase.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - -  - <profile> - <id>remote-tesing</id> - <activation> - <property> - <name>jboss.bind.address</name> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-client</artifactId> - <scope>test</scope> - <type>pom</type> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> -  - <excludes> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> </profiles> </project> Copied: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix-beans.xml (from rev 87644, projects/jboss-osgi/trunk/runtime/felix/src/main/resources/jboss-osgi-beans.xml) =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix-beans.xml (rev 0) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix-beans.xml 2009-04-24 15:59:05 UTC (rev 87818) @@ -0,0 +1,49 @@ + +<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0"> + +  + <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.felix.framework.FelixIntegration"> + <property name="properties"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> + <entry> + <key>org.osgi.framework.system.packages</key> + <value> + org.jboss.osgi.spi.logging, + org.osgi.framework; version=1.4, + org.osgi.service.log; version=1.3, + org.osgi.util.tracker; version=1.3, + +  + javax.management, + javax.naming, + javax.net, + javax.net.ssl, + org.apache.log4j, + org.jboss.logging, + org.jboss.util, + org.jboss.util.id, + org.jboss.util.threadpool, + org.jboss.util.propertyeditor, + </value> + </entry> +  + <entry><key>org.jboss.osgi.service.remote.log.reader</key><value>true</value></entry> + <entry><key>org.jboss.osgi.service.remote.log.host</key><value>localhost</value></entry> + <entry><key>org.jboss.osgi.service.remote.log.port</key><value>5400</value></entry> + </map> + </property> + <property name="autoStart"> + <list elementClass="java.net.URL"> + <value>file://${test.archive.directory}/bundles/org.apache.felix.log.jar</value> + <value>file://${test.archive.directory}/bundles/jboss-osgi-common.jar</value> + <value>file://${test.archive.directory}/bundles/jboss-osgi-logging.jar</value> + </list> + </property> + </bean> + +</deployment> Added: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider (rev 0) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-04-24 15:59:05 UTC (rev 87818) @@ -0,0 +1 @@ +org.jboss.osgi.spi.internal.MicrocontainerBootstrapProvider \ No newline at end of file Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-04-24 15:37:29 UTC (rev 87817) +++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-04-24 15:59:05 UTC (rev 87818) @@ -17,7 +17,6 @@  <properties> - <surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/resources/tst.policy</surefire.security.args> </properties>  @@ -139,193 +138,8 @@ </plugins> </build> +  <profiles> - -  - <profile> - <id>framework-default</id> - <activation> - <property> - <name>!framework</name> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> - <version>${version}</version> - <classifier>config</classifier> - </dependency> - </dependencies> - </profile> - -  - <profile> - <id>framework-felix</id> - <activation> - <property> - <name>!framework</name> - <value>felix</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> - <version>${version}</version> - <classifier>config</classifier> - </dependency> - </dependencies> - </profile> - -  - <profile> - <id>framework-equinox</id> - <activation> - <property> - <name>!framework</name> - <value>equinox</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-equinox</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-equinox</artifactId> - <version>${version}</version> - <classifier>config</classifier> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </profile> - -  - <profile> - <id>framework-knopflerfish</id> - <activation> - <property> - <name>!framework</name> - <value>knopflerfish</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-knopflerfish</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-knopflerfish</artifactId> - <version>${version}</version> - <classifier>config</classifier> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </profile> - -  - <profile> - <id>embedded-tesing</id> - <activation> - <property> - <name>!jboss.bind.address</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> -  - <exclude>org/jboss/test/osgi/deployer/**</exclude> - <exclude>org/jboss/test/osgi/**/*RemoteTestCase.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - -  - <profile> - <id>remote-tesing</id> - <activation> - <property> - <name>jboss.bind.address</name> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-client</artifactId> - <scope>test</scope> - <type>pom</type> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> </profiles> </project> Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix-beans.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix-beans.xml (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix-beans.xml 2009-04-24 15:59:05 UTC (rev 87818) @@ -0,0 +1,49 @@ + +<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0"> + +  + <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.felix.framework.FelixIntegration"> + <property name="properties"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> + <entry> + <key>org.osgi.framework.system.packages</key> + <value> + org.jboss.osgi.spi.logging, + org.osgi.framework; version=1.4, + org.osgi.service.log; version=1.3, + org.osgi.util.tracker; version=1.3, + +  + javax.management, + javax.naming, + javax.net, + javax.net.ssl, + org.apache.log4j, + org.jboss.logging, + org.jboss.util, + org.jboss.util.id, + org.jboss.util.threadpool, + org.jboss.util.propertyeditor, + </value> + </entry> +  + <entry><key>org.jboss.osgi.service.remote.log.reader</key><value>true</value></entry> + <entry><key>org.jboss.osgi.service.remote.log.host</key><value>localhost</value></entry> + <entry><key>org.jboss.osgi.service.remote.log.port</key><value>5400</value></entry> + </map> + </property> + <property name="autoStart"> + <list elementClass="java.net.URL"> + <value>file://${test.archive.directory}/bundles/org.apache.felix.log.jar</value> + <value>file://${test.archive.directory}/bundles/jboss-osgi-common.jar</value> + <value>file://${test.archive.directory}/bundles/jboss-osgi-logging.jar</value> + </list> + </property> + </bean> + +</deployment> Property changes on: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix-beans.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-04-24 15:59:05 UTC (rev 87818) @@ -0,0 +1 @@ +org.jboss.osgi.spi.internal.MicrocontainerBootstrapProvider \ No newline at end of file Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-04-24 15:37:29 UTC (rev 87817) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-04-24 15:59:05 UTC (rev 87818) @@ -20,4 +20,244 @@ <module>functional</module> </modules> +  + <profiles> + +  + <profile> + <id>framework-default</id> + <activation> + <property> + <name>!framework</name> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-runtime-felix</artifactId> + <version>${version}</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemProperties> + <property> + <name>test.archive.directory</name> + <value>${project.build.directory}/test-libs</value> + </property> + <property> + <name>log4j.output.dir</name> + <value>${basedir}/target</value> + </property> + <property> + <name>org.jboss.osgi.default.framework.beans</name> + <value>jboss-osgi-felix-beans.xml</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> + +  + <profile> + <id>framework-felix</id> + <activation> + <property> + <name>!framework</name> + <value>felix</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-runtime-felix</artifactId> + <version>${version}</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemProperties> + <property> + <name>test.archive.directory</name> + <value>${project.build.directory}/test-libs</value> + </property> + <property> + <name>log4j.output.dir</name> + <value>${basedir}/target</value> + </property> + <property> + <name>org.jboss.osgi.default.framework.beans</name> + <value>jboss-osgi-felix-beans.xml</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> + +  + <profile> + <id>framework-equinox</id> + <activation> + <property> + <name>!framework</name> + <value>equinox</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-runtime-equinox</artifactId> + <version>${version}</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skipTests>true</skipTests> + <systemProperties> + <property> + <name>test.archive.directory</name> + <value>${project.build.directory}/test-libs</value> + </property> + <property> + <name>log4j.output.dir</name> + <value>${basedir}/target</value> + </property> + <property> + <name>org.jboss.osgi.default.framework.beans</name> + <value>jboss-osgi-equinox-beans.xml</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> + +  + <profile> + <id>framework-knopflerfish</id> + <activation> + <property> + <name>!framework</name> + <value>knopflerfish</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-runtime-knopflerfish</artifactId> + <version>${version}</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skipTests>true</skipTests> + <systemProperties> + <property> + <name>test.archive.directory</name> + <value>${project.build.directory}/test-libs</value> + </property> + <property> + <name>log4j.output.dir</name> + <value>${basedir}/target</value> + </property> + <property> + <name>org.jboss.osgi.default.framework.beans</name> + <value>jboss-osgi-knopflerfish-beans.xml</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> + +  + <profile> + <id>embedded-tesing</id> + <activation> + <property> + <name>!jboss.bind.address</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> +  + <exclude>org/jboss/test/osgi/deployer/**</exclude> + <exclude>org/jboss/test/osgi/**/*RemoteTestCase.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + +  + <profile> + <id>remote-tesing</id> + <activation> + <property> + <name>jboss.bind.address</name> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-client</artifactId> + <scope>test</scope> + <type>pom</type> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> + </project>

16 years, 8 months

1
0
0 / 0

JBoss-OSGI SVN: r87719 - projects/jboss-osgi/trunk/build/docbook/en/modules.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-04-23 07:33:23 -0400 (Thu, 23 Apr 2009) New Revision: 87719 Modified: projects/jboss-osgi/trunk/build/docbook/en/modules/ch05-provided-bundles.xml Log: fix typo Modified: projects/jboss-osgi/trunk/build/docbook/en/modules/ch05-provided-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/build/docbook/en/modules/ch05-provided-bundles.xml 2009-04-23 11:20:53 UTC (rev 87718) +++ projects/jboss-osgi/trunk/build/docbook/en/modules/ch05-provided-bundles.xml 2009-04-23 11:33:23 UTC (rev 87719) @@ -84,7 +84,7 @@ </tr> <tr valign="top"> <td>org.jboss.osgi.service.remote.log.port</td> - <td>localhost</td> + <td>5400</td> <td>The remote port that log messages are sent to</td> </tr> </table>

16 years, 8 months

1
0
0 / 0

JBoss-OSGI SVN: r87675 - projects/jboss-osgi/trunk/build/docbook/en/modules.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-04-22 10:55:38 -0400 (Wed, 22 Apr 2009) New Revision: 87675 Modified: projects/jboss-osgi/trunk/build/docbook/en/modules/ch01-introduction.xml Log: Fix typos Modified: projects/jboss-osgi/trunk/build/docbook/en/modules/ch01-introduction.xml =================================================================== --- projects/jboss-osgi/trunk/build/docbook/en/modules/ch01-introduction.xml 2009-04-22 14:27:03 UTC (rev 87674) +++ projects/jboss-osgi/trunk/build/docbook/en/modules/ch01-introduction.xml 2009-04-22 14:55:38 UTC (rev 87675) @@ -45,8 +45,8 @@ <emphasis role="bold">Should Java EE developers adopt the OSGi programming model?</emphasis> <para>Probably not. The OSGi runtime may be used internally by Java EE container providers to achieve the desired isolation and configuration - flexibility that the container whishes to provide. At the application programming level, the Java EE model will continue to exist in its own right, - wheras the OSGi model may provide the more suitable runtime environment for applications that require the modular isolation, security and lifecycle + flexibility that the container wishes to provide. At the application programming level, the Java EE model will continue to exist in its own right, + whereas the OSGi model may provide the more suitable runtime environment for applications that require the modular isolation, security and lifecycle management that OSGi offers.</para> </sect1> @@ -142,7 +142,7 @@ </imageobject> </mediaobject> - <para>Appart from bundle versions, OSGi Attribute Matching is a generic mechanism to allow the importer and exporter to influence the + <para>Apart from bundle versions, OSGi Attribute Matching is a generic mechanism to allow the importer and exporter to influence the matching process in a declarative way. For example, the following statements will match.</para> <programlisting>

16 years, 8 months

1
0
0 / 0

JBoss-OSGI SVN: r87674 - projects/jboss-osgi/trunk.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-04-22 10:27:03 -0400 (Wed, 22 Apr 2009) New Revision: 87674 Modified: projects/jboss-osgi/trunk/pom.xml Log: [JBOSGI-71] Upgrade to IzPack 4.3.0 Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-04-22 13:33:48 UTC (rev 87673) +++ projects/jboss-osgi/trunk/pom.xml 2009-04-22 14:27:03 UTC (rev 87674) @@ -46,7 +46,7 @@ <version.felix.metatype>1.0.2</version.felix.metatype> <version.felix.osgi.core>1.2.0</version.felix.osgi.core> <version.felix.webconsole>1.2.8</version.felix.webconsole> - <version.izpack>4.2.1</version.izpack> + <version.izpack>4.3.0</version.izpack> <version.javax.servlet>2.4</version.javax.servlet> <version.jbossas>5.0.1.GA</version.jbossas> <version.jboss.aop>2.0.1.GA</version.jboss.aop> @@ -333,15 +333,6 @@ </snapshots> </repository> <repository> - <id>repository.codehaus.org</id> - <name>Codehaus Repository</name> - <layout>default</layout> - <url>http://repository.codehaus.org</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - <repository> <id>aQute</id> <url>http://www.aQute.biz/repo</url> </repository>

16 years, 8 months

1
0
0 / 0

JBoss-OSGI SVN: r87670 - in projects/jboss-osgi/trunk: build/distribution and 19 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-04-22 09:24:54 -0400 (Wed, 22 Apr 2009) New Revision: 87670 Modified: projects/jboss-osgi/trunk/build/distribution/pom.xml projects/jboss-osgi/trunk/build/docbook/pom.xml projects/jboss-osgi/trunk/bundle/common/pom.xml projects/jboss-osgi/trunk/bundle/logging/pom.xml projects/jboss-osgi/trunk/bundle/pom.xml projects/jboss-osgi/trunk/bundle/remotelog/pom.xml projects/jboss-osgi/trunk/bundle/webconsole/pom.xml projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml projects/jboss-osgi/trunk/microcontainer/pom.xml projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/repository/api/pom.xml projects/jboss-osgi/trunk/repository/pom.xml projects/jboss-osgi/trunk/runtime/deployer/pom.xml projects/jboss-osgi/trunk/runtime/equinox/pom.xml projects/jboss-osgi/trunk/runtime/felix/pom.xml projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml projects/jboss-osgi/trunk/runtime/pom.xml projects/jboss-osgi/trunk/spi/pom.xml projects/jboss-osgi/trunk/testsuite/example/pom.xml projects/jboss-osgi/trunk/testsuite/functional/pom.xml projects/jboss-osgi/trunk/testsuite/pom.xml Log: version-1.0.0.Beta2 Modified: projects/jboss-osgi/trunk/build/distribution/pom.xml =================================================================== --- projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-04-22 11:42:47 UTC (rev 87669) +++ projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-04-22 13:24:54 UTC (rev 87670) @@ -24,7 +24,7 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi</artifactId> - <version>1.0.0.Beta1</version> + <version>1.0.0.Beta2</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: projects/jboss-osgi/trunk/build/docbook/pom.xml =================================================================== --- projects/jboss-osgi/trunk/build/docbook/pom.xml 2009-04-22 11:42:47 UTC (rev 87669) +++ projects/jboss-osgi/trunk/build/docbook/pom.xml 2009-04-22 13:24:54 UTC (rev 87670) @@ -23,7 +23,7 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi</artifactId> - <version>1.0.0.Beta1</version> + <version>1.0.0.Beta2</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: projects/jboss-osgi/trunk/bundle/common/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundle/common/pom.xml 2009-04-22 11:42:47 UTC (rev 87669) +++ projects/jboss-osgi/trunk/bundle/common/pom.xml 2009-04-22 13:24:54 UTC (rev 87670) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-bundle</artifactId> - <version>1.0.0.Beta1</version> + <version>1.0.0.Beta2</version> </parent>  Modified: projects/jboss-osgi/trunk/bundle/logging/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundle/logging/pom.xml 2009-04-22 11:42:47 UTC (rev 87669) +++ projects/jboss-osgi/trunk/bundle/logging/pom.xml 2009-04-22 13:24:54 UTC (rev 87670) @@ -12,7 +12,7 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-bundle</artifactId> - <version>1.0.0.Beta1</version> + <version>1.0.0.Beta2</version> </parent>  Modified: projects/jboss-osgi/trunk/bundle/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundle/pom.xml 2009-04-22 11:42:47 UTC (rev 87669) +++ projects/jboss-osgi/trunk/bundle/pom.xml 2009-04-22 13:24:54 UTC (rev 87670) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi</artifactId> - <version>1.0.0.Beta1</version> + <version>1.0.0.Beta2</version> </parent>  Modified: projects/jboss-osgi/trunk/bundle/remotelog/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundle/remotelog/pom.xml 2009-04-22 11:42:47 UTC (rev 87669) +++ projects/jboss-osgi/trunk/bundle/remotelog/pom.xml 2009-04-22 13:24:54 UTC (rev 87670) @@ -12,7 +12,7 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-bundle</artifactId> - <version>1.0.0.Beta1</version> + <version>1.0.0.Beta2</version> </parent>  Modified: projects/jboss-osgi/trunk/bundle/webconsole/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundle/webconsole/pom.xml 2009-04-22 11:42:47 UTC (rev 87669) +++ projects/jboss-osgi/trunk/bundle/webconsole/pom.xml 2009-04-22 13:24:54 UTC (rev 87670) @@ -11,7 +11,7 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-bundle</artifactId> - <version>1.0.0.Beta1</version> + <version>1.0.0.Beta2</version> </parent>  Modified: projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml =================================================================== --- projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml 2009-04-22 11:42:47 UTC (rev 87669) +++ projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml 2009-04-22 13:24:54 UTC (rev 87670) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-microcontainer</artifactId> - <version>1.0.0.Beta1</version> + <version>1.0.0.Beta2</version> </parent> <dependencies> Modified: projects/jboss-osgi/trunk/microcontainer/pom.xml =================================================================== --- projects/jboss-osgi/trunk/microcontainer/pom.xml 2009-04-22 11:42:47 UTC (rev 87669) +++ projects/jboss-osgi/trunk/microcontainer/pom.xml 2009-04-22 13:24:54 UTC (rev 87670) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi</artifactId> - <version>1.0.0.Beta1</version> + <version>1.0.0.Beta2</version> </parent> <modules> Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-04-22 11:42:47 UTC (rev 87669) +++ projects/jboss-osgi/trunk/pom.xml 2009-04-22 13:24:54 UTC (rev 87670) @@ -7,7 +7,7 @@ <artifactId>jboss-osgi</artifactId> <packaging>pom</packaging> - <version>1.0.0.Beta1</version> + <version>1.0.0.Beta2</version> <parent> <groupId>org.jboss</groupId> Modified: projects/jboss-osgi/trunk/repository/api/pom.xml =================================================================== --- projects/jboss-osgi/trunk/repository/api/pom.xml 2009-04-22 11:42:47 UTC (rev 87669) +++ projects/jboss-osgi/trunk/repository/api/pom.xml 2009-04-22 13:24:54 UTC (rev 87670) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-repository</artifactId> - <version>1.0.0.Beta1</version> + <version>1.0.0.Beta2</version> </parent>  Modified: projects/jboss-osgi/trunk/repository/pom.xml =================================================================== --- projects/jboss-osgi/trunk/repository/pom.xml 2009-04-22 11:42:47 UTC (rev 87669) +++ projects/jboss-osgi/trunk/repository/pom.xml 2009-04-22 13:24:54 UTC (rev 87670) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi</artifactId> - <version>1.0.0.Beta1</version> + <version>1.0.0.Beta2</version> </parent> <modules> Modified: projects/jboss-osgi/trunk/runtime/deployer/pom.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/deployer/pom.xml 2009-04-22 11:42:47 UTC (rev 87669) +++ projects/jboss-osgi/trunk/runtime/deployer/pom.xml 2009-04-22 13:24:54 UTC (rev 87670) @@ -12,7 +12,7 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-runtime</artifactId> - <version>1.0.0.Beta1</version> + <version>1.0.0.Beta2</version> </parent>  Modified: projects/jboss-osgi/trunk/runtime/equinox/pom.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-04-22 11:42:47 UTC (rev 87669) +++ projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-04-22 13:24:54 UTC (rev 87670) @@ -12,7 +12,7 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-runtime</artifactId> - <version>1.0.0.Beta1</version> + <version>1.0.0.Beta2</version> </parent>  Modified: projects/jboss-osgi/trunk/runtime/felix/pom.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-22 11:42:47 UTC (rev 87669) +++ projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-22 13:24:54 UTC (rev 87670) @@ -12,7 +12,7 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-runtime</artifactId> - <version>1.0.0.Beta1</version> + <version>1.0.0.Beta2</version> </parent>  Modified: projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml 2009-04-22 11:42:47 UTC (rev 87669) +++ projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml 2009-04-22 13:24:54 UTC (rev 87670) @@ -12,7 +12,7 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-runtime</artifactId> - <version>1.0.0.Beta1</version> + <version>1.0.0.Beta2</version> </parent>  Modified: projects/jboss-osgi/trunk/runtime/pom.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/pom.xml 2009-04-22 11:42:47 UTC (rev 87669) +++ projects/jboss-osgi/trunk/runtime/pom.xml 2009-04-22 13:24:54 UTC (rev 87670) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi</artifactId> - <version>1.0.0.Beta1</version> + <version>1.0.0.Beta2</version> </parent> <modules> Modified: projects/jboss-osgi/trunk/spi/pom.xml =================================================================== --- projects/jboss-osgi/trunk/spi/pom.xml 2009-04-22 11:42:47 UTC (rev 87669) +++ projects/jboss-osgi/trunk/spi/pom.xml 2009-04-22 13:24:54 UTC (rev 87670) @@ -13,7 +13,7 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi</artifactId> - <version>1.0.0.Beta1</version> + <version>1.0.0.Beta2</version> </parent>  Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-04-22 11:42:47 UTC (rev 87669) +++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-04-22 13:24:54 UTC (rev 87670) @@ -12,7 +12,7 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-testsuite</artifactId> - <version>1.0.0.Beta1</version> + <version>1.0.0.Beta2</version> </parent>  Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-04-22 11:42:47 UTC (rev 87669) +++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-04-22 13:24:54 UTC (rev 87670) @@ -12,7 +12,7 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-testsuite</artifactId> - <version>1.0.0.Beta1</version> + <version>1.0.0.Beta2</version> </parent>  Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-04-22 11:42:47 UTC (rev 87669) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-04-22 13:24:54 UTC (rev 87670) @@ -12,7 +12,7 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi</artifactId> - <version>1.0.0.Beta1</version> + <version>1.0.0.Beta2</version> </parent> <modules>

16 years, 8 months

1
0
0 / 0

JBoss-OSGI SVN: r87669 - projects/jboss-osgi/tags.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-04-22 07:42:47 -0400 (Wed, 22 Apr 2009) New Revision: 87669 Added: projects/jboss-osgi/tags/jboss-osgi-1.0.0.Beta1/ Log: Release 1.0.0.Beta1 Copied: projects/jboss-osgi/tags/jboss-osgi-1.0.0.Beta1 (from rev 87668, projects/jboss-osgi/trunk)

16 years, 8 months

1
0
0 / 0

JBoss-OSGI SVN: r87667 - projects/jboss-osgi/trunk/build/docbook/en/modules.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-04-22 06:05:25 -0400 (Wed, 22 Apr 2009) New Revision: 87667 Modified: projects/jboss-osgi/trunk/build/docbook/en/modules/ch06-provided-examples.xml Log: minor docbook edit Modified: projects/jboss-osgi/trunk/build/docbook/en/modules/ch06-provided-examples.xml =================================================================== --- projects/jboss-osgi/trunk/build/docbook/en/modules/ch06-provided-examples.xml 2009-04-22 10:03:09 UTC (rev 87666) +++ projects/jboss-osgi/trunk/build/docbook/en/modules/ch06-provided-examples.xml 2009-04-22 10:05:25 UTC (rev 87667) @@ -142,7 +142,7 @@ </sect1> <sect1 xml:id="SecMicrocontainerServiceExample"> - <title>Microcontainer Service Example</title> + <title>MC Service Example</title> <para>The <emphasis role="bold">example-microcontainer.jar</emphasis> bundle contains a Service that registers an MBean with the <ulink url="http://java.sun.com/j2se/1.5.0/docs/api/javax/management/MBeanServer.html">MBeanServer</ulink>.

16 years, 8 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

jboss-osgi-commits April 2009