Skip to content

Commit 9ac5469

Browse files
rmpestanormpestano
authored andcommitted
fixes #206
1 parent 447c960 commit 9ac5469

2 files changed

Lines changed: 51 additions & 4 deletions

File tree

pom.xml

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
<properties>
4444
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4545
<admin.legacy>false</admin.legacy>
46+
<src.dir>src/main/java</src.dir>
4647
</properties>
4748

4849
<dependencies>
@@ -71,6 +72,7 @@
7172
</dependencies>
7273

7374
<build>
75+
<sourceDirectory>${src.dir}</sourceDirectory>
7476
<resources>
7577
<resource>
7678
<filtering>true</filtering>
@@ -167,7 +169,31 @@
167169
</profile>
168170
<profile>
169171
<id>javax</id>
172+
<properties>
173+
<src.dir>${project.build.directory}/classes</src.dir>
174+
</properties>
175+
<dependencies>
176+
<dependency>
177+
<groupId>javax</groupId>
178+
<artifactId>javaee-api</artifactId>
179+
<version>8.0</version>
180+
<scope>provided</scope>
181+
</dependency>
182+
<dependency>
183+
<groupId>org.omnifaces</groupId>
184+
<artifactId>omnifaces</artifactId>
185+
<version>2.7.1</version>
186+
</dependency>
187+
</dependencies>
170188
<build>
189+
<resources>
190+
<resource>
191+
<directory>src/main/java</directory>
192+
<includes>
193+
<include>**/*.java</include>
194+
</includes>
195+
</resource>
196+
</resources>
171197
<plugins>
172198
<plugin>
173199
<groupId>org.apache.maven.plugins</groupId>
@@ -184,20 +210,41 @@
184210
<executions>
185211
<execution>
186212
<id>exec</id>
187-
<phase>package</phase>
213+
<phase>process-resources</phase>
188214
<goals>
189215
<goal>find-and-replace</goal>
190216
</goals>
191217
<configuration>
192218
<replacementType>file-contents</replacementType>
193219
<baseDir>target/classes/</baseDir>
220+
<fileMask>.java,.xml,.xhtml</fileMask>
194221
<findRegex>jakarta</findRegex>
195222
<replaceValue>javax</replaceValue>
196223
<recursive>true</recursive>
197224
</configuration>
198225
</execution>
199226
</executions>
200227
</plugin>
228+
<plugin>
229+
<groupId>org.apache.maven.plugins</groupId>
230+
<artifactId>maven-antrun-plugin</artifactId>
231+
<version>1.7</version>
232+
<executions>
233+
<execution>
234+
<phase>prepare-package</phase>
235+
<goals>
236+
<goal>run</goal>
237+
</goals>
238+
<configuration>
239+
<target>
240+
<delete>
241+
<fileset dir="${project.build.directory}/classes" includes="**/*.java"/>
242+
</delete>
243+
</target>
244+
</configuration>
245+
</execution>
246+
</executions>
247+
</plugin>
201248
</plugins>
202249
</build>
203250
</profile>

src/main/resources/META-INF/resources/admin-base.xhtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,16 +76,16 @@
7676
<ui:insert name="template-menu"/>
7777
<!-- content -->
7878
<h:panelGroup layout="block" id="content" styleClass="content-wrapper">
79-
<adm:breadcrumb title="#{title}" rendered="#{not empty title and empty requestScope['javax.servlet.error.exception_type'] and empty requestScope['javax.servlet.error.message']}"/>
79+
<adm:breadcrumb title="#{title}" rendered="#{not empty title and empty requestScope['jakarta.servlet.error.exception_type'] and empty requestScope['jakarta.servlet.error.message']}"/>
8080
<ui:insert name="content-wrapper"/>
8181
<section class="content-header">
8282
<h1>
8383
<ui:insert name="title">
84-
<h:outputText value="#{title}" rendered="#{not empty title and empty requestScope['javax.servlet.error.exception_type'] and empty requestScope['javax.servlet.error.message']}"/>
84+
<h:outputText value="#{title}" rendered="#{not empty title and empty requestScope['jakarta.servlet.error.exception_type'] and empty requestScope['jakarta.servlet.error.message']}"/>
8585
</ui:insert>
8686
<small><ui:insert name="description"/></small>
8787
</h1>
88-
<ui:fragment rendered="#{(adminConfig.renderBreadCrumb) and (empty renderBreadCrumb or renderBreadCrumb) and (empty requestScope['javax.servlet.error.exception_type'] and empty requestScope['javax.servlet.error.message'])}">
88+
<ui:fragment rendered="#{(adminConfig.renderBreadCrumb) and (empty renderBreadCrumb or renderBreadCrumb) and (empty requestScope['jakarta.servlet.error.exception_type'] and empty requestScope['jakarta.servlet.error.message'])}">
8989
<ol class="breadcrumb" style="overflow: hidden;">
9090
<li style="position: relative;">
9191
<h:form prependId="false">

0 commit comments

Comments
 (0)