incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject svn commit: r1478715 - in /sling/trunk/launchpad: integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ integration-tests/src/main/resources/integration-test/serverscripts/ test-services/ test-services/src/main/resources/SL...
Date Fri, 03 May 2013 10:28:51 GMT
Author: bdelacretaz
Date: Fri May  3 10:28:50 2013
New Revision: 1478715

URL: http://svn.apache.org/r1478715
Log:
SLING-2818 - move JSP engine config to initial content to avoid timing issues

Added:
    sling/trunk/launchpad/test-services/src/main/resources/SLING-INF/install/
    sling/trunk/launchpad/test-services/src/main/resources/SLING-INF/install/org.apache.sling.scripting.jsp.JspScriptEngineFactory.json
  (with props)
Removed:
    sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/serverscripts/jsp-engine-setup.jsp
Modified:
    sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JspTestBase.java
    sling/trunk/launchpad/test-services/pom.xml

Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JspTestBase.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JspTestBase.java?rev=1478715&r1=1478714&r2=1478715&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JspTestBase.java
(original)
+++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JspTestBase.java
Fri May  3 10:28:50 2013
@@ -16,30 +16,9 @@
  */
 package org.apache.sling.launchpad.webapp.integrationtest;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /** Base class for tests that use JSP - configures the JSP
  *  scripting engine in a test-friendly way
  */
 public abstract class JspTestBase extends RenderingTestBase {
-
-    /** Logger instance */
-    private static final Logger log =
-            LoggerFactory.getLogger(JspTestBase.class);
-
-    public static final String SCRIPT = "serverscripts/jsp-engine-setup.jsp";
-    private static boolean jspEngineConfigured;
-    
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        
-        if(!jspEngineConfigured) {
-            final String content = executeScript(SCRIPT);
-            assertTrue("JSP engine setup script must return success message", content.contains("Configuration
updated"));
-            jspEngineConfigured = true;
-            log.info("JSP script engine configured using {}", SCRIPT);
-        }
-    }
 }

Modified: sling/trunk/launchpad/test-services/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/pom.xml?rev=1478715&r1=1478714&r2=1478715&view=diff
==============================================================================
--- sling/trunk/launchpad/test-services/pom.xml (original)
+++ sling/trunk/launchpad/test-services/pom.xml Fri May  3 10:28:50 2013
@@ -66,7 +66,10 @@
                         <Sling-Nodetypes>
                             SLING-INF/nodetypes/test.cnd
                         </Sling-Nodetypes>
-                        <Sling-Initial-Content>SLING-INF/content;path:=/sling-test</Sling-Initial-Content>
+                        <Sling-Initial-Content>
+                            SLING-INF/content;path:=/sling-test;overwrite=true;uninstall=true,
+                            SLING-INF/install;path:=/apps/sling-test/install;overwrite=true;uninstall=true
+                        </Sling-Initial-Content>
                         <Sling-Bundle-Resources>
                         	/sling-test/sling/from-bundle;path:=/SLING-INF/res/sling-test/sling/from-bundle,
                         	/system;path:=/SLING-INF/res/sling-test/sling/SLING-1733

Added: sling/trunk/launchpad/test-services/src/main/resources/SLING-INF/install/org.apache.sling.scripting.jsp.JspScriptEngineFactory.json
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/resources/SLING-INF/install/org.apache.sling.scripting.jsp.JspScriptEngineFactory.json?rev=1478715&view=auto
==============================================================================
--- sling/trunk/launchpad/test-services/src/main/resources/SLING-INF/install/org.apache.sling.scripting.jsp.JspScriptEngineFactory.json
(added)
+++ sling/trunk/launchpad/test-services/src/main/resources/SLING-INF/install/org.apache.sling.scripting.jsp.JspScriptEngineFactory.json
Fri May  3 10:28:50 2013
@@ -0,0 +1,6 @@
+{
+  "jcr:primaryType": "sling:OsgiConfig",
+  "config.comment": "setup the JSP engine for running tests - this comes from the test-services
bundle's initial content",
+  "jasper.development": "true",
+  "jasper.modificationTestInterval": "0"
+}

Propchange: sling/trunk/launchpad/test-services/src/main/resources/SLING-INF/install/org.apache.sling.scripting.jsp.JspScriptEngineFactory.json
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message