replace velocity in css and js

src/main/webapp/WEB-INF/hibernate.cfg.xml

@@ -4,15 +4,10 @@
 <hibernate-configuration>
   <session-factory>
 
-    <!-- spotless:off -->
-    <!-- Please refer to the installation guide on
-         http://platform.xwiki.org/xwiki/bin/view/AdminGuide/Installation for configuring your
-         database. You'll need to do 2 things:
-         1) Copy your database driver JAR in WEB-INF/lib or in some shared lib directory
-         2) Uncomment the properties below for your specific DB (and comment the default 
-            database configuration if it doesn't match your DB)
-    -->
-    <!-- spotless:on -->
+    <!-- Please refer to the installation guide on http://platform.xwiki.org/xwiki/bin/view/AdminGuide/Installation for configuring 
+      your database. You'll need to do 2 things: 1) Copy your database driver JAR in WEB-INF/lib or in some shared lib directory 
+      2) Uncomment the properties below for your specific DB (and comment the default database configuration if it doesn't match 
+      your DB) -->
 
     <!-- Generic parameters common to all Databases -->
 

src/main/webapp/WEB-INF/struts-config.xml

@@ -7,23 +7,9 @@
 
 <struts-config>
 
-  <!-- spotless:off -->
-    <!-- ========== Data Source Configuration =============================== -->
-    <!--
-      <data-sources>
-        <data-source
-           autoCommit="false"
-          description="Example Data Source Configuration"
-          driverClass="org.postgresql.Driver"
-             maxCount="4"
-             minCount="2"
-             password="mypassword"
-                  url="jdbc:postgresql://localhost/mydatabase"
-                 user="myusername"
-        />
-      </data-sources>
-    -->
-    <!-- spotless:on -->
+  <!-- ========== Data Source Configuration =============================== -->
+  <!-- <data-sources> <data-source autoCommit="false" description="Example Data Source Configuration" driverClass="org.postgresql.Driver" 
+    maxCount="4" minCount="2" password="mypassword" url="jdbc:postgresql://localhost/mydatabase" user="myusername" /> </data-sources> -->
 
   <!-- ========== Form Bean Definitions =================================== -->
   <form-beans>

src/main/webapp/WEB-INF/web.xml

@@ -29,8 +29,7 @@
   </filter>
 
   <!-- This filter is an implementation of W3C's CORS (Cross-Origin Resource Sharing) specification, which is a mechanism 
-    that enables cross-origin requests. -->
-  <!-- TODO [CELDEV-1169] instead use Spring MVC @CrossOrigin when struts is replaced -->
+    that enables cross-origin requests. TODO [CELDEV-1169] instead use Spring MVC @CrossOrigin when struts is replaced -->
   <filter>
     <filter-name>CorsFilter</filter-name>
     <filter-class>org.apache.catalina.filters.CorsFilter</filter-class>
@@ -174,9 +173,9 @@
   <servlet>
     <servlet-name>redirectHomeServlet</servlet-name>
     <servlet-class>com.xpn.xwiki.web.HomePageRedirectServlet</servlet-class>
-    <!-- Uncomment and edit this if you want to redirect to a different home page, or if you have different mappings. -->
-    <!-- Note: the URL should not start with /, because it allows the context name to be changed. If it starts with /, then 
-      it should be an absolute URL, including the application context path. -->
+    <!-- Uncomment and edit this if you want to redirect to a different home page, or if you have different mappings. Note: 
+      the URL should not start with /, because it allows the context name to be changed. If it starts with /, then it should be 
+      an absolute URL, including the application context path. -->
     <init-param>
       <description>The address to redirect to when the client hits the root of the application.</description>
       <param-name>homePage</param-name>
@@ -230,23 +229,6 @@
     <url-pattern>/api/*</url-pattern>
   </servlet-mapping>
 
-  <!-- We override the mime type definition for javascript, javascript module and css files, as some containers don't provide 
-    it, causing problems for javascript files containg velocity code, like fullscreenEdit.js -->
-  <mime-mapping>
-    <extension>js</extension>
-    <mime-type>text/javascript</mime-type>
-  </mime-mapping>
-
-  <mime-mapping>
-    <extension>mjs</extension>
-    <mime-type>text/javascript</mime-type>
-  </mime-mapping>
-
-  <mime-mapping>
-    <extension>css</extension>
-    <mime-type>text/css</mime-type>
-  </mime-mapping>
-
   <!-- In order to properly work, HTML Components MUST have the proper MIME type starting with XP SP2 -->
   <mime-mapping>
     <extension>htc</extension>
@@ -258,6 +240,13 @@
     <mime-type>image/bmp</mime-type>
   </mime-mapping>
 
+  <!-- Redirects to the Main.WebHome page if the user calls the root of the webapp, i.e. http://server:port/xwiki/ Note 1: 
+    for this to work fine the redirect file needs to exist in the WAR Note 2: with Servlet 2.4 it's possible to have a Servlet 
+    directly specified in the welcome file list but right now we'd like XWiki to work out of the box with Servlet 2.3 -->
+  <welcome-file-list>
+    <welcome-file>redirect</welcome-file>
+  </welcome-file-list>
+
   <error-page>
     <error-code>404</error-code>
     <location>/DocumentDoesNotExist</location>

src/main/webapp/docs/celements2web/Panels/ClassEditorWelcome.xml

@@ -104,44 +104,8 @@
 <category>Information</category>
 </property>
 <property>
-<content>#largepanelheader($msg.get("classEditorIntro"))
-##$xwiki.jsx.use('Panels.ClassSwitcher')##
-&lt;p&gt;$msg.get("xe.panels.classedit.youare") &lt;strong&gt;${doc.fullName}&lt;/strong&gt;. $msg.get("xe.panels.classedit.chooseproperty")&lt;/p&gt;
-&lt;div&gt;
-&lt;form id="changeclass" method="post" action="$doc.getURL("redirect")"&gt;
-&lt;div&gt;
-&lt;select id="classname" name="xredirect" size="1"&gt;
-&lt;option value="-"&gt;Edit another class&lt;/option&gt;
-##
-## Existing classes are enumerated, grouped by space name.
-## The list is already sorted alphabetically
-##
-#set($prevSpace = "")
-#set($optGroupOpen = false)
-#foreach ($classname in $xwiki.classList)
-  #if($!xwiki.hasAccessLevel("edit", $classname))
-    #set($classdoc = $xwiki.getDocument($classname))
-    #if($classdoc.space != $prevSpace)
-      #if($optGroupOpen)
-        &lt;/optgroup&gt;
-      #else
-        #set($optGroupOpen = true)
-      #end
-          &lt;optgroup label="$classdoc.space"&gt;
-      #set($prevSpace = $classdoc.space)
-    #end
-    &lt;option value="$classdoc.getURL("edit", "editor=class")"&gt;$classdoc.name&lt;/option&gt;
-  #end
-#end
-#if($optGroupOpen)
-        &lt;/optgroup&gt;
-#end
-&lt;/select&gt;
-&lt;span class="buttonwrapper"&gt;&lt;input class="button" type="submit" value="$msg.get("changeclass")"/&gt;&lt;/span&gt;&lt;/div&gt;
-#warning($msg.get('xe.panels.classedit.unsavedchanges'))
-&lt;/form&gt;
-&lt;/div&gt;
-#panelfooter()</content>
+<content>#largepanelheader($msg.get("classEditorIntro")) <p>$msg.get("xe.panels.classedit.youare") <strong>
+${doc.fullName}</strong>. $msg.get("xe.panels.classedit.chooseproperty")</p> #panelfooter()</content>
 </property>
 <property>
 <description>Class Editor welcome and brief information message.</description>
@@ -153,4 +117,5 @@
 <type>edit</type>
 </property>
 </object>
-<content>#includeForm("Panels.PanelSheet")</content></xwikidoc>
+<content>#includeForm("Panels.PanelSheet")</content>
+</xwikidoc>

src/main/webapp/docs/celements2web/Panels/ClassSwitcher.xml

@@ -105,7 +105,6 @@
 </property>
 <property>
 <content>#largepanelheader('Class Switcher')
-##$xwiki.jsx.use('Panels.ClassSwitcher')##
 &lt;div&gt;
 &lt;form id="changeclass" method="post" action="$doc.getURL("redirect")"&gt;
 &lt;div&gt;
@@ -118,25 +117,26 @@
 #set($prevSpace = "")
 #set($optGroupOpen = false)
 #foreach ($classname in $xwiki.classList)
-  #if($!xwiki.hasAccessLevel("edit", $classname))
-    #set($classdoc = $xwiki.getDocument($classname))
-    #if($classdoc.space != $prevSpace)
-      #if($optGroupOpen)
-        &lt;/optgroup&gt;
-      #else
-        #set($optGroupOpen = true)
-      #end
-          &lt;optgroup label="$classdoc.space"&gt;
-      #set($prevSpace = $classdoc.space)
-    #end
-    &lt;option value="$classdoc.getURL("edit", "editor=class")"&gt;$classdoc.name&lt;/option&gt;
-  #end
+#if($!xwiki.hasAccessLevel("edit", $classname))
+#set($classdoc = $xwiki.getDocument($classname))
+#if($classdoc.space != $prevSpace)
+#if($optGroupOpen)
+&lt;/optgroup&gt;
+#else
+#set($optGroupOpen = true)
+#end
+&lt;optgroup label="$classdoc.space"&gt;
+#set($prevSpace = $classdoc.space)
+#end
+&lt;option value="$classdoc.getURL("edit", "editor=class")"&gt;$classdoc.name&lt;/option&gt;
+#end
 #end
 #if($optGroupOpen)
-        &lt;/optgroup&gt;
+&lt;/optgroup&gt;
 #end
 &lt;/select&gt;
-&lt;span class="buttonwrapper"&gt;&lt;input class="button" type="submit" value="$msg.get("changeclass")"/&gt;&lt;/span&gt;&lt;/div&gt;
+&lt;span class="buttonwrapper"&gt;&lt;input class="button" type="submit"
+value="$msg.get("changeclass")"/&gt;&lt;/span&gt;&lt;/div&gt;
 #warning($msg.get('xe.panels.classedit.unsavedchanges'))
 &lt;/form&gt;
 &lt;/div&gt;
@@ -152,108 +152,5 @@
 <type>edit</type>
 </property>
 </object>
-<object>
-<class>
-<name>XWiki.JavaScriptExtension</name>
-<customClass></customClass>
-<customMapping></customMapping>
-<defaultViewSheet></defaultViewSheet>
-<defaultEditSheet></defaultEditSheet>
-<defaultWeb></defaultWeb>
-<nameField></nameField>
-<validationScript></validationScript>
-<cache>
-<cache>0</cache>
-<disabled>0</disabled>
-<displayType>select</displayType>
-<multiSelect>0</multiSelect>
-<name>cache</name>
-<number>5</number>
-<prettyName>Caching policy</prettyName>
-<relationalStorage>0</relationalStorage>
-<separator> </separator>
-<separators> ,|</separators>
-<size>1</size>
-<unmodifiable>0</unmodifiable>
-<values>long|short|default|forbid</values>
-<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
-</cache>
-<code>
-<disabled>0</disabled>
-<name>code</name>
-<number>2</number>
-<prettyName>Code</prettyName>
-<rows>20</rows>
-<size>50</size>
-<unmodifiable>0</unmodifiable>
-<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
-</code>
-<name>
-<disabled>0</disabled>
-<name>name</name>
-<number>1</number>
-<prettyName>Name</prettyName>
-<size>30</size>
-<unmodifiable>0</unmodifiable>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</name>
-<parse>
-<disabled>0</disabled>
-<displayFormType>select</displayFormType>
-<displayType>yesno</displayType>
-<name>parse</name>
-<number>4</number>
-<prettyName>Parse content</prettyName>
-<unmodifiable>0</unmodifiable>
-<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-</parse>
-<use>
-<cache>0</cache>
-<disabled>0</disabled>
-<displayType>select</displayType>
-<multiSelect>0</multiSelect>
-<name>use</name>
-<number>3</number>
-<prettyName>Use this extension</prettyName>
-<relationalStorage>0</relationalStorage>
-<separator> </separator>
-<separators> ,|</separators>
-<size>1</size>
-<unmodifiable>0</unmodifiable>
-<values>onDemand=On demand|always=Always</values>
-<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
-</use>
-</class>
-<name>Panels.ClassSwitcher</name>
-<number>0</number>
-<className>XWiki.JavaScriptExtension</className>
-<guid>951b5864-df3e-46d0-bdbe-bac923e58dc8</guid>
-<property>
-<cache>long</cache>
-</property>
-<property>
-<code>document.observe('dom:loaded', function() {
-  var switcher = $('classname');
-  if(typeof (switcher) != 'undefined') {
-    switcher.observe('change', function() {
-      var value = this.options[this.selectedIndex].value;
-      if (value != '-') {
-        window.self.location = value;
-      }
-    }.bindAsEventListener(switcher));
-    switcher.up('form').down("input[type='submit']").hide();
-  }
-});
-</code>
-</property>
-<property>
-<name>Instant class switcher</name>
-</property>
-<property>
-<parse>0</parse>
-</property>
-<property>
-<use>onDemand</use>
-</property>
-</object>
-<content>#includeForm("Panels.PanelSheet")</content></xwikidoc>
+<content>#includeForm("Panels.PanelSheet")</content>
+</xwikidoc>