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 2016/01/26 00:02:54 UTC

svn commit: r1726710 - in /sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools: serversetup/ServerSetup.java serversetup/ServerSetupSingleton.java serversetup/StartRunnableJarPhase.java sling/SlingTestBase.java

Author: sseifert
Date: Mon Jan 25 23:02:53 2016
New Revision: 1726710

URL: http://svn.apache.org/viewvc?rev=1726710&view=rev
Log:
fix some javadoc errors with java 1.8

Modified:
    sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/serversetup/ServerSetup.java
    sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/serversetup/ServerSetupSingleton.java
    sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/serversetup/StartRunnableJarPhase.java
    sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/sling/SlingTestBase.java

Modified: sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/serversetup/ServerSetup.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/serversetup/ServerSetup.java?rev=1726710&r1=1726709&r2=1726710&view=diff
==============================================================================
--- sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/serversetup/ServerSetup.java (original)
+++ sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/serversetup/ServerSetup.java Mon Jan 25 23:02:53 2016
@@ -207,7 +207,7 @@ public class ServerSetup {
         runRemainingPhases(false);
     }
     
-    /** Return a context that {@SetupPhase} can use to 
+    /** Return a context that <code>@SetupPhase</code> can use to 
      *  communicate among them and with the outside.
      */
     public Map<String, Object> getContext() {

Modified: sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/serversetup/ServerSetupSingleton.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/serversetup/ServerSetupSingleton.java?rev=1726710&r1=1726709&r2=1726710&view=diff
==============================================================================
--- sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/serversetup/ServerSetupSingleton.java (original)
+++ sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/serversetup/ServerSetupSingleton.java Mon Jan 25 23:02:53 2016
@@ -29,7 +29,7 @@ public class ServerSetupSingleton {
     
     private static ServerSetup instance;
     
-    /** Create an instance based on the {@CLASS_NAME_PROP)
+    /** Create an instance based on the <code>@CLASS_NAME_PROP</code>
      *  property if needed and return it.
      *  
      *  @param config Ignored unless an instance is created

Modified: sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/serversetup/StartRunnableJarPhase.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/serversetup/StartRunnableJarPhase.java?rev=1726710&r1=1726709&r2=1726710&view=diff
==============================================================================
--- sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/serversetup/StartRunnableJarPhase.java (original)
+++ sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/serversetup/StartRunnableJarPhase.java Mon Jan 25 23:02:53 2016
@@ -55,17 +55,14 @@ public class StartRunnableJarPhase imple
         return getClass().getSimpleName() + " (" + id + ") " + description; 
     }
     
-    /** @inheritDoc */
     public void run(ServerSetup owner) throws Exception {
         executor.start();
     }
 
-    /** @inheritDoc */
     public boolean isStartupPhase() {
         return true;
     }
 
-    /** @inheritDoc */
     public String getId() {
         return id;
     }

Modified: sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/sling/SlingTestBase.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/sling/SlingTestBase.java?rev=1726710&r1=1726709&r2=1726710&view=diff
==============================================================================
--- sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/sling/SlingTestBase.java (original)
+++ sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/sling/SlingTestBase.java Mon Jan 25 23:02:53 2016
@@ -138,7 +138,7 @@ public class SlingTestBase implements Sl
     }
 
     /**
-     * Automatically by the {@link SlingRemoteTestRunner} since package version 1.1.0.
+     * Automatically by the SlingRemoteTestRunner since package version 1.1.0.
      */
     @After
     public void uninstallAdditionalBundlesIfNecessary() {