Author: hasan
Date: Wed Jan 18 10:05:37 2012
New Revision: 1232812
URL: http://svn.apache.org/viewvc?rev=1232812&view=rev
Log:
CLEREZZA-672: made jQuery url used by headed-page-template.ssp configurable via
the service property jQueryUrl of the new WebRenderingService ClassicStyleConfig
Added:
incubator/clerezza/trunk/parent/platform.style.classic/src/main/java/org/apache/clerezza/platform/style/classic/ClassicStyleConfig.java
Modified:
incubator/clerezza/trunk/parent/platform.style.classic/src/main/resources/org/apache/clerezza/platform/style/classic/headed-page-template.ssp
Added:
incubator/clerezza/trunk/parent/platform.style.classic/src/main/java/org/apache/clerezza/platform/style/classic/ClassicStyleConfig.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.style.classic/src/main/java/org/apache/clerezza/platform/style/classic/ClassicStyleConfig.java?rev=1232812&view=auto
==============================================================================
---
incubator/clerezza/trunk/parent/platform.style.classic/src/main/java/org/apache/clerezza/platform/style/classic/ClassicStyleConfig.java
(added)
+++
incubator/clerezza/trunk/parent/platform.style.classic/src/main/java/org/apache/clerezza/platform/style/classic/ClassicStyleConfig.java
Wed Jan 18 10:05:37 2012
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.clerezza.platform.style.classic;
+
+import org.apache.clerezza.platform.typerendering.WebRenderingService;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.ComponentContext;
+
+/**
+ *
+ * @author hasan
+ */
+@Component(immediate=true, metatype=true)
+@Service(ClassicStyleConfig.class)
+@WebRenderingService
+public class ClassicStyleConfig {
+ private static final String DEFAULT_JQUERY_URL =
"/jquery/jquery-1.3.2.min.js";
+
+ @Property(value = "/jquery/jquery-1.3.2.min.js",
+ description = "Specifies the URL of the jQuery script")
+ public static final String JQUERY_URL = "jQueryUrl";
+
+ private String jQueryUrl = DEFAULT_JQUERY_URL;
+
+ protected void activate(ComponentContext context) {
+ jQueryUrl = (String) context.getProperties().get(JQUERY_URL);
+ }
+
+ public String getJQueryUrl() {
+ return jQueryUrl.isEmpty() ? DEFAULT_JQUERY_URL : jQueryUrl;
+ }
+}
Modified:
incubator/clerezza/trunk/parent/platform.style.classic/src/main/resources/org/apache/clerezza/platform/style/classic/headed-page-template.ssp
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.style.classic/src/main/resources/org/apache/clerezza/platform/style/classic/headed-page-template.ssp?rev=1232812&r1=1232811&r2=1232812&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform.style.classic/src/main/resources/org/apache/clerezza/platform/style/classic/headed-page-template.ssp
(original)
+++
incubator/clerezza/trunk/parent/platform.style.classic/src/main/resources/org/apache/clerezza/platform/style/classic/headed-page-template.ssp
Wed Jan 18 10:05:37 2012
@@ -18,9 +18,15 @@
* under the License.
*
*/
+import org.apache.clerezza.platform.style.classic._
resultDocModifier.addStyleSheet("/style/style.css");
-resultDocModifier.addScriptReference("/jquery/jquery-1.3.2.min.js");
+try {
+ val jQueryUrl = $[ClassicStyleConfig].getJQueryUrl();
+ resultDocModifier.addScriptReference(jQueryUrl);
+} catch {
+ case e:Exception =>
resultDocModifier.addScriptReference("/jquery/jquery-1.3.2.min.js");
+}
resultDocModifier.addScriptReference("/jquery/jquery.menu.js");
resultDocModifier.addScriptReference("/jquery/jquery.panel.js");
resultDocModifier.addScriptReference("/style/scripts/panel.js");
