Skip to content

Commit

Permalink
maven frontended plugin (npm + webpack), removing everything related …
Browse files Browse the repository at this point in the history 
…to wro
  • Loading branch information
@katkav
katkav committed Dec 1, 2021
1 parent 34246ea commit 2f485f2
Show file tree
Hide file tree
Showing 15 changed files with 2,635 additions and 353 deletions.
160 changes: 56 additions & 104 deletions gui/admin-gui/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,6 @@
<artifactId>spring-boot-actuator-autoconfigure</artifactId>
</dependency>

<!-- webjars -->
<dependency>
<groupId>com.evolveum.webjars</groupId>
<artifactId>AdminLTE</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>respond</artifactId>
Expand All @@ -133,12 +127,7 @@
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>font-awesome</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.webjars.npm</groupId>
<artifactId>ionicons</artifactId>
<artifactId>AdminLTE</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
Expand All @@ -147,102 +136,10 @@
<scope>runtime</scope>
</dependency>

<!-- WRO4J-->
<dependency>
<groupId>ro.isdc.wro4j</groupId>
<artifactId>wro4j-core</artifactId>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>less</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-cas</artifactId>
</dependency>
<dependency>
<groupId>ro.isdc.wro4j</groupId>
<artifactId>wro4j-extensions</artifactId>
<exclusions>
<exclusion>
<groupId>org.webjars</groupId>
<artifactId>less</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<!-- unused library (13mb) -->
<groupId>org.jruby</groupId>
<artifactId>jruby-core</artifactId>
</exclusion>
<exclusion>
<!-- unused library -->
<groupId>org.jruby</groupId>
<artifactId>jruby-stdlib</artifactId>
</exclusion>
<exclusion>
<!-- unused library (500kb) -->
<groupId>me.n4u.sass</groupId>
<artifactId>sass-gems</artifactId>
</exclusion>
<exclusion>
<!-- unused library (200kb) -->
<groupId>nz.co.edmi</groupId>
<artifactId>bourbon-gem-jar</artifactId>
</exclusion>
<exclusion>
<!-- unused library (3.5mb) -->
<groupId>com.google.javascript</groupId>
<artifactId>closure-compiler</artifactId>
</exclusion>
<exclusion>
<!-- unused library -->
<groupId>org.webjars</groupId>
<artifactId>coffee-script</artifactId>
</exclusion>
<exclusion>
<!-- unused library -->
<groupId>org.codehaus.gmaven.runtime</groupId>
<artifactId>gmaven-runtime-1.7</artifactId>
</exclusion>
<exclusion>
<!-- unused library -->
<groupId>com.github.lltyk</groupId>
<artifactId>dojo-shrinksafe</artifactId>
</exclusion>
<exclusion>
<!-- unused library -->
<groupId>org.webjars</groupId>
<artifactId>emberjs</artifactId>
</exclusion>
<exclusion>
<!-- unused library -->
<groupId>org.webjars.npm</groupId>
<artifactId>handlebars</artifactId>
</exclusion>
<exclusion>
<!-- unused library -->
<groupId>org.webjars</groupId>
<artifactId>json2</artifactId>
</exclusion>
<exclusion>
<groupId>com.darrinholst</groupId>
<artifactId>sass-java-gems</artifactId>
</exclusion>
<exclusion>
<!-- unused library -->
<groupId>org.webjars.npm</groupId>
<artifactId>jshint</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- JDBC DRIVERS -->
<dependency>
Expand Down Expand Up @@ -985,6 +882,61 @@
<attachClasses>true</attachClasses>
</configuration>
</plugin>

<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>1.12.0</version>

<executions>
<execution>
<!-- optional: you don't really need execution ids, but it looks nice in your build log. -->
<id>install node and npm</id>
<goals>
<goal>install-node-and-npm</goal>
</goals>
<!-- optional: default phase is "generate-resources" -->
<phase>generate-resources</phase>
</execution>
<execution>
<id>npm install</id>
<goals>
<goal>npm</goal>
</goals>

<!-- optional: default phase is "generate-resources" -->
<phase>generate-resources</phase>

<configuration>
<!-- optional: The default argument is actually
"install", so unless you need to run some other npm command,
you can remove this whole <configuration> section.
-->
<arguments>install sass-loader sass css-loader style-loader postcss-loader webpack webpack-cli css-minimizer-webpack-plugin mini-css-extract-plugin admin-lte@^3.1 --save-dev</arguments>
<workingDirectory>target</workingDirectory>
</configuration>
</execution>
<execution>
<id>webpack build</id>
<goals>
<goal>webpack</goal>
</goals>

<!-- optional: the default phase is "generate-resources" -->
<phase>generate-resources</phase>

<configuration>
<arguments>-c ./src/main/resources/static/webpack.config.js</arguments>
</configuration>
</execution>
</executions>
<configuration>
<nodeVersion>v16.13.0</nodeVersion>
<installDirectory>target</installDirectory>
</configuration>

</plugin>

</plugins>
</build>

Expand Down
16 changes: 3 additions & 13 deletions ...admin-gui/src/main/java/com/evolveum/midpoint/web/boot/AbstractSpringBootApplication.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@

import javax.servlet.DispatcherType;

import com.evolveum.midpoint.web.security.MidpointAutowiredBeanFactoryObjectPostProcessor;
import com.evolveum.midpoint.web.security.MidpointSessionRegistry;
import com.evolveum.midpoint.web.security.RemoveUnusedSecurityFilterPublisher;

import org.apache.wicket.Application;
import org.apache.wicket.protocol.http.WicketFilter;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down Expand Up @@ -49,10 +45,12 @@
import org.springframework.security.core.session.SessionRegistry;
import org.springframework.web.context.request.RequestContextListener;
import org.springframework.web.filter.DelegatingFilterProxy;
import ro.isdc.wro.http.WroFilter;

import com.evolveum.midpoint.init.StartupConfiguration;
import com.evolveum.midpoint.model.api.authentication.NodeAuthenticationEvaluator;
import com.evolveum.midpoint.web.security.MidpointAutowiredBeanFactoryObjectPostProcessor;
import com.evolveum.midpoint.web.security.MidpointSessionRegistry;
import com.evolveum.midpoint.web.security.RemoveUnusedSecurityFilterPublisher;
import com.evolveum.midpoint.web.security.SessionAndRequestScopeImpl;
import com.evolveum.midpoint.web.util.MidPointProfilingServletFilter;

Expand Down Expand Up @@ -132,14 +130,6 @@ public FilterRegistrationBean<DelegatingFilterProxy> springSecurityFilterChain()
return registration;
}

@Bean
public FilterRegistrationBean<WroFilter> webResourceOptimizer(WroFilter wroFilter) {
FilterRegistrationBean<WroFilter> registration = new FilterRegistrationBean<>();
registration.setFilter(wroFilter);
registration.addUrlPatterns("/wro/*");
return registration;
}

@Bean
public ErrorPageRegistrar errorPageRegistrar() {
return new MidPointErrorPageRegistrar();
Expand Down
81 changes: 0 additions & 81 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/Wro4jConfig.java
View file

This file was deleted.

1 change: 1 addition & 0 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/BasicWebSecurityConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ public void configure(WebSecurity web) throws Exception {

web.ignoring().antMatchers("/js/**");
web.ignoring().antMatchers("/css/**");
web.ignoring().antMatchers("/dist/**");
web.ignoring().antMatchers("/img/**");
web.ignoring().antMatchers("/fonts/**");

Expand Down
2 changes: 1 addition & 1 deletion gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ public void init() {

getJavaScriptLibrarySettings().setJQueryReference(
new PackageResourceReference(MidPointApplication.class,
"../../../../../webjars/AdminLTE/2.4.18/bower_components/jquery/dist/jquery.min.js")); //todo no jquery.js is found
"../../../../../webjars/AdminLTE/3.1.0/plugins/jquery/jquery.js")); //todo no jquery.js is found

getComponentInstantiationListeners().add(new SpringComponentInjector(this, applicationContext, true));

Expand Down
31 changes: 0 additions & 31 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ConfigurableXmlModelFactory.java
View file

This file was deleted.

30 changes: 0 additions & 30 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/MidPointUrlLocatorFactory.java
View file

This file was deleted.

0 comments on commit 2f485f2

Please sign in to comment.