You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2014/11/14 10:57:25 UTC

svn commit: r1639590 - in /sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit: OsgiContext.java OsgiContextCallback.java

Author: sseifert
Date: Fri Nov 14 09:57:23 2014
New Revision: 1639590

URL: http://svn.apache.org/r1639590
Log:
SLING-4162 fix javadoc

Modified:
    sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContext.java
    sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContextCallback.java

Modified: sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContext.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContext.java?rev=1639590&r1=1639589&r2=1639590&view=diff
==============================================================================
--- sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContext.java (original)
+++ sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContext.java Fri Nov 14 09:57:23 2014
@@ -34,16 +34,14 @@ public final class OsgiContext extends O
     private final TestRule delegate;
 
     /**
-     * Initialize Sling context with default resource resolver type:
-     * {@link org.apache.sling.testing.mock.sling.MockSling#DEFAULT_RESOURCERESOLVER_TYPE}.
+     * Initialize OSGi context.
      */
     public OsgiContext() {
         this(null, null);
     }
 
     /**
-     * Initialize Sling context with default resource resolver type:
-     * {@link org.apache.sling.testing.mock.sling.MockSling#DEFAULT_RESOURCERESOLVER_TYPE}.
+     * Initialize OSGi context.
      * @param setUpCallback Allows the application to register an own callback
      *            function that is called after the built-in setup rules are
      *            executed.
@@ -53,7 +51,7 @@ public final class OsgiContext extends O
     }
 
     /**
-     * Initialize Sling context with resource resolver type.
+     * Initialize OSGi context.
      * @param setUpCallback Allows the application to register an own callback
      *            function that is called after the built-in setup rules are
      *            executed.

Modified: sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContextCallback.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContextCallback.java?rev=1639590&r1=1639589&r2=1639590&view=diff
==============================================================================
--- sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContextCallback.java (original)
+++ sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContextCallback.java Fri Nov 14 09:57:23 2014
@@ -28,7 +28,7 @@ public interface OsgiContextCallback {
 
     /**
      * Execute callback action
-     * @param context Sling context
+     * @param context OSGi context
      * @throws IOException
      * @throws PersistenceException
      */