February 2010 - jboss-osgi-commits

JBoss-OSGI SVN: r100477 - in projects/jboss-osgi: projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers and 18 other directories.

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

Author: thomas.diesler(a)jboss.com Date: 2010-02-05 07:46:56 -0500 (Fri, 05 Feb 2010) New Revision: 100477 Added: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoading.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/javax/ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/javax/xml/ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/javax/xml/ws/ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/javax/xml/ws/WebServiceException.java projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi287/jbosgi287-bundleC.bnd Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderPolicy.java projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/OSGiModuleDeployerTempWorkaround.java projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/testsuite/example/pom.xml projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/jaxb/JAXBTestCase.java projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/testsuite/functional/scripts/antrun-test-jars.xml projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGi151TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi287/OSGi287TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/OSGi38TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGi41TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/testsuite/pom.xml Log: [JBOSGI-145] JAXB classes are loaded from the system classpath Prevent leakage from packages in common/lib into the OSGi classspace Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderPolicy.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderPolicy.java 2010-02-05 10:53:42 UTC (rev 100476) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderPolicy.java 2010-02-05 12:46:56 UTC (rev 100477) @@ -52,7 +52,7 @@ * The ClassLoaderPolicy for OSGi bundles. * * @author Thomas.Diesler(a)jboss.com - * @since 11-Sep-2209 + * @since 11-Sep-2009 */ public class OSGiClassLoaderPolicy extends VFSClassLoaderPolicy { Added: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoading.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoading.java (rev 0) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoading.java 2010-02-05 12:46:56 UTC (rev 100477) @@ -0,0 +1,37 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2009, Red Hat Middleware LLC, and individual contributors +* as indicated by the @author tags. See the copyright.txt file in the +* distribution for a full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.osgi.framework.classloading; + +// $Id$ + +import org.jboss.classloading.spi.dependency.ClassLoading; + +/** + * The ClassLoading for OSGi bundles. + * + * @author Thomas.Diesler(a)jboss.com + * @since 05-Jan-2010 + */ +public class OSGiClassLoading extends ClassLoading +{ + +} Property changes on: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoading.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/OSGiModuleDeployerTempWorkaround.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/OSGiModuleDeployerTempWorkaround.java 2010-02-05 10:53:42 UTC (rev 100476) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/OSGiModuleDeployerTempWorkaround.java 2010-02-05 12:46:56 UTC (rev 100477) @@ -64,6 +64,7 @@ @Override protected ClassLoaderPolicyModule createModule(DeploymentUnit unit, ClassLoadingMetaData metaData) { - return new OSGiModule(unit, metaData); + OSGiModule module = new OSGiModule(unit, metaData); + return module; } } Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2010-02-05 10:53:42 UTC (rev 100476) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2010-02-05 12:46:56 UTC (rev 100477) @@ -21,10 +21,6 @@ <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> <entry><key>org.osgi.framework.system.packages.extra</key><value> -  - javax.servlet, - javax.servlet.http, -  org.apache.log4j;version=1.2, org.slf4j;version=1.5, @@ -197,6 +193,7 @@ ******************************** --> + <bean name="OSGiClassLoading" class="org.jboss.osgi.framework.classloading.OSGiClassLoading"/> <bean name="OSGiClassLoaderSystem" class="org.jboss.osgi.framework.classloading.OSGiClassLoaderSystem" /> <bean name="OSGiClassLoaderDomain" class="org.jboss.osgi.framework.classloading.OSGiClassLoaderDomain" > <constructor><parameter>OSGiClassLoaderDomain</parameter></constructor> @@ -216,7 +213,7 @@ </bean> <bean name="OSGiFragmentAttachmentDeployer" class="org.jboss.osgi.framework.deployers.OSGiFragmentAttachmentDeployer"/> <bean name="OSGiModuleDeployer" class="org.jboss.osgi.framework.deployers.OSGiModuleDeployerTempWorkaround"> - <property name="classLoading"><inject bean="ClassLoading" /></property> + <property name="classLoading"><inject bean="OSGiClassLoading" /></property> </bean>  + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>${version.javax.servlet}</version> + </dependency> +  <dependency> <groupId>org.osgi</groupId> Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2010-02-05 10:53:42 UTC (rev 100476) +++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2010-02-05 12:46:56 UTC (rev 100477) @@ -36,16 +36,10 @@  <properties> - <version.javax.servlet>2.4</version.javax.servlet> </properties>  <dependencies> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>${version.javax.servlet}</version> - </dependency> </dependencies>  @@ -290,8 +284,6 @@ <configuration> <excludes> <exclude>${target.container.excludes}</exclude> -  - <exclude>org/jboss/test/osgi/example/xml/jaxb/**</exclude>  <exclude>org/jboss/test/osgi/example/webapp/WebAppNegativeTestCase.class</exclude>  @@ -336,8 +328,6 @@ <configuration> <excludes> <exclude>${target.container.excludes}</exclude> -  - <exclude>org/jboss/test/osgi/example/xml/jaxb/**</exclude>  <exclude>org/jboss/test/osgi/example/webapp/WebAppNegativeTestCase.class</exclude>  Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/jaxb/JAXBTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/jaxb/JAXBTestCase.java 2010-02-05 10:53:42 UTC (rev 100476) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/xml/jaxb/JAXBTestCase.java 2010-02-05 12:46:56 UTC (rev 100477) @@ -105,6 +105,7 @@ Bundle serviceBundle = packageAdmin.getBundle(JAXBService.class); Bundle contextBundle = packageAdmin.getBundle(JAXBContext.class); + // Test that the JAXBService as well as the JAXBContext come from the provided bundle assertEquals("jboss-osgi-jaxb", serviceBundle.getSymbolicName()); assertEquals("jboss-osgi-jaxb", serviceBundle, contextBundle); } Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-05 10:53:42 UTC (rev 100476) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-05 12:46:56 UTC (rev 100477) @@ -70,6 +70,11 @@ </list> </property> </bean> +  <bean name="OSGiControllerContextPlugin" class="org.jboss.osgi.framework.bundle.ControllerContextPluginImpl"> <constructor> <parameter><inject bean="OSGiBundleManager" /></parameter> Modified: projects/jboss-osgi/trunk/testsuite/functional/scripts/antrun-test-jars.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/scripts/antrun-test-jars.xml 2010-02-05 10:53:42 UTC (rev 100476) +++ projects/jboss-osgi/trunk/testsuite/functional/scripts/antrun-test-jars.xml 2010-02-05 12:46:56 UTC (rev 100477) @@ -171,6 +171,7 @@  <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/jbosgi287-bundleA.jar" files="${tests.resources.dir}/jbosgi287/jbosgi287-bundleA.bnd" /> <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/jbosgi287-bundleB.jar" files="${tests.resources.dir}/jbosgi287/jbosgi287-bundleB.bnd" /> + <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/jbosgi287-bundleC.jar" files="${tests.resources.dir}/jbosgi287/jbosgi287-bundleC.bnd" />  <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/localization-simple-host.jar" files="${tests.resources.dir}/localization/localization-simple-host.bnd" /> Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/javax/xml/ws/WebServiceException.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/javax/xml/ws/WebServiceException.java (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/javax/xml/ws/WebServiceException.java 2010-02-05 12:46:56 UTC (rev 100477) @@ -0,0 +1,64 @@ +/* + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. + */ + +package javax.xml.ws; + +/** The <code>WebServiceException</code> class is the base + * exception class for all JAX-WS API runtime exceptions. + * + * @since JAX-WS 2.0 +**/ + +@SuppressWarnings("serial") +public class WebServiceException extends java.lang.RuntimeException +{ + + /** Constructs a new exception with <code>null</code> as its + * detail message. The cause is not initialized. + **/ + public WebServiceException() + { + super(); + } + + /** Constructs a new exception with the specified detail + * message. The cause is not initialized. + * @param message The detail message which is later + * retrieved using the getMessage method + **/ + public WebServiceException(String message) + { + super(message); + } + + /** Constructs a new exception with the specified detail + * message and cause. + * + * @param message The detail message which is later retrieved + * using the getMessage method + * @param cause The cause which is saved for the later + * retrieval throw by the getCause method + **/ + public WebServiceException(String message, Throwable cause) + { + super(message, cause); + } + + /** Constructs a new WebServiceException with the specified cause + * and a detail message of <tt>(cause==null ? null : + * cause.toString())</tt> (which typically contains the + * class and detail message of <tt>cause</tt>). + * + * @param cause The cause which is saved for the later + * retrieval throw by the getCause method. + * (A <tt>null</tt> value is permitted, and + * indicates that the cause is nonexistent or + * unknown.) + **/ + public WebServiceException(Throwable cause) + { + super(cause); + } +} Property changes on: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/javax/xml/ws/WebServiceException.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java 2010-02-05 10:53:42 UTC (rev 100476) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java 2010-02-05 12:46:56 UTC (rev 100477) @@ -163,7 +163,7 @@ @Test public void testHiddenPrivatePackage() throws Exception { - if ("jbossmc".equals(getFramework())) + if ("jbossmc".equals(getFrameworkName())) { System.out.println("FIXME [JBOSGI-245] Framework fragments"); return; @@ -209,7 +209,7 @@ @Test public void testFragmentExportsPackage() throws Exception { - if ("jbossmc".equals(getFramework())) + if ("jbossmc".equals(getFrameworkName())) { System.out.println("FIXME [JBOSGI-245] Framework fragments"); return; @@ -288,7 +288,7 @@ @Test public void testFragmentRequireBundle() throws Exception { - if ("jbossmc".equals(getFramework())) + if ("jbossmc".equals(getFrameworkName())) { System.out.println("FIXME [JBOSGI-245] Framework fragments"); return; Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGi151TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGi151TestCase.java 2010-02-05 10:53:42 UTC (rev 100476) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGi151TestCase.java 2010-02-05 12:46:56 UTC (rev 100477) @@ -86,7 +86,7 @@ @Test public void testCircularNoSelfDependency() throws Exception { - if ("jbossmc".equals(getFramework())) + if ("jbossmc".equals(getFrameworkName())) { System.out.println("FIXME [JBOSGI-151] Cannot resolve circular dependencies"); return; Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi287/OSGi287TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi287/OSGi287TestCase.java 2010-02-05 10:53:42 UTC (rev 100476) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi287/OSGi287TestCase.java 2010-02-05 12:46:56 UTC (rev 100477) @@ -23,7 +23,8 @@ //$Id: OSGi284TestCase.java 100204 2010-02-01 10:14:11Z thomas.diesler(a)jboss.com $ -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; import org.jboss.osgi.testing.OSGiBundle; import org.jboss.osgi.testing.OSGiRuntime; @@ -106,11 +107,10 @@ } } - @Test public void testResolvedOptionalImportReverse() throws Exception { - if ("jbossmc".equals(getFramework())) + if ("jbossmc".equals(getFrameworkName())) { System.out.println("FIXME [JBOSGI-287] Optional import loaded from system classloader"); return; @@ -145,4 +145,36 @@ runtime.shutdown(); } } + + @Test + public void testServletAPI() throws Exception + { + OSGiRuntime runtime = getDefaultRuntime(); + try + { + // Bundle-SymbolicName: jbosgi287-bundleC + // Export-Package: javax.xml.ws + // Import-Package: javax.xml.ws + OSGiBundle bundleA = runtime.installBundle("jbosgi287-bundleC.jar"); + + OSGiBundle exporterA = bundleA.loadClass("javax.xml.ws.WebServiceException"); + assertEquals(Bundle.RESOLVED, bundleA.getState()); + assertEquals(bundleA, exporterA); + + // Try to load a class that is not part of the bundle + try + { + bundleA.loadClass("javax.xml.ws.WebServiceContext"); + fail("ClassNotFoundException expected"); + } + catch (ClassNotFoundException ex) + { + // expected + } + } + finally + { + runtime.shutdown(); + } + } } \ No newline at end of file Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/OSGi38TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/OSGi38TestCase.java 2010-02-05 10:53:42 UTC (rev 100476) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi38/OSGi38TestCase.java 2010-02-05 12:46:56 UTC (rev 100477) @@ -231,7 +231,7 @@ @Test public void testUninstallX() throws Exception { - if ("jbossmc".equals(getFramework())) + if ("jbossmc".equals(getFrameworkName())) { System.out.println("FIXME [JBOSGI-213] Unexpected dependee state changes"); return; Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGi41TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGi41TestCase.java 2010-02-05 10:53:42 UTC (rev 100476) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGi41TestCase.java 2010-02-05 12:46:56 UTC (rev 100477) @@ -82,7 +82,7 @@ assertNotNull("Storage dir not null", storageRoot); File dataFile; - if ("equinox".equals(getFramework())) + if ("equinox".equals(getFrameworkName())) { dataFile = new File(storageRoot + "/org.eclipse.osgi/bundles/" + bundleA.getBundleId() + "/data/" + filename); } Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-05 10:53:42 UTC (rev 100476) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-05 12:46:56 UTC (rev 100477) @@ -55,6 +55,11 @@ ******************************** --> +  <bean name="OSGiControllerContextPlugin" class="org.jboss.osgi.framework.bundle.ControllerContextPluginImpl"> <constructor> <parameter><inject bean="OSGiBundleManager" /></parameter> Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi287/jbosgi287-bundleC.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi287/jbosgi287-bundleC.bnd (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi287/jbosgi287-bundleC.bnd 2010-02-05 12:46:56 UTC (rev 100477) @@ -0,0 +1,6 @@ +# bnd build -classpath target/test-classes -output target/test-libs/jbosgi287-bundleB.jar src/test/resources/jbosgi287/jbosgi287-bundle.bnd + +Bundle-SymbolicName: jbosgi287-bundleC +Export-Package: javax.xml.ws +Import-Package: javax.xml.ws + Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2010-02-05 10:53:42 UTC (rev 100476) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2010-02-05 12:46:56 UTC (rev 100477) @@ -182,6 +182,12 @@ <scope>provided</scope> </dependency> +  + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </dependency> +  <dependency> <groupId>org.ops4j.pax.web</groupId>

14 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r100454 - projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal.

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

Author: thomas.diesler(a)jboss.com Date: 2010-02-05 01:31:40 -0500 (Fri, 05 Feb 2010) New Revision: 100454 Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteBundle.java Log: More rebust RemoteBundle.getState() Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteBundle.java =================================================================== --- projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteBundle.java 2010-02-05 06:21:55 UTC (rev 100453) +++ projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteBundle.java 2010-02-05 06:31:40 UTC (rev 100454) @@ -101,26 +101,25 @@ if (uninstalled == true) return Bundle.UNINSTALLED; - boolean isRegistered; try { MBeanServerConnection server = getRuntime().getMBeanServer(); - isRegistered = server.isRegistered(objectName); + if (server.isRegistered(objectName)) + { + return bundle.getState(); + } } catch (RuntimeException rte) { Throwable cause = rte.getCause() != null ? rte.getCause() : null; if (cause instanceof InstanceNotFoundException == false) log.warn("Cannot get state for: " + objectName, cause); - - isRegistered = false; } catch (IOException ex) { log.warn("Cannot get state for: " + objectName, ex); - isRegistered = false; } - return isRegistered ? bundle.getState() : Bundle.UNINSTALLED; + return Bundle.UNINSTALLED; } @Override

14 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r100436 - in projects/jboss-osgi/projects/runtime/framework/trunk/src: test/java/org/jboss/test/osgi/nativecode/bundleA and 1 other directories.

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

Author: alesj Date: 2010-02-04 15:08:46 -0500 (Thu, 04 Feb 2010) New Revision: 100436 Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/InstanceMetaDataRetrievalFactory.java projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/nativecode/bundleA/NativeCodeActivatorA.java projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/nativecode/simple-nativecode.bnd Log: Fix winz native usage. Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/InstanceMetaDataRetrievalFactory.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/InstanceMetaDataRetrievalFactory.java 2010-02-04 19:54:41 UTC (rev 100435) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/InstanceMetaDataRetrievalFactory.java 2010-02-04 20:08:46 UTC (rev 100436) @@ -66,7 +66,8 @@ if (CommonLevels.INSTANCE.equals(scope.getScopeLevel()) == false) throw new IllegalArgumentException("Not an instance scope: " + scope); - MemoryMetaDataLoader loader = new MemoryMetaDataLoader(new ScopeKey(scope)); + ScopeKey key = new ScopeKey(scope); + MemoryMetaDataLoader loader = new MemoryMetaDataLoader(key.getOptimizedKey()); repository.addMetaDataRetrieval(loader); // remember loader Object qualifier = scope.getQualifier(); Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/nativecode/bundleA/NativeCodeActivatorA.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/nativecode/bundleA/NativeCodeActivatorA.java 2010-02-04 19:54:41 UTC (rev 100435) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/nativecode/bundleA/NativeCodeActivatorA.java 2010-02-04 20:08:46 UTC (rev 100436) @@ -23,14 +23,15 @@ //$Id: NativeCodeActivatorA.java 99304 2010-01-12 17:29:06Z thomas.diesler(a)jboss.com $ +import java.io.File; +import java.util.HashMap; +import java.util.Map; + import org.osgi.framework.Bundle; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleException; -import java.util.HashMap; -import java.util.Map; - public class NativeCodeActivatorA implements BundleActivator { private static Map<String, String> osAliases = new HashMap<String, String>(); @@ -90,7 +91,7 @@ if ("".equals(suffix)) System.err.println("No such OS mapped to alias: " + os); - String substr = "osgi-store/bundle-" + bundleid + "/" + suffix; + String substr = "osgi-store" + File.separator + "bundle-" + bundleid + File.separator + suffix; if (exmsg.indexOf(substr) < 0) throw new UnsatisfiedLinkError("Cannot find '" + substr + "' in '" + exmsg + "'"); } Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/nativecode/simple-nativecode.bnd =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/nativecode/simple-nativecode.bnd 2010-02-04 19:54:41 UTC (rev 100435) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/nativecode/simple-nativecode.bnd 2010-02-04 20:08:46 UTC (rev 100436) @@ -7,6 +7,7 @@ macosx_x86/libNative.jnilib; osname="mac os x"; processor=x86_64, \ macosx_x86/libNative.jnilib; osname="mac os x"; processor=ppc, \ windows_x86/Native.dll; osname=Win32; processor=x86, \ + windows_x86/Native.dll; osname=WindowsXP; processor=x86, \ windows_x86/Native.dll; osname=Windows7; processor=amd64 Include-Resource: libs

14 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r100435 - projects/jboss-osgi/trunk/testsuite/example.

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

Author: thomas.diesler(a)jboss.com Date: 2010-02-04 14:54:41 -0500 (Thu, 04 Feb 2010) New Revision: 100435 Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml Log: [JBOSGI-145] JAXB classes are loaded from the system classpath Exclude the test for jbossmc Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2010-02-04 19:43:44 UTC (rev 100434) +++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2010-02-04 19:54:41 UTC (rev 100435) @@ -290,6 +290,8 @@ <configuration> <excludes> <exclude>${target.container.excludes}</exclude> +  + <exclude>org/jboss/test/osgi/example/xml/jaxb/**</exclude>  <exclude>org/jboss/test/osgi/example/webapp/WebAppNegativeTestCase.class</exclude>  @@ -334,6 +336,8 @@ <configuration> <excludes> <exclude>${target.container.excludes}</exclude> +  + <exclude>org/jboss/test/osgi/example/xml/jaxb/**</exclude>  <exclude>org/jboss/test/osgi/example/webapp/WebAppNegativeTestCase.class</exclude>

14 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r100433 - in projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework: classloading and 1 other directory.

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

Author: thomas.diesler(a)jboss.com Date: 2010-02-04 14:42:39 -0500 (Thu, 04 Feb 2010) New Revision: 100433 Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageCapability.java Log: Fix Fragment support in AS6 Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java 2010-02-04 19:11:22 UTC (rev 100432) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java 2010-02-04 19:42:39 UTC (rev 100433) @@ -1038,7 +1038,7 @@ } // Fallback to the deployment name - else if (aux instanceof OSGiBundleState) + else if (aux instanceof AbstractDeployedBundleState) { DeploymentUnit unit = ((AbstractDeployedBundleState)aux).getDeploymentUnit(); if (location.equals(unit.getName())) Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageCapability.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageCapability.java 2010-02-04 19:11:22 UTC (rev 100432) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageCapability.java 2010-02-04 19:42:39 UTC (rev 100433) @@ -32,6 +32,7 @@ import org.jboss.osgi.framework.bundle.AbstractBundleState; import org.jboss.osgi.framework.bundle.AbstractDeployedBundleState; import org.jboss.osgi.framework.bundle.OSGiBundleManager; +import org.jboss.osgi.framework.bundle.OSGiBundleState; import org.jboss.osgi.framework.metadata.OSGiMetaData; import org.jboss.osgi.framework.metadata.PackageAttribute; import org.jboss.osgi.framework.metadata.Parameter; @@ -144,26 +145,24 @@ OSGiBundleManager bundleManager = bundleState.getBundleManager(); Resolver bundleResolver = bundleManager.getOptionalPlugin(ResolverPlugin.class); if (bundleResolver != null) - return resolverMatch(bundleResolver, reqModule, osgiPackageRequirement); + { + // Get the bundle associated with the requirement + String reqLocation = reqModule.getContextName(); + AbstractBundleState reqBundle = bundleManager.getBundleByLocation(reqLocation); + if (reqBundle == null) + throw new IllegalStateException("Cannot get bundle for: " + reqLocation); + + // Get the exporter for this requirement + if (reqBundle instanceof OSGiBundleState) + { + String packageName = osgiPackageRequirement.getName(); + return bundleResolver.match(reqBundle, bundleState, packageName); + } + } return true; } - // Return true if the given requirement matches in the external resolver - private boolean resolverMatch(Resolver bundleResolver, Module reqModule, OSGiPackageRequirement packageRequirement) - { - // Get the bundle associated with the requirement - String reqLocation = reqModule.getContextName(); - OSGiBundleManager bundleManager = bundleState.getBundleManager(); - AbstractBundleState reqBundle = bundleManager.getBundleByLocation(reqLocation); - if (reqBundle == null) - throw new IllegalStateException("Cannot get bundle for: " + reqLocation); - - // Get the exporter for this requirement - String packageName = packageRequirement.getName(); - return bundleResolver.match(reqBundle, bundleState, packageName); - } - /** * Get the Module associated with this capability *

14 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r100429 - in projects/jboss-osgi/projects: spi/trunk/src/main/java/org/jboss/osgi/spi/util and 1 other directory.

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

Author: thomas.diesler(a)jboss.com Date: 2010-02-04 12:26:32 -0500 (Thu, 04 Feb 2010) New Revision: 100429 Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/OSGiManifestParsingDeployer.java projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/util/BundleInfo.java Log: [JBOSGI-36] Bundle classes leak into system classloader Throw BundleException on invalid manifest Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/OSGiManifestParsingDeployer.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/OSGiManifestParsingDeployer.java 2010-02-04 17:25:27 UTC (rev 100428) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/deployers/OSGiManifestParsingDeployer.java 2010-02-04 17:26:32 UTC (rev 100429) @@ -28,8 +28,8 @@ import org.jboss.osgi.framework.metadata.OSGiMetaData; import org.jboss.osgi.framework.metadata.internal.AbstractOSGiMetaData; import org.jboss.osgi.spi.OSGiConstants; +import org.jboss.osgi.spi.util.BundleInfo; import org.jboss.virtual.VirtualFile; -import org.osgi.framework.Version; /** * OSGiManifestParsingDeployer.<p> @@ -51,18 +51,11 @@ @Override protected OSGiMetaData createMetaData(Manifest manifest) throws Exception { - AbstractOSGiMetaData osgiMetaData = new AbstractOSGiMetaData(manifest); - - // At least one of these manifest headers must be there - // Note, in R3 and R4 there is no common mandatory header - String bundleName = osgiMetaData.getBundleName(); - String bundleSymbolicName = osgiMetaData.getBundleSymbolicName(); - Version bundleVersion = Version.parseVersion(osgiMetaData.getBundleVersion()); - - boolean isEmptyVersion = Version.emptyVersion.equals(bundleVersion); - if (bundleName == null && bundleSymbolicName == null && isEmptyVersion == true) + int manifestVersion = BundleInfo.getBundleManifestVersion(manifest); + if (manifestVersion < 0 || manifestVersion > 2) return null; + AbstractOSGiMetaData osgiMetaData = new AbstractOSGiMetaData(manifest); return osgiMetaData; } Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/util/BundleInfo.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/util/BundleInfo.java 2010-02-04 17:25:27 UTC (rev 100428) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/util/BundleInfo.java 2010-02-04 17:26:32 UTC (rev 100429) @@ -120,15 +120,15 @@ // Bundle manifests written to previous specifications’ manifest syntax are // taken to have a bundle manifest version of '1', although there is no way to // express this in such manifests. - String manifestVersion = getManifestHeader(Constants.BUNDLE_MANIFESTVERSION); - if (manifestVersion == null) - manifestVersion = "1"; + int manifestVersion = getBundleManifestVersion(manifest); + if (manifestVersion < 0) + throw new BundleException("Cannot parse OSGi manifest for: " + rootURL); symbolicName = getManifestHeader(Constants.BUNDLE_SYMBOLICNAME); bundleVersion = getManifestHeader(Constants.BUNDLE_VERSION); // R3 Framework - if (manifestVersion.equals("1")) + if (manifestVersion == 1) { if (symbolicName != null) throw new IllegalArgumentException("Invalid Bundle-ManifestVersion:=1 for " + symbolicName); @@ -150,7 +150,7 @@ } // R4 Framework - else if (manifestVersion.equals("2")) + else if (manifestVersion == 2) { if (symbolicName == null) throw new IllegalArgumentException("Cannot obtain Bundle-SymbolicName for: " + rootFile); @@ -167,12 +167,34 @@ } /** + * Get the bundle manifest version. + * @param manifest The given manifest + * @return The value of the Bundle-ManifestVersion header, or -1 for a non OSGi manifest + */ + public static int getBundleManifestVersion(Manifest manifest) + { + if (manifest == null) + throw new IllegalArgumentException("Null manifest"); + + // At least one of these manifest headers must be there + // Note, in R3 and R4 there is no common mandatory header + String bundleName = getManifestHeaderInternal(manifest, Constants.BUNDLE_NAME); + String bundleSymbolicName = getManifestHeaderInternal(manifest, Constants.BUNDLE_SYMBOLICNAME); + String bundleVersion = getManifestHeaderInternal(manifest, Constants.BUNDLE_VERSION); + + if (bundleName == null && bundleSymbolicName == null && bundleVersion == null) + return -1; + + String manifestVersion = getManifestHeaderInternal(manifest, Constants.BUNDLE_MANIFESTVERSION); + return manifestVersion != null ? Integer.parseInt(manifestVersion) : 1; + } + + /** * Get the manifest header for the given key. */ public String getManifestHeader(String key) { - Attributes attribs = getManifest().getMainAttributes(); - String value = attribs.getValue(key); + String value = getManifestHeaderInternal(getManifest(), key); return value; } @@ -303,6 +325,13 @@ return "[" + symbolicName + "-" + bundleVersion + ",url=" + rootURL + "]"; } + private static String getManifestHeaderInternal(Manifest manifest, String key) + { + Attributes attribs = manifest.getMainAttributes(); + String value = attribs.getValue(key); + return value; + } + @Override public boolean equals(Object obj) {

14 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r100428 - projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/nativecode/bundleA.

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

Author: alesj Date: 2010-02-04 12:25:27 -0500 (Thu, 04 Feb 2010) New Revision: 100428 Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/nativecode/bundleA/NativeCodeActivatorA.java Log: Map any winz stuff to windows. Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/nativecode/bundleA/NativeCodeActivatorA.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/nativecode/bundleA/NativeCodeActivatorA.java 2010-02-04 17:11:21 UTC (rev 100427) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/nativecode/bundleA/NativeCodeActivatorA.java 2010-02-04 17:25:27 UTC (rev 100428) @@ -44,31 +44,32 @@ osAliases.put("Mac OS X", "MacOSX"); osAliases.put("OS/2", "OS2"); osAliases.put("procnto", "QNX"); - osAliases.put("Win95", "Windows95"); - osAliases.put("Windows 95", "Windows95"); - osAliases.put("Win32", "Windows95"); - osAliases.put("Win98", "Windows98"); - osAliases.put("Windows 98", "Windows98"); - osAliases.put("Win32", "Windows98"); - osAliases.put("WinNT", "WindowsNT"); - osAliases.put("Windows NT", "WindowsNT"); - osAliases.put("Win32", "WindowsNT"); - osAliases.put("WinCE", "WindowsCE"); - osAliases.put("Windows CE", "WindowsCE"); - osAliases.put("Win2000", "Windows2000"); - osAliases.put("Windows 2000", "Windows2000"); - osAliases.put("Win32", "Windows2000"); - osAliases.put("Win2003", "Windows2003"); - osAliases.put("Windows 2003", "Windows2003"); - osAliases.put("Win32", "Windows2003"); - osAliases.put("Windows Server 2003", "Windows2003"); - osAliases.put("WinXP", "WindowsXP"); - osAliases.put("Windows XP", "WindowsXP"); - osAliases.put("Win32", "WindowsXP"); - osAliases.put("WinVista", "WindowsVista"); - osAliases.put("Windows Vista", "WindowsVista"); - osAliases.put("Win32", "WindowsVista"); - osAliases.put("Windows 7", "Windows7"); + // map any winz stuff to plain windows + osAliases.put("Win95", "Windows"); + osAliases.put("Windows 95", "Windows"); + osAliases.put("Win32", "Windows"); + osAliases.put("Win98", "Windows"); + osAliases.put("Windows 98", "Windows"); + osAliases.put("Win32", "Windows"); + osAliases.put("WinNT", "Windows"); + osAliases.put("Windows NT", "Windows"); + osAliases.put("Win32", "Windows"); + osAliases.put("WinCE", "Windows"); + osAliases.put("Windows CE", "Windows"); + osAliases.put("Win2000", "Windows"); + osAliases.put("Windows 2000", "Windows"); + osAliases.put("Win32", "Windows"); + osAliases.put("Win2003", "Windows"); + osAliases.put("Windows 2003", "Windows"); + osAliases.put("Win32", "Windows"); + osAliases.put("Windows Server 2003", "Windows"); + osAliases.put("WinXP", "Windows"); + osAliases.put("Windows XP", "Windows"); + osAliases.put("Win32", "Windows"); + osAliases.put("WinVista", "Windows"); + osAliases.put("Windows Vista", "Windows"); + osAliases.put("Win32", "Windows"); + osAliases.put("Windows 7", "Windows"); } public void start(BundleContext context) throws BundleException

14 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r100427 - projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/nativecode.

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

Author: alesj Date: 2010-02-04 12:11:21 -0500 (Thu, 04 Feb 2010) New Revision: 100427 Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/nativecode/simple-nativecode.bnd Log: Fix processor number. Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/nativecode/simple-nativecode.bnd =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/nativecode/simple-nativecode.bnd 2010-02-04 16:53:08 UTC (rev 100426) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/nativecode/simple-nativecode.bnd 2010-02-04 17:11:21 UTC (rev 100427) @@ -7,7 +7,7 @@ macosx_x86/libNative.jnilib; osname="mac os x"; processor=x86_64, \ macosx_x86/libNative.jnilib; osname="mac os x"; processor=ppc, \ windows_x86/Native.dll; osname=Win32; processor=x86, \ - windows_x86/Native.dll; osname=Windows7; processor=amd86 + windows_x86/Native.dll; osname=Windows7; processor=amd64 Include-Resource: libs -removeheaders: Include-Resource

14 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r100424 - projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas.

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

Author: thomas.diesler(a)jboss.com Date: 2010-02-04 11:29:46 -0500 (Thu, 04 Feb 2010) New Revision: 100424 Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml Log: [JBOSGI-99] No explicit control over bundle.start() Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2010-02-04 16:20:49 UTC (rev 100423) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2010-02-04 16:29:46 UTC (rev 100424) @@ -23,7 +23,6 @@ <entry><key>org.osgi.service.http.port</key><value>8090</value></entry> <entry><key>osgi.framework</key><value>${jboss.server.home.url}/deployers/osgi.deployer/org.eclipse.osgi.jar</value></entry> <entry><key>osgi.install.area</key><value>${jboss.server.data.dir}/equinox</value></entry> - <entry><key>felix.cm.dir</key><value>${jboss.server.data.dir}/osgi-configadmin</value></entry> <entry> <key>org.osgi.framework.system.packages.extra</key> <value> @@ -69,7 +68,7 @@  <entry><key>org.osgi.service.http.port</key><value>8090</value></entry>  - <entry><key>felix.cm.dir</key><value>${jboss.server.data.dir}/data/osgi-configadmin</value></entry> + <entry><key>felix.cm.dir</key><value>${jboss.server.data.dir}/osgi-configadmin</value></entry>  <entry><key>org.jboss.osgi.jmx.host</key><value>${jboss.bind.address}</value></entry> <entry><key>org.jboss.osgi.jmx.port</key><value>1098</value></entry> Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2010-02-04 16:20:49 UTC (rev 100423) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2010-02-04 16:29:46 UTC (rev 100424) @@ -21,7 +21,6 @@ <entry><key>org.osgi.framework.storage</key><value>${jboss.server.data.dir}/osgi-store</value></entry> <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> <entry><key>org.osgi.service.http.port</key><value>8090</value></entry> - <entry><key>felix.cm.dir</key><value>${jboss.server.data.dir}/osgi-configadmin</value></entry> <entry><key>felix.bootdelegation.implicit</key><value>false</value></entry> <entry><key>org.osgi.framework.bootdelegation</key><value>sun.reflect</value></entry> <entry> @@ -74,7 +73,7 @@  <entry><key>org.osgi.service.http.port</key><value>8090</value></entry>  - <entry><key>felix.cm.dir</key><value>${jboss.server.data.dir}/data/osgi-configadmin</value></entry> + <entry><key>felix.cm.dir</key><value>${jboss.server.data.dir}/osgi-configadmin</value></entry>  <entry><key>org.jboss.osgi.jmx.host</key><value>${jboss.bind.address}</value></entry> <entry><key>org.jboss.osgi.jmx.port</key><value>1098</value></entry> Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2010-02-04 16:20:49 UTC (rev 100423) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2010-02-04 16:29:46 UTC (rev 100424) @@ -17,7 +17,7 @@ </constructor> <property name="properties"> <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>org.osgi.framework.storage</key><value>${jboss.server.data.dir}/data/osgi-store</value></entry> + <entry><key>org.osgi.framework.storage</key><value>${jboss.server.data.dir}/osgi-store</value></entry> <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> <entry><key>org.osgi.framework.system.packages.extra</key><value> @@ -60,7 +60,7 @@  <entry><key>org.osgi.service.http.port</key><value>8090</value></entry>  - <entry><key>felix.cm.dir</key><value>${jboss.server.data.dir}/data/osgi-configadmin</value></entry> + <entry><key>felix.cm.dir</key><value>${jboss.server.data.dir}/osgi-configadmin</value></entry>  <entry><key>org.jboss.osgi.jmx.host</key><value>${jboss.bind.address}</value></entry> <entry><key>org.jboss.osgi.jmx.port</key><value>1098</value></entry>

14 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r100423 - projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/nativecode/bundleA.

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

Author: alesj Date: 2010-02-04 11:20:49 -0500 (Thu, 04 Feb 2010) New Revision: 100423 Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/nativecode/bundleA/NativeCodeActivatorA.java Log: Test commit under vpn Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/nativecode/bundleA/NativeCodeActivatorA.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/nativecode/bundleA/NativeCodeActivatorA.java 2010-02-04 16:09:52 UTC (rev 100422) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/nativecode/bundleA/NativeCodeActivatorA.java 2010-02-04 16:20:49 UTC (rev 100423) @@ -21,7 +21,7 @@ */ package org.jboss.test.osgi.nativecode.bundleA; -//$Id: HostAActivator.java 99304 2010-01-12 17:29:06Z thomas.diesler(a)jboss.com $ +//$Id: NativeCodeActivatorA.java 99304 2010-01-12 17:29:06Z thomas.diesler(a)jboss.com $ import org.osgi.framework.Bundle; import org.osgi.framework.BundleActivator;

14 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

jboss-osgi-commits February 2010