celements · fpichler · Mar 5, 2026 · Mar 5, 2026 · Mar 5, 2026 · Mar 5, 2026
diff --git a/pom.xml b/pom.xml
@@ -109,10 +109,6 @@
       <artifactId>celements-mailsender</artifactId>
       <version>7.0-SNAPSHOT</version>
     </dependency>
-    <dependency>
-      <groupId>com.xpn.xwiki.platform.plugins</groupId>
-      <artifactId>xwiki-plugin-skinx</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.xwiki.platform</groupId>
       <artifactId>xwiki-platform-tag-api</artifactId>
@@ -205,19 +201,19 @@
       <artifactId>celements-xwiki-core</artifactId>
       <version>7.0-SNAPSHOT</version>
     </dependency>
-     <dependency>
+    <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-xwiki-velocity</artifactId>
       <version>7.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
-      <artifactId>celements-xwiki-velocity</artifactId>
+      <artifactId>celements-xwiki-rendering-api</artifactId>
       <version>7.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
-      <artifactId>celements-xwiki-rendering-api</artifactId>
+      <artifactId>celements-xwiki-xml</artifactId>
       <version>7.0-SNAPSHOT</version>
     </dependency>
     <dependency>

diff --git a/src/main/webapp/WEB-INF/xwiki.cfg b/src/main/webapp/WEB-INF/xwiki.cfg
@@ -476,11 +476,6 @@ xwiki.plugins=\
     com.celements.calendar.plugin.CelementsCalendarPlugin,\
     com.xpn.xwiki.plugin.applicationmanager.ApplicationManagerPlugin,\
     com.xpn.xwiki.plugin.wikimanager.WikiManagerPlugin,\
-    com.xpn.xwiki.plugin.skinx.JsSkinExtensionPlugin,\
-    com.xpn.xwiki.plugin.skinx.JsSkinFileExtensionPlugin,\
-    com.xpn.xwiki.plugin.skinx.CssSkinExtensionPlugin,\
-    com.xpn.xwiki.plugin.skinx.CssSkinFileExtensionPlugin,\
-    com.xpn.xwiki.plugin.skinx.LinkExtensionPlugin,\
     com.xpn.xwiki.plugin.mail.MailPlugin,\
     com.xpn.xwiki.plugin.packaging.PackagePlugin,\
     com.xpn.xwiki.plugin.fileupload.FileUploadPlugin,\

diff --git a/src/main/webapp/docs/celements2web/Panels/ClassEditorWelcome.xml b/src/main/webapp/docs/celements2web/Panels/ClassEditorWelcome.xml
@@ -105,7 +105,7 @@
 </property>
 <property>
 <content>#largepanelheader($msg.get("classEditorIntro"))
-$xwiki.jsx.use('Panels.ClassSwitcher')##
+##$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;

diff --git a/src/main/webapp/docs/celements2web/Panels/ClassSwitcher.xml b/src/main/webapp/docs/celements2web/Panels/ClassSwitcher.xml
@@ -105,7 +105,7 @@
 </property>
 <property>
 <content>#largepanelheader('Class Switcher')
-$xwiki.jsx.use('Panels.ClassSwitcher')##
+##$xwiki.jsx.use('Panels.ClassSwitcher')##
 &lt;div&gt;
 &lt;form id="changeclass" method="post" action="$doc.getURL("redirect")"&gt;
 &lt;div&gt;

diff --git a/src/main/webapp/docs/celements2web/Panels/Navigation.xml b/src/main/webapp/docs/celements2web/Panels/Navigation.xml
@@ -142,8 +142,11 @@
 #end
 &lt;/div&gt;
 &lt;/div&gt;
-$xwiki.jsfx.use('js/scriptaculous/scriptaculous.js')
-$xwiki.jsfx.use('js/xwiki/accordion/accordion.js')
+#set($jsService = $services.javascript)
+#set($extJsParam = $jsService.createExtJSParam().setAction('file'))
+#set($extJsParam = $extJsParam.setLazyLoad(true))
+$!jsService.includeExtJsFile($extJsParam.setJsFile(':js/scriptaculous/scriptaculous.js'))##
+$!jsService.includeExtJsFile($extJsParam.setJsFile(':js/xwiki/accordion/accordion.js'))##
 &lt;script type="text/javascript"&gt;
 var obj = {div:'xwikinav',no:$spacecount,height:250};
 var acc = createAccordion(obj);

diff --git a/src/main/webapp/docs/celements2web/Panels/PanelWizard.xml b/src/main/webapp/docs/celements2web/Panels/PanelWizard.xml
@@ -352,11 +352,14 @@ dG8WUcuijwAAAABJRU5ErkJggg==
       #else
         #set($ajaxurl = $xwiki.getDocument("Panels.PanelLayoutUpdate").getURL("view", "xpage=plain&amp;prefsdoc=${currentDoc}"))
       #end
-      $xwiki.jsfx.use("js/scriptaculous/scriptaculous.js")
-      $xwiki.jsfx.use("js/xwiki/accordion/accordion.js")
-      $xwiki.jsfx.use("js/xwiki/panelwizard/Drag.js")
-      $xwiki.jsfx.use("js/xwiki/panelwizard/ieemu.js")
-      $xwiki.jsfx.use("js/xwiki/panelwizard/toolTip.js")
+      #set($jsService = $services.javascript)
+      #set($extJsParam = $jsService.createExtJSParam().setAction('file'))
+      #set($extJsParam = $extJsParam.setLazyLoad(true))
+      $!jsService.includeExtJsFile($extJsParam.setJsFile(':js/scriptaculous/scriptaculous.js'))##
+      $!jsService.includeExtJsFile($extJsParam.setJsFile(':js/xwiki/accordion/accordion.js'))##
+      $!jsService.includeExtJsFile($extJsParam.setJsFile(':js/xwiki/panelwizard/Drag.js'))##
+      $!jsService.includeExtJsFile($extJsParam.setJsFile(':js/xwiki/panelwizard/ieemu.js'))##
+      $!jsService.includeExtJsFile($extJsParam.setJsFile(':js/xwiki/panelwizard/toolTip.js'))##
       &lt;script type="text/javascript"&gt;
       //&lt;![CDATA[
       window.ajaxurl = "$ajaxurl";

diff --git a/src/main/webapp/docs/celements2web/Panels/RightsHelp.xml b/src/main/webapp/docs/celements2web/Panels/RightsHelp.xml
@@ -134,8 +134,11 @@ $msg.get("xe.panels.rights.allowdenyexplanation")
 &lt;/div&gt;
 #panelfooter()
 &lt;/div&gt;
-$xwiki.jsfx.use("js/scriptaculous/scriptaculous.js")
-$xwiki.jsfx.use("js/xwiki/accordion/accordion.js")
+#set($jsService = $services.javascript)
+#set($extJsParam = $jsService.createExtJSParam().setAction('file'))
+#set($extJsParam = $extJsParam.setLazyLoad(true))
+$!jsService.includeExtJsFile($extJsParam.setJsFile(':js/scriptaculous/scriptaculous.js'))##
+$!jsService.includeExtJsFile($extJsParam.setJsFile(':js/xwiki/accordion/accordion.js'))##
 &lt;script type="text/javascript"&gt;
 var obj = {div:'xwikirightshelp',no:0,height:512};
 var acc = createAccordion(obj);

diff --git a/src/main/webapp/docs/celements2web/Panels/RightsTips.xml b/src/main/webapp/docs/celements2web/Panels/RightsTips.xml
@@ -143,8 +143,11 @@ $msg.get("xe.panels.rights.bannedgroup")
 &lt;/div&gt;
 #panelfooter()
 &lt;/div&gt;
-$xwiki.jsfx.use("js/scriptaculous/scriptaculous.js")
-$xwiki.jsfx.use("js/xwiki/accordion/accordion.js")
+#set($jsService = $services.javascript)
+#set($extJsParam = $jsService.createExtJSParam().setAction('file'))
+#set($extJsParam = $extJsParam.setLazyLoad(true))
+$!jsService.includeExtJsFile($extJsParam.setJsFile(':js/scriptaculous/scriptaculous.js'))##
+$!jsService.includeExtJsFile($extJsParam.setJsFile(':js/xwiki/accordion/accordion.js'))##
 &lt;script type="text/javascript"&gt;
 var obj = {div:'xwikirightstips',no:0,height:250};
 var acc = createAccordion(obj);

diff --git a/src/main/webapp/docs/xwiki/XWiki/AdminGroupsSheet.xml b/src/main/webapp/docs/xwiki/XWiki/AdminGroupsSheet.xml
@@ -29,11 +29,14 @@
 ##
 ## Inject needed JS and CSS files
 ##
-#set($ok = $xwiki.jsfx.use("js/xwiki/lightbox/lightbox.js", true))
-#set($ok = $xwiki.jsfx.use("js/xwiki/usersandgroups/usersandgroups.js", true))
-#set($ok = $xwiki.ssfx.use("js/xwiki/usersandgroups/usersandgroups.css", true))
-#set($ok = $xwiki.jsfx.use("js/xwiki/table/livetable.js", true))
-#set($ok = $xwiki.ssfx.use("js/xwiki/table/livetable.css", true))
+#set($jsService = $services.javascript)
+#set($extJsParam = $jsService.createExtJSParam().setAction('file'))
+#set($extJsParam = $extJsParam.setLazyLoad(true))
+$!jsService.includeExtJsFile($extJsParam.setJsFile(':js/xwiki/lightbox/lightbox.js'))##
+$!jsService.includeExtJsFile($extJsParam.setJsFile(':js/xwiki/usersandgroups/usersandgroups.js'))##
+$services.css.includeCSSPage(':js/xwiki/usersandgroups/usersandgroups.css')##
+$!jsService.includeExtJsFile($extJsParam.setJsFile(':js/xwiki/table/livetable.js'))##
+$services.css.includeCSSPage(':js/xwiki/table/livetable.css')##
 ##
 ## url to get the groups for displaying them in the ajax-based table
 ##

diff --git a/src/main/webapp/docs/xwiki/XWiki/AdminSheet.xml b/src/main/webapp/docs/xwiki/XWiki/AdminSheet.xml
@@ -2782,9 +2782,12 @@ p.legend {
   ##-------------------------------------
   ## determine the displayed sections
   ##-------------------------------------
-  $xwiki.jsfx.use('js/scriptaculous/scriptaculous.js')##
-  $xwiki.jsx.use('XWiki.AdminSheet')##
-  $xwiki.ssx.use('XWiki.AdminSheet')##
+  #set($jsService = $services.javascript)
+  #set($extJsParam = $jsService.createExtJSParam().setAction('file'))
+  #set($extJsParam = $extJsParam.setLazyLoad(true))
+  $!jsService.includeExtJsFile($extJsParam.setJsFile(':js/scriptaculous/scriptaculous.js'))##
+##  $xwiki.jsx.use('XWiki.AdminSheet')##
+##  $xwiki.ssx.use('XWiki.AdminSheet')##
   #if($editor == 'globaladmin')
     #set($currentDoc = 'XWiki.XWikiPreferences')
     #set($sections = ['General', 'Presentation', 'Registration', 'Programming', 'Rights', 'Users', 'Groups', 'Import', 'Export', 'Templates'])

diff --git a/src/main/webapp/docs/xwiki/XWiki/AdminUsersSheet.xml b/src/main/webapp/docs/xwiki/XWiki/AdminUsersSheet.xml
@@ -29,13 +29,16 @@
 ##
 ## inject needed JS and CSS files
 ##
-#set($ok = $xwiki.jsfx.use("js/xwiki/lightbox/lightbox.js", true))
-#set($ok = $xwiki.jsfx.use("js/xwiki/usersandgroups/usersandgroups.js", true))
-#set($ok = $xwiki.ssfx.use("js/xwiki/usersandgroups/usersandgroups.css", true))
-#set($ok = $xwiki.jsfx.use("js/xwiki/table/livetable.js", true))
-#set($ok = $xwiki.ssfx.use("js/xwiki/table/livetable.css", true))
-#set($ok = $xwiki.ssx.use("XWiki.XWikiUserSheet"))
-#set($ok = $xwiki.jsx.use("XWiki.XWikiUserSheet"))
+#set($jsService = $services.javascript)
+#set($extJsParam = $jsService.createExtJSParam().setAction('file'))
+#set($extJsParam = $extJsParam.setLazyLoad(true))
+$!jsService.includeExtJsFile($extJsParam.setJsFile(':js/xwiki/lightbox/lightbox.js'))##
+$!jsService.includeExtJsFile($extJsParam.setJsFile(':js/xwiki/usersandgroups/usersandgroups.js'))##
+$services.css.includeCSSPage(':js/xwiki/usersandgroups/usersandgroups.css')##
+$!jsService.includeExtJsFile($extJsParam.setJsFile(':js/xwiki/table/livetable.js'))##
+$services.css.includeCSSPage(':js/xwiki/table/livetable.css')##
+###set($ok = $xwiki.ssx.use("XWiki.XWikiUserSheet"))
+###set($ok = $xwiki.jsx.use("XWiki.XWikiUserSheet"))
 ##
 ## url to get the users for displaying them in the ajax-based table
 ##

diff --git a/src/main/webapp/docs/xwiki/XWiki/ConfigurableClass.xml b/src/main/webapp/docs/xwiki/XWiki/ConfigurableClass.xml
@@ -374,7 +374,10 @@ iKAtTBe0AQfYWgXdAG9qCi1fA5wQWwLgSdydYgcsNRLABafWgzPNB4DsfrNE6VJz6VvXltr/A+kB
 #set($nameOfThisDocument = 'XWiki.ConfigurableClass')
 ##
 ## Form submission depends on this.
-$xwiki.jsfx.use('js/xwiki/actionbuttons/actionButtons.js', true)
+#set($jsService = $services.javascript)
+#set($extJsParam = $jsService.createExtJSParam().setAction('file'))
+#set($extJsParam = $extJsParam.setLazyLoad(true))
+$!jsService.includeExtJsFile($extJsParam.setJsFile(':js/xwiki/actionbuttons/actionButtons.js'))##
 ##
 #if(!$section)
   #set($section = $request.getParameter('section'))
@@ -574,7 +577,7 @@ $xwiki.jsfx.use('js/xwiki/actionbuttons/actionButtons.js', true)
                     ##
                     ## Merge save buttons, remove headings from subsections, and make information links into popups.
                     ## This is not done if there is only a custom defined form.
-                    $xwiki.jsx.use($nameOfThisDocument)
+##                    $xwiki.jsx.use($nameOfThisDocument)
                     ##
                     ## We don't begin the form until we have content for it so that a configurable can specify a 
                     ## custom form in codeToExecute and if that configurable object is the first of it's kind in that

diff --git a/src/main/webapp/docs/xwiki/XWiki/XWikiGroupSheet.xml b/src/main/webapp/docs/xwiki/XWiki/XWikiGroupSheet.xml
@@ -49,10 +49,13 @@
 </object>
 <content>{{velocity output="false"}}
 #set($mainwk = $xcontext.isMainWiki())
-$xwiki.jsfx.use('js/xwiki/usersandgroups/usersandgroups.js', true)
-$xwiki.ssfx.use('js/xwiki/usersandgroups/usersandgroups.css')
-$xwiki.jsfx.use('js/xwiki/table/livetable.js', true)
-$xwiki.ssfx.use('js/xwiki/table/livetable.css', true)
+#set($jsService = $services.javascript)
+#set($extJsParam = $jsService.createExtJSParam().setAction('file'))
+#set($extJsParam = $extJsParam.setLazyLoad(true))
+$!jsService.includeExtJsFile($extJsParam.setJsFile(':js/xwiki/usersandgroups/usersandgroups.js'))##
+$services.css.includeCSSPage(':js/xwiki/usersandgroups/usersandgroups.css')##
+$!jsService.includeExtJsFile($extJsParam.setJsFile(':js/xwiki/table/livetable.js'))##
+$services.css.includeCSSPage(':js/xwiki/table/livetable.css')##
 #set($groupDoc = $doc)
 #if($doc.fullName == 'Main.UserDirectory')
   #set($groupDoc = $xwiki.getDocument('XWiki.XWikiAllGroup'))

diff --git a/src/main/webapp/docs/xwiki/XWiki/XWikiUserPreferencesSheet.xml b/src/main/webapp/docs/xwiki/XWiki/XWikiUserPreferencesSheet.xml
@@ -28,7 +28,7 @@
 {{info}}$msg.get('xe.admin.users.applyonusers'){{/info}}##
 #else
 $doc.use($obj)
-$xwiki.ssx.use('XWiki.XWikiUserSheet')##
+##$xwiki.ssx.use('XWiki.XWikiUserSheet')##
 {{html wiki="true"}}
   &lt;div class="#if($context.action == 'view')half #{else}full #{end}column"&gt;
     &lt;div class="userPreferences"&gt;

diff --git a/src/main/webapp/docs/xwiki/XWiki/XWikiUserProfileSheet.xml b/src/main/webapp/docs/xwiki/XWiki/XWikiUserProfileSheet.xml
@@ -42,7 +42,7 @@ $doc.use($obj)
   &lt;div class="vcard"&gt;
   &lt;span class="fn hidden"&gt;$username&lt;/span&gt;
 #end
-$xwiki.ssx.use("XWiki.XWikiUserSheet")##
+##$xwiki.ssx.use("XWiki.XWikiUserSheet")##
   &lt;div class="#if($context.action == 'view')half #{else}full #{end}column"&gt;
     &lt;div class="userInfo"&gt;
       #if($xcontext.action == 'view' &amp;&amp; $hasEdit)

diff --git a/src/main/webapp/docs/xwiki/XWiki/XWikiUserSheet.xml b/src/main/webapp/docs/xwiki/XWiki/XWikiUserSheet.xml
@@ -364,8 +364,8 @@ span#avatarUpload {
 ##
 ## Extensions and vars
 ##
-$xwiki.ssx.use("XWiki.XWikiUserSheet")##
-$xwiki.jsx.use("XWiki.XWikiUserSheet")##
+##$xwiki.ssx.use("XWiki.XWikiUserSheet")##
+##$xwiki.jsx.use("XWiki.XWikiUserSheet")##
 #set($obj = $doc.getObject("XWiki.XWikiUsers"))
 ##
 ## Categories