You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@felix.apache.org by "Richard S. Hall" <he...@ungoverned.org> on 2010/02/23 06:05:29 UTC
Re: svn commit: r915184 - in /felix/trunk: bundlerepository/src/main/java/org/apache/felix/bundlerepository/
bundlerepository/src/test/java/org/apache/felix/bundlerepository/ org.osgi.service.obr/src/main/java/org/osgi/service/obr/
On 2/23/10 1:03 PM, rickhall@apache.org wrote:
> Author: rickhall
> Date: Tue Feb 23 05:03:47 2010
> New Revision: 915184
>
> URL: http://svn.apache.org/viewvc?rev=915184&view=rev
> Log:
> Fixed an apparent type. (FELIX-2115)
>
That should say, "typo"...d'oh!
-> richard
> Added:
> felix/trunk/org.osgi.service.obr/src/main/java/org/osgi/service/obr/InterruptedResolutionException.java
> - copied, changed from r915176, felix/trunk/org.osgi.service.obr/src/main/java/org/osgi/service/obr/InterrupteResolutionException.java
> Removed:
> felix/trunk/org.osgi.service.obr/src/main/java/org/osgi/service/obr/InterrupteResolutionException.java
> Modified:
> felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResolverImpl.java
> felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/FilterImplTest.java
> felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/RepositoryAdminTest.java
> felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/ResolverImplTest.java
> felix/trunk/org.osgi.service.obr/src/main/java/org/osgi/service/obr/Resolver.java
>
> Modified: felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResolverImpl.java
> URL: http://svn.apache.org/viewvc/felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResolverImpl.java?rev=915184&r1=915183&r2=915184&view=diff
> ==============================================================================
> --- felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResolverImpl.java (original)
> +++ felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResolverImpl.java Tue Feb 23 05:03:47 2010
> @@ -481,7 +481,7 @@
> {
> if (Thread.interrupted())
> {
> - throw new InterrupteResolutionException();
> + throw new InterruptedResolutionException();
> }
> }
>
>
> Modified: felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/FilterImplTest.java
> URL: http://svn.apache.org/viewvc/felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/FilterImplTest.java?rev=915184&r1=915183&r2=915184&view=diff
> ==============================================================================
> --- felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/FilterImplTest.java (original)
> +++ felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/FilterImplTest.java Tue Feb 23 05:03:47 2010
> @@ -119,4 +119,4 @@
> dict.put("PACKAGE", "org.eclipse.core.runtime");
> assertFalse(filterImpl.matchCase(dict));
> }
> -}
> +}
> \ No newline at end of file
>
> Modified: felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/RepositoryAdminTest.java
> URL: http://svn.apache.org/viewvc/felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/RepositoryAdminTest.java?rev=915184&r1=915183&r2=915184&view=diff
> ==============================================================================
> --- felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/RepositoryAdminTest.java (original)
> +++ felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/RepositoryAdminTest.java Tue Feb 23 05:03:47 2010
> @@ -27,7 +27,6 @@
>
> public class RepositoryAdminTest extends TestCase
> {
> -
> public void testResourceFilterOnCapabilities() throws Exception
> {
> URL url = getClass().getResource("/repo_for_resolvertest.xml");
> @@ -44,7 +43,6 @@
> assertEquals(1, resources.length);
> }
>
> -
> private RepositoryAdminImpl createRepositoryAdmin()
> {
> final MockBundleContext bundleContext = new MockBundleContext() {
> @@ -63,5 +61,4 @@
>
> return repoAdmin;
> }
> -
> -}
> +}
> \ No newline at end of file
>
> Modified: felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/ResolverImplTest.java
> URL: http://svn.apache.org/viewvc/felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/ResolverImplTest.java?rev=915184&r1=915183&r2=915184&view=diff
> ==============================================================================
> --- felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/ResolverImplTest.java (original)
> +++ felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/ResolverImplTest.java Tue Feb 23 05:03:47 2010
> @@ -22,7 +22,7 @@
>
> import junit.framework.TestCase;
>
> -import org.osgi.service.obr.InterrupteResolutionException;
> +import org.osgi.service.obr.InterruptedResolutionException;
> import org.osgi.service.obr.Repository;
> import org.osgi.service.obr.Requirement;
> import org.osgi.service.obr.Resolver;
> @@ -91,7 +91,7 @@
> resolver.resolve();
> fail("An excepiton should have been thrown");
> }
> - catch (InterrupteResolutionException e)
> + catch (InterruptedResolutionException e)
> {
> // ok
> }
>
> Copied: felix/trunk/org.osgi.service.obr/src/main/java/org/osgi/service/obr/InterruptedResolutionException.java (from r915176, felix/trunk/org.osgi.service.obr/src/main/java/org/osgi/service/obr/InterrupteResolutionException.java)
> URL: http://svn.apache.org/viewvc/felix/trunk/org.osgi.service.obr/src/main/java/org/osgi/service/obr/InterruptedResolutionException.java?p2=felix/trunk/org.osgi.service.obr/src/main/java/org/osgi/service/obr/InterruptedResolutionException.java&p1=felix/trunk/org.osgi.service.obr/src/main/java/org/osgi/service/obr/InterrupteResolutionException.java&r1=915176&r2=915184&rev=915184&view=diff
> ==============================================================================
> --- felix/trunk/org.osgi.service.obr/src/main/java/org/osgi/service/obr/InterrupteResolutionException.java (original)
> +++ felix/trunk/org.osgi.service.obr/src/main/java/org/osgi/service/obr/InterruptedResolutionException.java Tue Feb 23 05:03:47 2010
> @@ -22,27 +22,24 @@
> *
> * Exception thrown by the resolver if the resolution has been interrupted.
> */
> -public class InterrupteResolutionException extends RuntimeException
> +public class InterruptedResolutionException extends RuntimeException
> {
> -
> - public InterrupteResolutionException()
> + public InterruptedResolutionException()
> {
> }
>
> - public InterrupteResolutionException(String message)
> + public InterruptedResolutionException(String message)
> {
> super(message);
> }
>
> - public InterrupteResolutionException(String message, Throwable cause)
> + public InterruptedResolutionException(String message, Throwable cause)
> {
> super(message, cause);
> }
>
> - public InterrupteResolutionException(Throwable cause)
> + public InterruptedResolutionException(Throwable cause)
> {
> super(cause);
> }
> -
> -}
> -
> +}
> \ No newline at end of file
>
> Modified: felix/trunk/org.osgi.service.obr/src/main/java/org/osgi/service/obr/Resolver.java
> URL: http://svn.apache.org/viewvc/felix/trunk/org.osgi.service.obr/src/main/java/org/osgi/service/obr/Resolver.java?rev=915184&r1=915183&r2=915184&view=diff
> ==============================================================================
> --- felix/trunk/org.osgi.service.obr/src/main/java/org/osgi/service/obr/Resolver.java (original)
> +++ felix/trunk/org.osgi.service.obr/src/main/java/org/osgi/service/obr/Resolver.java Tue Feb 23 05:03:47 2010
> @@ -77,7 +77,7 @@
> * time. The result will be to stop the resolver and throw an InterruptedException.
> *
> * @return<code>true</code> if the resolution has succeeded else<code>false</code>
> - * @throws InterrupteResolutionException if the resolution has been interrupted
> + * @throws InterruptedResolutionException if the resolution has been interrupted
> */
> boolean resolve();
>
>
>
>