[jboss-osgi-commits] JBoss-OSGI SVN: r95948 - in projects/jboss-osgi/trunk/reactor/framework: src/main/java/org/jboss/osgi/framework/bundle and 8 other directories.
jboss-osgi-commits at lists.jboss.org
jboss-osgi-commits at lists.jboss.org
Tue Nov 3 08:09:53 EST 2009
Author: adrian at jboss.org
Date: 2009-11-03 08:09:52 -0500 (Tue, 03 Nov 2009)
New Revision: 95948
Modified:
projects/jboss-osgi/trunk/reactor/framework/.classpath
projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java
projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageCapability.java
projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageRequirement.java
projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/BundleResolver.java
projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/bundle/metadata/VersionRangeTestCase.java
projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/bundle/test/BundleEntriesUnitTestCase.java
projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/bundle/test/SystemBundleUnitTestCase.java
projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/classloader/test/RequireBundleUnitTestCase.java
projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/filter/test/BundleContextFilterUnitTestCase.java
projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/test/GetServiceReferencesUnitTestCase.java
projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/test/GetUnGetServiceUnitTestCase.java
projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/test/RegisterServiceUnitTestCase.java
projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/test/ServiceRegistrationUnitTestCase.java
projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/smoke/test/OSGiSmokeTestCase.java
Log:
Source code tidyup and fix the eclipse build
Modified: projects/jboss-osgi/trunk/reactor/framework/.classpath
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/.classpath 2009-11-03 12:17:22 UTC (rev 95947)
+++ projects/jboss-osgi/trunk/reactor/framework/.classpath 2009-11-03 13:09:52 UTC (rev 95948)
@@ -1,7 +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/classes" path="target/generated-sources/javacc"/>
+ <classpathentry kind="src" path="target/generated-sources/javacc"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java 2009-11-03 12:17:22 UTC (rev 95947)
+++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java 2009-11-03 13:09:52 UTC (rev 95948)
@@ -226,6 +226,8 @@
/**
* Get the kernel
+ *
+ * @return the kernel
*/
public Kernel getKernel()
{
@@ -355,6 +357,8 @@
/**
* Get the bundle resolver
+ *
+ * @return the resolver
*/
public BundleResolver getBundleResolver()
{
@@ -791,6 +795,7 @@
/**
* Get the bundles with the given state
*
+ * @param state the bundle state
* @return the bundles
*/
public Collection<AbstractBundleState> getBundles(int state)
Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageCapability.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageCapability.java 2009-11-03 12:17:22 UTC (rev 95947)
+++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageCapability.java 2009-11-03 13:09:52 UTC (rev 95948)
@@ -68,7 +68,7 @@
/**
* Create a new OSGiPackageCapability.
*
- * @param metadata the osgi metadata
+ * @param bundleState the bundle state
* @param exportPackage the export package metadata
* @return the capability
* @throws IllegalArgumentException for null metadata
@@ -157,6 +157,8 @@
/**
* Get the Module associated with this capability
+ *
+ * @return the module
*/
public Module getModule()
{
Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageRequirement.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageRequirement.java 2009-11-03 12:17:22 UTC (rev 95947)
+++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageRequirement.java 2009-11-03 13:09:52 UTC (rev 95948)
@@ -56,6 +56,7 @@
/**
* Create a new OSGiPackageRequirement.
*
+ * @param bundleState the bundle state
* @param requirePackage the require package metadata
* @return the requirement
* @throws IllegalArgumentException for a null requirePackage
@@ -93,6 +94,7 @@
/**
* Create a new OSGiPackageRequirement.
*
+ * @param bundleState the bundleState
* @param name the name
* @param versionRange the version range - pass null for all versions
* @param requirePackage the require package metadata
@@ -124,6 +126,8 @@
/**
* Get the Module associated with this requirement
+ *
+ * @return the module
*/
public Module getModule()
{
Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/BundleResolver.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/BundleResolver.java 2009-11-03 12:17:22 UTC (rev 95947)
+++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/BundleResolver.java 2009-11-03 13:09:52 UTC (rev 95948)
@@ -73,6 +73,7 @@
*
* This is an iterative process that tries to wire BundleRequirements to BundleCapabilities.
*
+ * @param bundles the bundles to resolve
* @return The list of resolved bundles in the resolve order or an empty list
*/
public List<OSGiBundleState> resolveBundles(List<Bundle> bundles)
Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/bundle/metadata/VersionRangeTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/bundle/metadata/VersionRangeTestCase.java 2009-11-03 12:17:22 UTC (rev 95947)
+++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/bundle/metadata/VersionRangeTestCase.java 2009-11-03 13:09:52 UTC (rev 95948)
@@ -3,8 +3,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import junit.framework.Test;
-
import org.jboss.logging.Logger;
import org.jboss.osgi.framework.metadata.VersionRange;
import org.jboss.osgi.framework.metadata.internal.AbstractVersionRange;
Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/bundle/test/BundleEntriesUnitTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/bundle/test/BundleEntriesUnitTestCase.java 2009-11-03 12:17:22 UTC (rev 95947)
+++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/bundle/test/BundleEntriesUnitTestCase.java 2009-11-03 13:09:52 UTC (rev 95948)
@@ -28,8 +28,6 @@
import java.util.HashSet;
import java.util.Set;
-import junit.framework.Test;
-
import org.jboss.test.osgi.OSGiTestCase;
import org.osgi.framework.Bundle;
Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/bundle/test/SystemBundleUnitTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/bundle/test/SystemBundleUnitTestCase.java 2009-11-03 12:17:22 UTC (rev 95947)
+++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/bundle/test/SystemBundleUnitTestCase.java 2009-11-03 13:09:52 UTC (rev 95948)
@@ -24,8 +24,6 @@
import java.util.Dictionary;
import java.util.Hashtable;
-import junit.framework.Test;
-
import org.jboss.test.osgi.OSGiTestCase;
import org.jboss.test.osgi.OSGiTestDelegate;
import org.osgi.framework.Bundle;
Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/classloader/test/RequireBundleUnitTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/classloader/test/RequireBundleUnitTestCase.java 2009-11-03 12:17:22 UTC (rev 95947)
+++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/classloader/test/RequireBundleUnitTestCase.java 2009-11-03 13:09:52 UTC (rev 95948)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.osgi.classloader.test;
-import org.jboss.deployers.client.spi.IncompleteDeploymentException;
import org.jboss.test.osgi.OSGiTestCase;
import org.jboss.test.osgi.classloader.support.a.A;
import org.jboss.test.osgi.classloader.support.b.B;
Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/filter/test/BundleContextFilterUnitTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/filter/test/BundleContextFilterUnitTestCase.java 2009-11-03 12:17:22 UTC (rev 95947)
+++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/filter/test/BundleContextFilterUnitTestCase.java 2009-11-03 13:09:52 UTC (rev 95948)
@@ -23,8 +23,6 @@
import java.util.Dictionary;
-import junit.framework.Test;
-
import org.jboss.test.osgi.OSGiTestDelegate;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/test/GetServiceReferencesUnitTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/test/GetServiceReferencesUnitTestCase.java 2009-11-03 12:17:22 UTC (rev 95947)
+++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/test/GetServiceReferencesUnitTestCase.java 2009-11-03 13:09:52 UTC (rev 95948)
@@ -24,8 +24,6 @@
import java.util.Dictionary;
import java.util.Hashtable;
-import junit.framework.Test;
-
import org.jboss.test.osgi.OSGiTestCase;
import org.jboss.test.osgi.service.support.a.A;
import org.jboss.test.osgi.service.support.b.B;
Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/test/GetUnGetServiceUnitTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/test/GetUnGetServiceUnitTestCase.java 2009-11-03 12:17:22 UTC (rev 95947)
+++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/test/GetUnGetServiceUnitTestCase.java 2009-11-03 13:09:52 UTC (rev 95948)
@@ -21,8 +21,6 @@
*/
package org.jboss.test.osgi.service.test;
-import junit.framework.Test;
-
import org.jboss.test.osgi.OSGiTestCase;
import org.jboss.test.osgi.service.support.BrokenServiceFactory;
import org.osgi.framework.Bundle;
Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/test/RegisterServiceUnitTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/test/RegisterServiceUnitTestCase.java 2009-11-03 12:17:22 UTC (rev 95947)
+++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/test/RegisterServiceUnitTestCase.java 2009-11-03 13:09:52 UTC (rev 95948)
@@ -24,8 +24,6 @@
import java.util.Dictionary;
import java.util.Hashtable;
-import junit.framework.Test;
-
import org.jboss.test.osgi.OSGiTestCase;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/test/ServiceRegistrationUnitTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/test/ServiceRegistrationUnitTestCase.java 2009-11-03 12:17:22 UTC (rev 95947)
+++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/test/ServiceRegistrationUnitTestCase.java 2009-11-03 13:09:52 UTC (rev 95948)
@@ -23,8 +23,6 @@
import java.util.Hashtable;
-import junit.framework.Test;
-
import org.jboss.test.osgi.OSGiTestCase;
import org.jboss.test.osgi.service.support.SimpleServiceFactory;
import org.osgi.framework.Bundle;
Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/smoke/test/OSGiSmokeTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/smoke/test/OSGiSmokeTestCase.java 2009-11-03 12:17:22 UTC (rev 95947)
+++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/smoke/test/OSGiSmokeTestCase.java 2009-11-03 13:09:52 UTC (rev 95948)
@@ -24,8 +24,6 @@
import java.io.InputStream;
import java.net.URL;
-import junit.framework.Test;
-
import org.jboss.test.osgi.OSGiTestCase;
import org.jboss.test.osgi.smoke.support.a.A;
import org.jboss.test.osgi.smoke.support.a.b.B;
More information about the jboss-osgi-commits
mailing list