[jboss-osgi-commits] JBoss-OSGI SVN: r95762 - in projects/jboss-osgi/projects/bundles/husky/trunk: harness and 4 other directories.
jboss-osgi-commits at lists.jboss.org
jboss-osgi-commits at lists.jboss.org
Thu Oct 29 10:56:00 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-10-29 10:55:57 -0400 (Thu, 29 Oct 2009)
New Revision: 95762
Added:
projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/testing/
projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/testing/internal/RemotePackageAdmin.java
Removed:
projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/testing/internal/RemotePackageAdmin.java
Modified:
projects/jboss-osgi/projects/bundles/husky/trunk/harness/pom.xml
projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml
projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml
projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/resources/jboss-osgi-framework.properties
Log:
Remove dependency on jboss-osgi-testing
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/harness/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/harness/pom.xml 2009-10-29 14:54:29 UTC (rev 95761)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/harness/pom.xml 2009-10-29 14:55:57 UTC (rev 95762)
@@ -35,6 +35,10 @@
<artifactId>jboss-osgi-spi</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.osgi.runtime</groupId>
+ <artifactId>jboss-osgi-deployment</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
@@ -61,14 +65,33 @@
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Bundle-Activator>org.jboss.osgi.husky.runtime.osgi.HuskyActivator</Bundle-Activator>
+ <Export-Package>
+ org.jboss.osgi.husky;version=${version},
+ org.jboss.osgi.husky.annotation;version=${version},
+ org.jboss.osgi.testing;version=${version},
+ </Export-Package>
+ <Import-Package>
+ javax.management,
+ javax.naming,
+ org.jboss.osgi.spi.capability;version="[1.0,1.1)",
+ org.jboss.osgi.spi.management;version="[1.0,1.1)",
+ org.jboss.osgi.spi.util;version="[1.0,1.1)",
+ org.junit;version="[4.6,5.0)",
+ org.osgi.framework,
+ org.slf4j;version="[1.5,1.6)",
+
+ <!-- ignore client side -->
+ !org.jboss.osgi.deployment.deployer,
+ !org.jboss.osgi.spi.framework,
+ !org.jboss.virtual,
+ !org.osgi.framework.launch,
+ !org.osgi.service.packageadmin,
+ </Import-Package>
<Private-Package>
org.jboss.osgi.husky.internal,
org.jboss.osgi.husky.runtime*,
+ org.jboss.osgi.testing.internal,
</Private-Package>
- <Export-Package>
- org.jboss.osgi.husky;version=${version},
- org.jboss.osgi.husky.annotation;version=${version}
- </Export-Package>
<Embed-Transitive>true</Embed-Transitive>
<Embed-Dependency>
junit;inline=false,
Copied: projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/testing (from rev 95731, projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing)
Deleted: projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/testing/internal/RemotePackageAdmin.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/RemotePackageAdmin.java 2009-10-29 06:57:36 UTC (rev 95731)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/testing/internal/RemotePackageAdmin.java 2009-10-29 14:55:57 UTC (rev 95762)
@@ -1,66 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.osgi.testing.internal;
-
-import org.jboss.osgi.spi.management.MBeanProxy;
-import org.jboss.osgi.spi.management.MBeanProxyException;
-import org.jboss.osgi.spi.management.ManagedFrameworkMBean;
-import org.jboss.osgi.testing.OSGiBundle;
-import org.jboss.osgi.testing.OSGiPackageAdmin;
-
-/**
- * A remote implementation of the {@link OSGiPackageAdmin}
- *
- * @author Thomas.Diesler at jboss.org
- * @since 25-Sep-2008
- */
-public class RemotePackageAdmin implements OSGiPackageAdmin
-{
- private OSGiRuntimeImpl runtime;
-
- public RemotePackageAdmin(OSGiRuntimeImpl runtime)
- {
- this.runtime = runtime;
- }
-
- public void refreshPackages(OSGiBundle[] bundles)
- {
- String[] bundleArr = null;
- if (bundles != null)
- {
- bundleArr = new String[bundles.length];
- for (int i=0; i < bundles.length; i++)
- {
- bundleArr[i] = bundles[i].getSymbolicName();
- }
- }
- try
- {
- ManagedFrameworkMBean mbeanProxy = MBeanProxy.get(ManagedFrameworkMBean.class, ManagedFrameworkMBean.MBEAN_MANAGED_FRAMEWORK, runtime.getMBeanServer());
- mbeanProxy.refreshPackages(bundleArr);
- }
- catch (MBeanProxyException ex)
- {
- throw new IllegalStateException("Cannot refresh packages", ex);
- }
- }
-}
Copied: projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/testing/internal/RemotePackageAdmin.java (from rev 95736, projects/jboss-osgi/trunk/reactor/testing/src/main/java/org/jboss/osgi/testing/internal/RemotePackageAdmin.java)
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/testing/internal/RemotePackageAdmin.java (rev 0)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/testing/internal/RemotePackageAdmin.java 2009-10-29 14:55:57 UTC (rev 95762)
@@ -0,0 +1,74 @@
+/*
+ * 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.testing.internal;
+
+import javax.management.ObjectName;
+
+import org.jboss.osgi.spi.management.MBeanProxy;
+import org.jboss.osgi.spi.management.MBeanProxyException;
+import org.jboss.osgi.spi.management.ManagedBundle;
+import org.jboss.osgi.spi.management.ManagedFrameworkMBean;
+import org.jboss.osgi.testing.OSGiBundle;
+import org.jboss.osgi.testing.OSGiPackageAdmin;
+import org.osgi.framework.Version;
+
+/**
+ * A remote implementation of the {@link OSGiPackageAdmin}
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 25-Sep-2008
+ */
+public class RemotePackageAdmin implements OSGiPackageAdmin
+{
+ private OSGiRuntimeImpl runtime;
+
+ public RemotePackageAdmin(OSGiRuntimeImpl runtime)
+ {
+ this.runtime = runtime;
+ }
+
+ public void refreshPackages(OSGiBundle[] bundles)
+ {
+ ObjectName[] bundleArr = null;
+ if (bundles != null)
+ {
+ bundleArr = new ObjectName[bundles.length];
+ for (int i=0; i < bundles.length; i++)
+ {
+ OSGiBundle bundle = bundles[i];
+ long id = bundle.getBundleId();
+ String symbolicName = bundle.getSymbolicName();
+ Version version = bundle.getVersion();
+ bundleArr[i] = ManagedBundle.getObjectName(id, symbolicName, version);
+ }
+ }
+ try
+ {
+ ManagedFrameworkMBean mbeanProxy = MBeanProxy.get(ManagedFrameworkMBean.class, ManagedFrameworkMBean.MBEAN_MANAGED_FRAMEWORK, runtime.getMBeanServer());
+ mbeanProxy.refreshPackages(bundleArr);
+ }
+ catch (MBeanProxyException ex)
+ {
+ throw new IllegalStateException("Cannot refresh packages", ex);
+ }
+ }
+}
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2009-10-29 14:54:29 UTC (rev 95761)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2009-10-29 14:55:57 UTC (rev 95762)
@@ -42,7 +42,7 @@
<properties>
<version.jboss.osgi.runtime.felix>2.0.0-SNAPSHOT</version.jboss.osgi.runtime.felix>
<version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi>
- <version.jboss.osgi.testing>1.0.0-SNAPSHOT</version.jboss.osgi.testing>
+ <version.jboss.osgi.deployment>1.0.0-SNAPSHOT</version.jboss.osgi.deployment>
<version.osgi>4.2.0</version.osgi>
</properties>
@@ -61,9 +61,9 @@
<version>${version.jboss.osgi.spi}</version>
</dependency>
<dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-testing</artifactId>
- <version>${version.jboss.osgi.testing}</version>
+ <groupId>org.jboss.osgi.runtime</groupId>
+ <artifactId>jboss-osgi-deployment</artifactId>
+ <version>${version.jboss.osgi.deployment}</version>
</dependency>
<dependency>
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml 2009-10-29 14:54:29 UTC (rev 95761)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml 2009-10-29 14:55:57 UTC (rev 95762)
@@ -50,11 +50,6 @@
<!-- Test Dependencies -->
<dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-testing</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/resources/jboss-osgi-framework.properties
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/resources/jboss-osgi-framework.properties 2009-10-29 14:54:29 UTC (rev 95761)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/resources/jboss-osgi-framework.properties 2009-10-29 14:55:57 UTC (rev 95762)
@@ -17,15 +17,12 @@
# Extra System Packages
org.osgi.framework.system.packages.extra=\
- org.jboss.logging, \
org.jboss.osgi.spi;version=1.0, \
org.jboss.osgi.spi.capability;version=1.0, \
- org.jboss.osgi.spi.logging;version=1.0, \
org.jboss.osgi.spi.management;version=1.0, \
org.jboss.osgi.spi.service;version=1.0, \
org.jboss.osgi.spi.util;version=1.0, \
- org.jboss.osgi.testing;version=1.0, \
- org.osgi.framework;version=1.4, \
+ org.osgi.framework;version=1.5, \
org.slf4j;version=1.5
# Bundles that need to be installed with the Framework automatically
More information about the jboss-osgi-commits
mailing list