Skip to content

Commit 74eb274

Browse files
ITHitBuildITHitBuild
committed
3.0.1-Beta
1 parent 581719b commit 74eb274

13 files changed

Lines changed: 78 additions & 43 deletions

File tree

‎deltav/pom.xml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.ithit.webdav.samples</groupId>
88
<artifactId>deltav</artifactId>
9-
<version>2.3.863</version>
9+
<version>3.0.1-Beta</version>
1010
<packaging>war</packaging>
1111

1212
<properties>
@@ -20,6 +20,11 @@
2020
<version>2.5</version>
2121
<scope>provided</scope>
2222
</dependency>
23+
<dependency>
24+
<groupId>com.ithit.webdav.integration</groupId>
25+
<artifactId>servlet-integration</artifactId>
26+
<version>3.0.1-Beta</version>
27+
</dependency>
2328
<dependency>
2429
<groupId>commons-dbcp</groupId>
2530
<artifactId>commons-dbcp</artifactId>
@@ -88,7 +93,7 @@
8893
<dependency>
8994
<groupId>com.ithit.webdav</groupId>
9095
<artifactId>webdav-server</artifactId>
91-
<version>2.3.863</version>
96+
<version>3.0.1-Beta</version>
9297
</dependency>
9398

9499
<dependency>
@@ -128,7 +133,7 @@
128133
<goal>copy-resources</goal>
129134
</goals>
130135
<configuration>
131-
<outputDirectory>${project.build.directory}/deltav-2.3.863/META-INF</outputDirectory>
136+
<outputDirectory>${project.build.directory}/deltav-3.0.1-Beta/META-INF</outputDirectory>
132137
<overwrite>true</overwrite>
133138
<resources>
134139
<resource>
@@ -207,7 +212,7 @@
207212
<server>filesystem</server>
208213
<port>11021</port>
209214
<path>/</path>
210-
<warSourceDirectory>target/deltav-2.3.863</warSourceDirectory>
215+
<warSourceDirectory>target/deltav-3.0.1-Beta</warSourceDirectory>
211216
</configuration>
212217
</plugin>
213218
<plugin>

‎deltav/src/main/java/com/ithit/webdav/samples/deltavservlet/CustomFolderGetHandler.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import com.ithit.webdav.server.HierarchyItem;
55
import com.ithit.webdav.server.MethodHandler;
66
import com.ithit.webdav.server.exceptions.DavException;
7+
import com.ithit.webdav.server.http.DavRequest;
8+
import com.ithit.webdav.server.http.DavResponse;
79

8-
import javax.servlet.http.HttpServletRequest;
9-
import javax.servlet.http.HttpServletResponse;
1010
import java.io.IOException;
1111
import java.io.PrintStream;
1212
import java.nio.charset.StandardCharsets;
@@ -29,7 +29,7 @@ public CustomFolderGetHandler(String charset, String version) {
2929
this.version = version;
3030
}
3131

32-
public void processRequest(HttpServletRequest request, HttpServletResponse response, HierarchyItem item)
32+
public void processRequest(DavRequest request, DavResponse response, HierarchyItem item)
3333
throws DavException, IOException {
3434

3535
if (item instanceof Folder) {

‎deltav/src/main/java/com/ithit/webdav/samples/deltavservlet/HierarchyItemImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -746,8 +746,8 @@ void moveThisItem(FolderImpl destFolder, String destName, FolderImpl parent) thr
746746
* @return Returns User name performing request.
747747
*/
748748
String getUserName() {
749-
if (getEngine().getRequest().getUserPrincipal() != null) {
750-
return getEngine().getRequest().getUserPrincipal().getName();
749+
if (getEngine().getRequest().getHttpServletRequest().getUserPrincipal() != null) {
750+
return getEngine().getRequest().getHttpServletRequest().getUserPrincipal().getName();
751751
}
752752

753753
return "Anonymous";

‎deltav/src/main/java/com/ithit/webdav/samples/deltavservlet/WebDavEngine.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.ithit.webdav.samples.deltavservlet;
22

3+
import com.ithit.webdav.integration.servlet.HttpServletDavRequest;
34
import com.ithit.webdav.samples.deltavservlet.websocket.WebSocketServer;
45
import com.ithit.webdav.server.Engine;
56
import com.ithit.webdav.server.HierarchyItem;
@@ -20,7 +21,7 @@ public class WebDavEngine extends Engine {
2021

2122
private static final WebSocketServer _FAKED_WEB_SOCKET = new WebSocketServer();
2223
private WebSocketServer webSocketServer;
23-
private HttpServletRequest request;
24+
private HttpServletDavRequest request;
2425
private final Logger logger;
2526
private final String license;
2627
private DataAccess dataAccess;
@@ -44,7 +45,7 @@ public class WebDavEngine extends Engine {
4445
*
4546
* @param httpServletRequest Original servlet request.
4647
*/
47-
void setServletRequest(HttpServletRequest httpServletRequest) {
48+
void setServletRequest(HttpServletDavRequest httpServletRequest) {
4849
this.request = httpServletRequest;
4950
}
5051

@@ -174,7 +175,7 @@ void setDataAccess(DataAccess dataAccess) {
174175
*
175176
* @return Returns original {@link HttpServletRequest}.
176177
*/
177-
HttpServletRequest getRequest() {
178+
HttpServletDavRequest getRequest() {
178179
return request;
179180
}
180181

‎deltav/src/main/java/com/ithit/webdav/samples/deltavservlet/WebDavServlet.java‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package com.ithit.webdav.samples.deltavservlet;
22

3+
import com.ithit.webdav.integration.servlet.HttpDavLoggingContext;
4+
import com.ithit.webdav.integration.servlet.HttpServletDavRequest;
5+
import com.ithit.webdav.integration.servlet.HttpServletDavResponse;
36
import com.ithit.webdav.server.DefaultLoggerImpl;
47
import com.ithit.webdav.server.Logger;
58
import com.ithit.webdav.server.deltav.AutoVersion;
@@ -15,6 +18,7 @@
1518
import java.io.BufferedReader;
1619
import java.io.FileReader;
1720
import java.io.IOException;
21+
import java.io.PrintWriter;
1822
import java.nio.file.Files;
1923
import java.nio.file.Path;
2024
import java.nio.file.Paths;
@@ -85,7 +89,7 @@ static String getContext() {
8589
public void init(ServletConfig servletConfig) throws ServletException {
8690
super.init(servletConfig);
8791

88-
logger = new DefaultLoggerImpl(servletConfig.getServletContext());
92+
logger = new DefaultLoggerImpl(new HttpDavLoggingContext(servletConfig.getServletContext()));
8993

9094
String licenseFile = servletConfig.getInitParameter("license");
9195
showExceptions = "true".equals(servletConfig.getInitParameter("showExceptions"));
@@ -136,28 +140,29 @@ protected void service(HttpServletRequest httpServletRequest, HttpServletRespons
136140
throws ServletException, IOException {
137141

138142
WebDavEngine engine = new WebDavEngine(logger, license);
143+
HttpServletDavRequest davRequest = new HttpServletDavRequest(httpServletRequest);
144+
HttpServletDavResponse davResponse = new HttpServletDavResponse(httpServletResponse);
139145
CustomFolderGetHandler handler = new CustomFolderGetHandler(engine.getResponseCharacterEncoding(), engine.getVersion());
140146
CustomFolderGetHandler handlerHead = new CustomFolderGetHandler(engine.getResponseCharacterEncoding(), engine.getVersion());
141147
handler.setPreviousHandler(engine.registerMethodHandler("GET", handler));
142148
handlerHead.setPreviousHandler(engine.registerMethodHandler("HEAD", handlerHead));
143149

144150
engine.setAutoPutUnderVersionControl(autoputUnderVersionControl);
145151
engine.setAutoVersionMode(autoVersionMode);
146-
engine.setServletRequest(httpServletRequest);
152+
engine.setServletRequest(davRequest);
147153
engine.setSearchFacade(searchFacade);
148154
HttpSession session = httpServletRequest.getSession();
149155
session.setAttribute("engine", engine);
150156
DataAccess dataAccess = new DataAccess(engine);
151157
engine.setDataAccess(dataAccess);
152-
153158
try {
154-
engine.service(httpServletRequest, httpServletResponse);
159+
engine.service(davRequest, davResponse);
155160
dataAccess.commit();
156161
} catch (DavException e) {
157162
if (e.getStatus() == WebDavStatus.INTERNAL_ERROR) {
158163
logger.logError("Exception during request processing", e);
159164
if (showExceptions)
160-
e.printStackTrace(httpServletResponse.getWriter());
165+
e.printStackTrace(new PrintWriter(davResponse.getOutputStream()));
161166
}
162167
} finally {
163168
dataAccess.closeConnection();

‎filesystemstorage/pom.xml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.ithit.webdav.samples</groupId>
88
<artifactId>filesystemstorage</artifactId>
9-
<version>2.3.863</version>
9+
<version>3.0.1-Beta</version>
1010
<packaging>war</packaging>
1111

1212
<properties>
@@ -33,6 +33,11 @@
3333
<version>2.5</version>
3434
<scope>provided</scope>
3535
</dependency>
36+
<dependency>
37+
<groupId>com.ithit.webdav.integration</groupId>
38+
<artifactId>servlet-integration</artifactId>
39+
<version>3.0.1-Beta</version>
40+
</dependency>
3641
<dependency>
3742
<groupId>commons-io</groupId>
3843
<artifactId>commons-io</artifactId>
@@ -107,7 +112,7 @@
107112
<dependency>
108113
<groupId>com.ithit.webdav</groupId>
109114
<artifactId>webdav-server</artifactId>
110-
<version>2.3.863</version>
115+
<version>3.0.1-Beta</version>
111116
</dependency>
112117
<dependency>
113118
<groupId>net.java.dev.jna</groupId>
@@ -193,7 +198,7 @@
193198
<server>filesystem</server>
194199
<port>11021</port>
195200
<path>/</path>
196-
<warSourceDirectory>target/filesystemstorage-2.3.863</warSourceDirectory>
201+
<warSourceDirectory>target/filesystemstorage-3.0.1-Beta</warSourceDirectory>
197202
</configuration>
198203
</plugin>
199204
</plugins>

‎filesystemstorage/src/main/java/com/ithit/webdav/samples/fsstorageservlet/CustomFolderGetHandler.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import com.ithit.webdav.server.HierarchyItem;
55
import com.ithit.webdav.server.MethodHandler;
66
import com.ithit.webdav.server.exceptions.DavException;
7+
import com.ithit.webdav.server.http.DavRequest;
8+
import com.ithit.webdav.server.http.DavResponse;
79
import org.apache.commons.io.FileUtils;
810

911
import javax.servlet.http.HttpServletRequest;
@@ -33,7 +35,7 @@ public CustomFolderGetHandler(String charset, String version) {
3335
}
3436

3537
@Override
36-
public void processRequest(HttpServletRequest request, HttpServletResponse response, HierarchyItem item)
38+
public void processRequest(DavRequest request, DavResponse response, HierarchyItem item)
3739
throws DavException, IOException {
3840
if (item instanceof Folder) {
3941
PrintStream stream = new PrintStream(response.getOutputStream(), true, charset);

‎filesystemstorage/src/main/java/com/ithit/webdav/samples/fsstorageservlet/WebDavEngine.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.ithit.webdav.samples.fsstorageservlet;
22

3+
import com.ithit.webdav.integration.servlet.HttpServletDavRequest;
34
import com.ithit.webdav.samples.fsstorageservlet.websocket.WebSocketServer;
45
import com.ithit.webdav.server.Engine;
56
import com.ithit.webdav.server.HierarchyItem;
@@ -18,7 +19,7 @@ public class WebDavEngine extends Engine {
1819
private final WebSocketServer _FAKED_WEB_SOCKET = new WebSocketServer();
1920
private final Logger logger;
2021
private final String license;
21-
private HttpServletRequest request;
22+
private HttpServletDavRequest request;
2223
private SearchFacade searchFacade;
2324

2425
/**
@@ -83,7 +84,7 @@ public String getLicense() {
8384
*
8485
* @return Original servlet request.
8586
*/
86-
HttpServletRequest getRequest() {
87+
HttpServletDavRequest getRequest() {
8788
return request;
8889
}
8990

@@ -92,7 +93,7 @@ HttpServletRequest getRequest() {
9293
*
9394
* @param httpServletRequest Original servlet request.
9495
*/
95-
void setServletRequest(HttpServletRequest httpServletRequest) {
96+
void setServletRequest(HttpServletDavRequest httpServletRequest) {
9697
this.request = httpServletRequest;
9798
}
9899

‎filesystemstorage/src/main/java/com/ithit/webdav/samples/fsstorageservlet/WebDavServlet.java‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package com.ithit.webdav.samples.fsstorageservlet;
22

3+
import com.ithit.webdav.integration.servlet.HttpDavLoggingContext;
4+
import com.ithit.webdav.integration.servlet.HttpServletDavRequest;
5+
import com.ithit.webdav.integration.servlet.HttpServletDavResponse;
36
import com.ithit.webdav.samples.fsstorageservlet.extendedattributes.ExtendedAttributesExtension;
47
import com.ithit.webdav.server.DefaultLoggerImpl;
58
import com.ithit.webdav.server.Logger;
@@ -92,7 +95,7 @@ public void init(ServletConfig servletConfig) throws ServletException {
9295
} catch (IOException e) {
9396
throw new ServletException("File not found: " + licenseFile, e);
9497
}
95-
logger = new DefaultLoggerImpl(servletConfig.getServletContext());
98+
logger = new DefaultLoggerImpl(new HttpDavLoggingContext(servletConfig.getServletContext()));
9699
realPath = servletConfig.getServletContext().getRealPath("/");
97100
servletContext = servletConfig.getServletContext().getContextPath();
98101
rootLocalPath = servletConfig.getInitParameter("root");
@@ -171,23 +174,24 @@ protected void service(HttpServletRequest httpServletRequest, HttpServletRespons
171174
throws ServletException, IOException {
172175

173176
WebDavEngine engine = new WebDavEngine(logger, license);
177+
HttpServletDavRequest davRequest = new HttpServletDavRequest(httpServletRequest);
178+
HttpServletDavResponse davResponse = new HttpServletDavResponse(httpServletResponse);
174179
CustomFolderGetHandler handler = new CustomFolderGetHandler(engine.getResponseCharacterEncoding(), engine.getVersion());
175180
CustomFolderGetHandler handlerHead = new CustomFolderGetHandler(engine.getResponseCharacterEncoding(), engine.getVersion());
176181
handler.setPreviousHandler(engine.registerMethodHandler("GET", handler));
177182
handlerHead.setPreviousHandler(engine.registerMethodHandler("HEAD", handlerHead));
178-
engine.setServletRequest(httpServletRequest);
183+
engine.setServletRequest(davRequest);
179184
engine.setSearchFacade(searchFacade);
180185

181186
HttpSession session = httpServletRequest.getSession();
182187
session.setAttribute("engine", engine);
183-
184188
try {
185-
engine.service(httpServletRequest, httpServletResponse);
189+
engine.service(davRequest, davResponse);
186190
} catch (DavException e) {
187191
if (e.getStatus() == WebDavStatus.INTERNAL_ERROR) {
188192
logger.logError("Exception during request processing", e);
189193
if (showExceptions)
190-
e.printStackTrace(new PrintStream(httpServletResponse.getOutputStream()));
194+
e.printStackTrace(new PrintStream(davResponse.getOutputStream()));
191195
}
192196
}
193197
}

‎oraclestorage/pom.xml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.ithit.webdav.samples</groupId>
88
<artifactId>oraclestorage</artifactId>
9-
<version>2.3.863</version>
9+
<version>3.0.1-Beta</version>
1010
<packaging>war</packaging>
1111

1212
<properties>
@@ -20,6 +20,11 @@
2020
<version>2.5</version>
2121
<scope>provided</scope>
2222
</dependency>
23+
<dependency>
24+
<groupId>com.ithit.webdav.integration</groupId>
25+
<artifactId>servlet-integration</artifactId>
26+
<version>3.0.1-Beta</version>
27+
</dependency>
2328
<dependency>
2429
<groupId>commons-dbcp</groupId>
2530
<artifactId>commons-dbcp</artifactId>
@@ -88,7 +93,7 @@
8893
<dependency>
8994
<groupId>com.ithit.webdav</groupId>
9095
<artifactId>webdav-server</artifactId>
91-
<version>2.3.863</version>
96+
<version>3.0.1-Beta</version>
9297
</dependency>
9398

9499
<dependency>
@@ -128,7 +133,7 @@
128133
<goal>copy-resources</goal>
129134
</goals>
130135
<configuration>
131-
<outputDirectory>${project.build.directory}/oraclestorage-2.3.863/META-INF</outputDirectory>
136+
<outputDirectory>${project.build.directory}/oraclestorage-3.0.1-Beta/META-INF</outputDirectory>
132137
<overwrite>true</overwrite>
133138
<resources>
134139
<resource>
@@ -207,7 +212,7 @@
207212
<server>filesystem</server>
208213
<port>11021</port>
209214
<path>/</path>
210-
<warSourceDirectory>target/oraclestorage-2.3.863</warSourceDirectory>
215+
<warSourceDirectory>target/oraclestorage-3.0.1-Beta</warSourceDirectory>
211216
</configuration>
212217
</plugin>
213218
<plugin>

0 commit comments

Comments
 (0)