workspace master and agent : avoid scan of classes at runtime in orde…

…r to find DynaModules
eclipse-che · Oct 25, 2017 · 1d110e9 · 1d110e9
1 parent c7d34fb
commit 1d110e9
Show file tree

Hide file tree

Showing 27 changed files with 1,804 additions and 0 deletions.
diff --git a/assembly-multiuser/assembly-wsagent-war/pom.xml b/assembly-multiuser/assembly-wsagent-war/pom.xml
@@ -55,6 +55,25 @@
     </dependencies>
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.eclipse.che.core</groupId>
+                <artifactId>che-core-dynamodule-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generate</id>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <scanWarDependencies>true</scanWarDependencies>
+                    <skipResources>
+                        <skipResource>.*CheWsAgentModule.class</skipResource>
+                        <skipResource>.*CheWsAgentServletModule.class</skipResource>
+                    </skipResources>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>

diff --git a/assembly-multiuser/assembly-wsagent-war/src/main/webapp/WEB-INF/web.xml b/assembly-multiuser/assembly-wsagent-war/src/main/webapp/WEB-INF/web.xml
@@ -17,6 +17,8 @@
          version="3.0"
          metadata-complete="true">
 
+    <absolute-ordering></absolute-ordering>
+
     <context-param>
         <param-name>org.everrest.websocket.context</param-name>
         <param-value>/api</param-value>

diff --git a/assembly-multiuser/assembly-wsmaster-war/pom.xml b/assembly-multiuser/assembly-wsmaster-war/pom.xml
@@ -110,6 +110,27 @@
     </dependencies>
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.eclipse.che.core</groupId>
+                <artifactId>che-core-dynamodule-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generate</id>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <scanWarDependencies>true</scanWarDependencies>
+                    <skipResources>
+                        <skipResource>.*WEB-INF/classes/org/eclipse/che/api/deploy/CheWsMasterModule.class</skipResource>
+                        <skipResource>.*WEB-INF/classes/org/eclipse/che/api/deploy/CheWsMasterServletModule.*</skipResource>
+                        <skipResource>.*LocalModule.class</skipResource>
+                        <skipResource>.*LocalServletModule.class</skipResource>
+                    </skipResources>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>

diff --git a/assembly-multiuser/assembly-wsmaster-war/src/main/webapp/META-INF/context.xml b/assembly-multiuser/assembly-wsmaster-war/src/main/webapp/META-INF/context.xml
@@ -13,6 +13,13 @@
 -->
 <Context allowCasualMultipartParsing="true" sessionCookiePath="/api">
 
+    <JarScanner>
+        <JarScanFilter
+          defaultPluggabilityScan="false"
+          defaultTldScan="false"
+          pluggabilityScan=""></JarScanFilter>
+    </JarScanner>
+
     <Resource name="jdbc/che" auth="Container"
               type="javax.sql.DataSource"
               factory="org.eclipse.che.core.db.postgresql.PostgreSQLJndiDataSourceFactory"/>

diff --git a/assembly-multiuser/assembly-wsmaster-war/src/main/webapp/WEB-INF/web.xml b/assembly-multiuser/assembly-wsmaster-war/src/main/webapp/WEB-INF/web.xml
@@ -17,6 +17,8 @@
          version="3.0"
          metadata-complete="true">
 
+    <absolute-ordering></absolute-ordering>
+
     <context-param>
         <param-name>org.eclipse.che.websocket.endpoint</param-name>
         <param-value>/ws</param-value>

diff --git a/assembly/assembly-wsagent-war/pom.xml b/assembly/assembly-wsagent-war/pom.xml
@@ -162,6 +162,21 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.eclipse.che.core</groupId>
+                <artifactId>che-core-dynamodule-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generate</id>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                  <scanWarDependencies>true</scanWarDependencies>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>

diff --git a/assembly/assembly-wsagent-war/src/main/webapp/META-INF/context.xml b/assembly/assembly-wsagent-war/src/main/webapp/META-INF/context.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2012-2017 Red Hat, Inc.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+
+    Contributors:
+      Red Hat, Inc. - initial API and implementation
+
+-->
+<Context>
+
+  <JarScanner>
+    <JarScanFilter
+      defaultPluggabilityScan="false"
+      defaultTldScan="false"
+      pluggabilityScan=""></JarScanFilter>
+  </JarScanner>
+
+</Context>
diff --git a/assembly/assembly-wsmaster-war/pom.xml b/assembly/assembly-wsmaster-war/pom.xml
@@ -298,6 +298,18 @@
             </resource>
         </resources>
         <plugins>
+            <plugin>
+                <groupId>org.eclipse.che.core</groupId>
+                <artifactId>che-core-dynamodule-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generate</id>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>

diff --git a/assembly/assembly-wsmaster-war/src/main/webapp/META-INF/context.xml b/assembly/assembly-wsmaster-war/src/main/webapp/META-INF/context.xml
@@ -13,6 +13,13 @@
 -->
 <Context allowCasualMultipartParsing="true" sessionCookiePath="/api">
 
+  <JarScanner>
+    <JarScanFilter
+      defaultPluggabilityScan="false"
+      defaultTldScan="false"
+      pluggabilityScan=""></JarScanFilter>
+  </JarScanner>
+
   <Resource name="jdbc/che" auth="Container"
     type="javax.sql.DataSource"
     factory="org.eclipse.che.core.db.h2.H2SQLJndiDataSourceFactory"/>

diff --git a/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/web.xml b/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/web.xml
@@ -17,6 +17,8 @@
          version="3.0"
          metadata-complete="true">
 
+    <absolute-ordering></absolute-ordering>
+
     <context-param>
         <param-name>org.eclipse.che.websocket.endpoint</param-name>
         <param-value>/ws</param-value>