Author: kevinshen
Date: 2010-01-22 03:38:54 +0100 (Fri, 22 Jan 2010)
New Revision: 40675
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/web.xml
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/stylesheet/edit_stylesheet.xml
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/stylesheet/load_stylesheet.xml
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/servlet/StylesheetServlet.java
CMSContainer/trunk/CMSContainer/migration/migration_1.7_to_1.8.txt
Log:
CMSC-1565 Extend stylesheet feature with stylesheet data from database
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/web.xml
===================================================================
--- CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/web.xml
2010-01-22 00:43:29 UTC (rev 40674)
+++ CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/web.xml
2010-01-22 02:38:54 UTC (rev 40675)
@@ -277,7 +277,6 @@
<description>Returns css text</description>
<servlet-name>stylesheet</servlet-name>
<servlet-class>com.finalist.cmsc.servlet.StylesheetServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
@@ -315,7 +314,7 @@
<servlet-mapping>
<servlet-name>stylesheet</servlet-name>
- <url-pattern>*.css</url-pattern>
+ <url-pattern>/stylesheet/*</url-pattern>
</servlet-mapping>
<mime-mapping>
Modified:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/stylesheet/edit_stylesheet.xml
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/stylesheet/edit_stylesheet.xml
2010-01-22 00:43:29 UTC (rev 40674)
+++
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/stylesheet/edit_stylesheet.xml
2010-01-22 02:38:54 UTC (rev 40675)
@@ -15,7 +15,7 @@
<prompt xml:lang="nl">Omschrijving</prompt>
<prompt xml:lang="zh">描述</prompt>
</field>
- <field name="resource" dtmaxlength="255" ftype="line" dtrequired="true">
+ <field name="resource" dtmaxlength="255" ftype="line" >
<prompt xml:lang="en">Resource</prompt>
<prompt xml:lang="nl">Style Sheet</prompt>
<prompt xml:lang="zh">样式表</prompt>
@@ -32,4 +32,10 @@
<prompt xml:lang="zh">可覆盖</prompt>
<optionlist select="boolean" />
</field>
+ <field name="text" dtmaxlength="1024" ftype="text" rows="3">
+ <prompt xml:lang="en">Text</prompt>
+ <prompt xml:lang="nl">Text</prompt>
+ <prompt xml:lang="zh">脚本</prompt>
+ <optionlist select="boolean" />
+ </field>
</form-schema>
\ No newline at end of file
Modified:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/stylesheet/load_stylesheet.xml
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/stylesheet/load_stylesheet.xml
2010-01-22 00:43:29 UTC (rev 40674)
+++
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/stylesheet/load_stylesheet.xml
2010-01-22 02:38:54 UTC (rev 40675)
@@ -2,8 +2,9 @@
<!DOCTYPE action PUBLIC "-//MMBase/DTD editwizard 1.0//EN"
"http://www.mmbase.org/dtd/wizard-schema_1_0.dtd";>
<action type="load">
<field name="title"/>
- <field name="description"/>
- <field name="resource"/>
- <field name="media"/>
- <field name="overwriteable"/>
+ <field name="description"/>
+ <field name="resource"/>
+ <field name="media"/>
+ <field name="overwriteable"/>
+ <field name="text"/>
</action>
\ No newline at end of file
Modified:
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/servlet/StylesheetServlet.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/servlet/StylesheetServlet.java
2010-01-22 00:43:29 UTC (rev 40674)
+++
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/servlet/StylesheetServlet.java
2010-01-22 02:38:54 UTC (rev 40675)
@@ -14,6 +14,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.mmbase.bridge.Node;
import org.mmbase.servlet.BridgeServlet;
/**
@@ -29,19 +30,28 @@
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse
response) throws IOException {
- doRedirect(request, response);
+ renderText(request, response);
}
@Override
protected void doPost(HttpServletRequest request, HttpServletResponse
response) throws IOException {
- doRedirect(request, response);
+ renderText(request, response);
}
- private void doRedirect(HttpServletRequest request, HttpServletResponse
response) throws IOException {
- String text = null;
- text = request.getParameter("text");
+ private void renderText(HttpServletRequest request, HttpServletResponse
response) throws IOException {
+ String pathInfo = request.getPathInfo();
+ response.setContentType("text/css");
+ String number = null;
+ if (pathInfo != null) {
+ number = pathInfo.replaceAll("/|.css", "");
+ }
+ if (number != null) {
+ if (number.matches("[0-9]+")) {
+ Node stylesheet= getAnonymousCloud().getNode(number);
+ String text = stylesheet.getStringValue("text");
+ response.getWriter().print(text);
+ }
+ }
- response.setContentType("text/css");
- response.getWriter().print(text);
}
}
Modified: CMSContainer/trunk/CMSContainer/migration/migration_1.7_to_1.8.txt
===================================================================
--- CMSContainer/trunk/CMSContainer/migration/migration_1.7_to_1.8.txt
2010-01-22 00:43:29 UTC (rev 40674)
+++ CMSContainer/trunk/CMSContainer/migration/migration_1.7_to_1.8.txt
2010-01-22 02:38:54 UTC (rev 40675)
@@ -9,6 +9,7 @@
Type: manual action
--- Start script ---
ALTER TABLE mm_stylesheet ADD text text default '';
+ALTER TABLE live_stylesheet ADD text text default '';
--- End script ---
Exceptions/errors/other problems and what to do:
*
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
