Commit d50742a7 by Patryk Czarnik

Testowe dopisanie jednej metody SOAP i poprawki konfiguracji war

parent 72102ce0
...@@ -19,6 +19,9 @@ ...@@ -19,6 +19,9 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>3.3.2</version> <version>3.3.2</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
<properties> <properties>
<maven.compiler.release>17</maven.compiler.release> <maven.compiler.release>17</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<failOnMissingWebXml>false</failOnMissingWebXml>
</properties> </properties>
<dependencies> <dependencies>
...@@ -35,10 +34,11 @@ ...@@ -35,10 +34,11 @@
<groupId>jakarta.servlet.jsp.jstl</groupId> <groupId>jakarta.servlet.jsp.jstl</groupId>
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId> <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
<version>2.0.0</version> <version>2.0.0</version>
<!-- <scope>provided</scope> - na WildFly 26 można to odkomentować --> <!-- <scope>provided</scope> -->
<!-- na WildFly 26 preview można to odkomentować -->
</dependency> </dependency>
<!-- ewentualnie stara klasyczna wersja - ale wtedy wypisują się błędy podczas deploy: <!-- ewentualnie stara klasyczna wersja - ale wtedy wypisują się błędy podczas deploy: -->
<dependency> <!-- <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId> <artifactId>jstl</artifactId>
<version>1.2</version> <version>1.2</version>
...@@ -58,12 +58,15 @@ ...@@ -58,12 +58,15 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version> <version>3.11.0</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>3.3.2</version> <version>3.3.2</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
<properties> <properties>
<maven.compiler.release>17</maven.compiler.release> <maven.compiler.release>17</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<failOnMissingWebXml>false</failOnMissingWebXml>
</properties> </properties>
<dependencies> <dependencies>
...@@ -42,6 +41,9 @@ ...@@ -42,6 +41,9 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>3.3.2</version> <version>3.3.2</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
......
...@@ -63,6 +63,14 @@ public class Sklep { ...@@ -63,6 +63,14 @@ public class Sklep {
} }
} }
@WebResult(name="order")
public List<Order> zamowieniaKlienta(@WebParam(name="email") String email) throws DBException, RecordNotFound {
try(DBConnection db = DBConnection.open()) {
OrderDAO orderDAO = db.orderDAO();
return orderDAO.customerOrders(email);
}
}
@WebResult(name="customer") @WebResult(name="customer")
public Customer klient(@WebParam(name="email") String email) throws DBException, RecordNotFound { public Customer klient(@WebParam(name="email") String email) throws DBException, RecordNotFound {
try(DBConnection db = DBConnection.open()) { try(DBConnection db = DBConnection.open()) {
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
<properties> <properties>
<maven.compiler.release>17</maven.compiler.release> <maven.compiler.release>17</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<failOnMissingWebXml>false</failOnMissingWebXml>
</properties> </properties>
<dependencies> <dependencies>
...@@ -58,6 +57,9 @@ ...@@ -58,6 +57,9 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>3.3.2</version> <version>3.3.2</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment