Skip to content

Commit 21fb0b6

Browse files
bforestbforest
committed
Revert "Use of "web fragments""
This reverts commit de48855. Change-Id: I82b305ee09e2503e7049df3779f1acbacb85141a
1 parent 3ddbaa1 commit 21fb0b6

File tree

6 files changed

+261
-61
lines changed

6 files changed

+261
-61
lines changed

‎CHANGELOG_EN.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@ Supported DBMS:
1818
- Bug fix: fixed invalid JSON response ("select-audits" webscript)
1919

2020

21-
## [1.5.7] - 2018-04-13
22-
### Changed
23-
- Use of "web fragments" (web.xml is no more overridden by the module) (https://github.com/atolcd/alfresco-audit-share/issues/14)
24-
25-
2621
## [1.5.6] - 2018-03-29
2722
### Changed
2823
- Optimization: caching group membership

‎README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"AuditShare" for Alfresco
55
================================
66

7-
**AuditShare** is an extension totally integrated into the Share UI accessible by **administrators** and **site managers**.
7+
**AuditShare** is an extension totally integrated into the Share UI accessible by **administrators** and **sites managers**.
88
This app displays sites and repository usage info: number of created/read/updated/deleted documents displayed by day/week/month/year.
99
In sites, others informations are "audited" concerning wiki, blog and discussions components but also users connected and sites volumetry.
1010

@@ -43,6 +43,11 @@ This extension is a standard Alfresco Module, so experienced users can skip thes
4343
4. Start Alfresco
4444

4545

46+
Overrides
47+
---------------------
48+
**Caution:** Share **web.xml** file is overridden by the module (to declare new filters).
49+
50+
4651
Using the module
4752
---------------------
4853

‎module_share/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@
4646
<value>auditshare-module-share, com.atolcd.alfresco.auditshare-share</value>
4747
</property>
4848
</moduleProperties>
49+
<filemappingProperties>
50+
<property>
51+
<name>/WEB-INF</name>
52+
<value>/WEB-INF</value>
53+
</property>
54+
</filemappingProperties>
4955
<rootDirectory>${project.basedir}/src/main/webapp</rootDirectory>
5056
</configuration>
5157
</plugin>

‎module_share/src/main/java/com/atolcd/alfresco/ProxyAuditFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public class ProxyAuditFilter extends AuditFilterConstants implements Filter {
7171
// XXX: externalize configuration?
7272
public static final String SHARE_WEBAPP_NAME = "share";
7373
public static final String ALFRESCO_ENDPOINT_ID = "alfresco";
74-
public static final String SHORT_PROXY_URL = "/" + SHARE_WEBAPP_NAME + "/page/proxy/" + ALFRESCO_ENDPOINT_ID + "/";
74+
public static final String SHORT_PROXY_URL = "/" + SHARE_WEBAPP_NAME + "/proxy/" + ALFRESCO_ENDPOINT_ID + "/";
7575

7676
public static final String KEY_SITE = "site";
7777
public static final String KEY_MODULE = "module";

‎module_share/src/main/web-fragment.xml

Lines changed: 0 additions & 54 deletions
This file was deleted.

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

Lines changed: 248 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,248 @@
1+
<?xml version='1.0' encoding='UTF-8'?>
2+
<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
4+
5+
<display-name>Alfresco Project Slingshot</display-name>
6+
<description>Alfresco Project Slingshot application</description>
7+
8+
<context-param>
9+
<param-name>org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL</param-name>
10+
<param-value>true</param-value>
11+
</context-param>
12+
13+
<!-- Spring Application Context location and context class -->
14+
<context-param>
15+
<description>Spring config file location</description>
16+
<param-name>contextConfigLocation</param-name>
17+
<param-value>classpath:web-application-config.xml</param-value>
18+
</context-param>
19+
20+
<filter>
21+
<description>Set HTTP cache Expires header 30 days forward for a mapping.</description>
22+
<filter-name>CacheExpiresFilter</filter-name>
23+
<filter-class>org.alfresco.web.scripts.servlet.StaticAssetCacheFilter</filter-class>
24+
<init-param>
25+
<description>Add an Expires Header 30 days forward</description>
26+
<param-name>expires</param-name>
27+
<param-value>30</param-value>
28+
</init-param>
29+
</filter>
30+
31+
<filter>
32+
<description>MT authentication support - NOTE: does not support portlets</description>
33+
<filter-name>MTAuthentationFilter</filter-name>
34+
<filter-class>org.alfresco.web.site.servlet.MTAuthenticationFilter</filter-class>
35+
</filter>
36+
37+
<filter>
38+
<description>Redirects view and service URLs to the dispatcher servlet.</description>
39+
<filter-name>UrlRewriteFilter</filter-name>
40+
<filter-class>org.tuckey.web.filters.urlrewrite.UrlRewriteFilter</filter-class>
41+
</filter>
42+
43+
<filter>
44+
<description>Share SSO authentication support filter.</description>
45+
<filter-name>Authentication Filter</filter-name>
46+
<filter-class>org.alfresco.web.site.servlet.SSOAuthenticationFilter</filter-class>
47+
<init-param>
48+
<param-name>endpoint</param-name>
49+
<param-value>alfresco</param-value>
50+
</init-param>
51+
</filter>
52+
53+
<filter>
54+
<description>Share CSRF Token filter. Checks for a session based CSRF token in request headers (or form parameters) based on config.</description>
55+
<filter-name>CSRF Token Filter</filter-name>
56+
<filter-class>org.alfresco.web.site.servlet.CSRFFilter</filter-class>
57+
</filter>
58+
59+
<filter>
60+
<description>Share Security Headers filter. Adds security response headers based on config.</description>
61+
<filter-name>Security Headers Filter</filter-name>
62+
<filter-class>org.alfresco.web.site.servlet.SecurityHeadersFilter</filter-class>
63+
</filter>
64+
65+
<filter-mapping>
66+
<filter-name>CacheExpiresFilter</filter-name>
67+
<url-pattern>*.jpg</url-pattern>
68+
</filter-mapping>
69+
<filter-mapping>
70+
<filter-name>CacheExpiresFilter</filter-name>
71+
<url-pattern>*.png</url-pattern>
72+
</filter-mapping>
73+
<filter-mapping>
74+
<filter-name>CacheExpiresFilter</filter-name>
75+
<url-pattern>*.gif</url-pattern>
76+
</filter-mapping>
77+
<filter-mapping>
78+
<filter-name>CacheExpiresFilter</filter-name>
79+
<url-pattern>*.css</url-pattern>
80+
</filter-mapping>
81+
<filter-mapping>
82+
<filter-name>CacheExpiresFilter</filter-name>
83+
<url-pattern>*.js</url-pattern>
84+
</filter-mapping>
85+
86+
<filter-mapping>
87+
<filter-name>Authentication Filter</filter-name>
88+
<url-pattern>/page/*</url-pattern>
89+
</filter-mapping>
90+
91+
<filter-mapping>
92+
<filter-name>Authentication Filter</filter-name>
93+
<url-pattern>/p/*</url-pattern>
94+
</filter-mapping>
95+
96+
<filter-mapping>
97+
<filter-name>Authentication Filter</filter-name>
98+
<url-pattern>/proxy/*</url-pattern>
99+
</filter-mapping>
100+
101+
<!-- ATOL: Audit filters -->
102+
<filter>
103+
<description>Filtre général pour l'audit</description>
104+
<filter-name>AuditFilter</filter-name>
105+
<filter-class>com.atolcd.alfresco.AuditFilter</filter-class>
106+
</filter>
107+
<filter-mapping>
108+
<filter-name>AuditFilter</filter-name>
109+
<url-pattern>/page/*</url-pattern>
110+
</filter-mapping>
111+
<filter-mapping>
112+
<filter-name>AuditFilter</filter-name>
113+
<url-pattern>/p/*</url-pattern>
114+
</filter-mapping>
115+
<filter>
116+
<description>Filtre pour l'audit (proxy)</description>
117+
<filter-name>ProxyAuditFilter</filter-name>
118+
<filter-class>com.atolcd.alfresco.ProxyAuditFilter</filter-class>
119+
</filter>
120+
<filter-mapping>
121+
<filter-name>ProxyAuditFilter</filter-name>
122+
<url-pattern>/proxy/*</url-pattern>
123+
</filter-mapping>
124+
<!-- / ATOL: Audit filters -->
125+
126+
<filter-mapping>
127+
<filter-name>CSRF Token Filter</filter-name>
128+
<url-pattern>/page/*</url-pattern>
129+
</filter-mapping>
130+
131+
<filter-mapping>
132+
<filter-name>CSRF Token Filter</filter-name>
133+
<url-pattern>/p/*</url-pattern>
134+
</filter-mapping>
135+
136+
<filter-mapping>
137+
<filter-name>CSRF Token Filter</filter-name>
138+
<url-pattern>/proxy/*</url-pattern>
139+
</filter-mapping>
140+
141+
<filter-mapping>
142+
<filter-name>CSRF Token Filter</filter-name>
143+
<url-pattern>/service/*</url-pattern>
144+
</filter-mapping>
145+
146+
<filter-mapping>
147+
<filter-name>Security Headers Filter</filter-name>
148+
<url-pattern>/page/*</url-pattern>
149+
</filter-mapping>
150+
151+
<filter-mapping>
152+
<filter-name>Security Headers Filter</filter-name>
153+
<url-pattern>/p/*</url-pattern>
154+
</filter-mapping>
155+
156+
<filter-mapping>
157+
<filter-name>Security Headers Filter</filter-name>
158+
<url-pattern>/proxy/*</url-pattern>
159+
</filter-mapping>
160+
161+
<filter-mapping>
162+
<filter-name>Security Headers Filter</filter-name>
163+
<url-pattern>/service/*</url-pattern>
164+
</filter-mapping>
165+
166+
<filter-mapping>
167+
<filter-name>UrlRewriteFilter</filter-name>
168+
<url-pattern>/proxy/*</url-pattern>
169+
</filter-mapping>
170+
171+
<filter-mapping>
172+
<filter-name>UrlRewriteFilter</filter-name>
173+
<url-pattern>/service/*</url-pattern>
174+
</filter-mapping>
175+
176+
<filter-mapping>
177+
<filter-name>UrlRewriteFilter</filter-name>
178+
<url-pattern>/feedservice/*</url-pattern>
179+
</filter-mapping>
180+
181+
<filter-mapping>
182+
<filter-name>UrlRewriteFilter</filter-name>
183+
<url-pattern>/res/*</url-pattern>
184+
</filter-mapping>
185+
186+
<filter-mapping>
187+
<filter-name>UrlRewriteFilter</filter-name>
188+
<url-pattern>/system/*</url-pattern>
189+
</filter-mapping>
190+
191+
<filter-mapping>
192+
<filter-name>UrlRewriteFilter</filter-name>
193+
<url-pattern>/s/*</url-pattern>
194+
</filter-mapping>
195+
196+
<filter-mapping>
197+
<filter-name>MTAuthentationFilter</filter-name>
198+
<url-pattern>/page/*</url-pattern>
199+
</filter-mapping>
200+
<filter-mapping>
201+
<filter-name>MTAuthentationFilter</filter-name>
202+
<url-pattern>/p/*</url-pattern>
203+
</filter-mapping>
204+
205+
<!-- Spring Context Loader listener - the name of the default global context is passed to the DispatcherServlet
206+
in the servlet definition below - this is to allow the NTLM filter etc. to find the single app context -->
207+
<listener>
208+
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
209+
</listener>
210+
211+
<servlet>
212+
<servlet-name>Spring Surf Dispatcher Servlet</servlet-name>
213+
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
214+
<init-param>
215+
<param-name>contextAttribute</param-name>
216+
<param-value>org.springframework.web.context.WebApplicationContext.ROOT</param-value>
217+
</init-param>
218+
<init-param>
219+
<param-name>dispatchOptionsRequest</param-name>
220+
<param-value>true</param-value>
221+
</init-param>
222+
<load-on-startup>1</load-on-startup>
223+
</servlet>
224+
225+
<servlet-mapping>
226+
<servlet-name>Spring Surf Dispatcher Servlet</servlet-name>
227+
<url-pattern>/page/*</url-pattern>
228+
</servlet-mapping>
229+
<servlet-mapping>
230+
<servlet-name>Spring Surf Dispatcher Servlet</servlet-name>
231+
<url-pattern>/p/*</url-pattern>
232+
</servlet-mapping>
233+
234+
<session-config>
235+
<session-timeout>60</session-timeout>
236+
</session-config>
237+
238+
<!-- welcome file list precedence order is index.jsp -->
239+
<welcome-file-list>
240+
<welcome-file>index.jsp</welcome-file>
241+
</welcome-file-list>
242+
243+
<error-page>
244+
<error-code>500</error-code>
245+
<location>/error500.jsp</location>
246+
</error-page>
247+
248+
</web-app>

0 commit comments

Comments
 (0)