Skip to content

Commit c2cdc9d

Browse files
Bipinkumar27Bipinkumar27
authored
Java 48969 Move modules to security-modules (#18915)
1 parent f04650c commit c2cdc9d

File tree

11 files changed

+80
-90
lines changed

11 files changed

+80
-90
lines changed

‎jws/java-core-samples-lib/jardiff.jar‎

-11.1 KB
Binary file not shown.

‎jws/java-core-samples-lib/jnlp-servlet.jar‎

-53.7 KB
Binary file not shown.

‎pom.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,6 @@
688688
<module>json-modules</module>
689689
<module>jsoup</module>
690690
<module>jts</module>
691-
<module>jws</module>
692691
<module>ksqldb</module>
693692
<module>kubernetes-modules</module>
694693
<module>libraries</module> <!-- very long running -->
@@ -1133,7 +1132,6 @@
11331132
<module>json-modules</module>
11341133
<module>jsoup</module>
11351134
<module>jts</module>
1136-
<module>jws</module>
11371135
<module>ksqldb</module>
11381136
<module>kubernetes-modules</module>
11391137
<module>libraries</module> <!-- very long running -->

‎jws/.gitignore‎ renamed to ‎security-modules/jws/.gitignore‎

File renamed without changes.

‎jws/pom.xml‎ renamed to ‎security-modules/jws/pom.xml‎

Lines changed: 55 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,55 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
5-
<modelVersion>4.0.0</modelVersion>
6-
<artifactId>jws</artifactId>
7-
<packaging>war</packaging>
8-
<name>jws</name>
9-
10-
<parent>
11-
<groupId>com.baeldung</groupId>
12-
<artifactId>parent-modules</artifactId>
13-
<version>1.0.0-SNAPSHOT</version>
14-
</parent>
15-
16-
<build>
17-
<finalName>${project.artifactId}</finalName>
18-
<plugins>
19-
<plugin>
20-
<groupId>org.apache.maven.plugins</groupId>
21-
<artifactId>maven-jar-plugin</artifactId>
22-
<version>${maven-jar-plugin.version}</version>
23-
<executions>
24-
<execution>
25-
<phase>compile</phase>
26-
<goals>
27-
<goal>jar</goal>
28-
</goals>
29-
<configuration>
30-
<archive>
31-
<manifest>
32-
<mainClass>com.example.Hello</mainClass>
33-
</manifest>
34-
</archive>
35-
<outputDirectory>${project.basedir}/target/jws</outputDirectory>
36-
</configuration>
37-
</execution>
38-
</executions>
39-
</plugin>
40-
<plugin>
41-
<groupId>org.apache.maven.plugins</groupId>
42-
<artifactId>maven-war-plugin</artifactId>
43-
<version>${maven-war-plugin.version}</version>
44-
<executions>
45-
<execution>
46-
<phase>package</phase>
47-
</execution>
48-
</executions>
49-
<configuration>
50-
<webResources>
51-
<resource>
52-
<directory>${project.basedir}/java-core-samples-lib/</directory>
53-
<includes>
54-
<include>**/*.jar</include>
55-
</includes>
56-
<targetPath>WEB-INF/lib</targetPath>
57-
</resource>
58-
</webResources>
59-
</configuration>
60-
</plugin>
61-
</plugins>
62-
</build>
63-
64-
</project>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<artifactId>jws</artifactId>
7+
<packaging>war</packaging>
8+
<name>jws</name>
9+
10+
<parent>
11+
<groupId>com.baeldung</groupId>
12+
<artifactId>security-modules</artifactId>
13+
<version>1.0.0-SNAPSHOT</version>
14+
</parent>
15+
16+
<build>
17+
<finalName>${project.artifactId}</finalName>
18+
<plugins>
19+
<plugin>
20+
<groupId>org.apache.maven.plugins</groupId>
21+
<artifactId>maven-jar-plugin</artifactId>
22+
<version>${maven-jar-plugin.version}</version>
23+
<executions>
24+
<execution>
25+
<phase>compile</phase>
26+
<goals>
27+
<goal>jar</goal>
28+
</goals>
29+
<configuration>
30+
<archive>
31+
<manifest>
32+
<mainClass>com.example.Hello</mainClass>
33+
</manifest>
34+
</archive>
35+
<outputDirectory>${project.basedir}/target/jws</outputDirectory>
36+
</configuration>
37+
</execution>
38+
</executions>
39+
</plugin>
40+
<plugin>
41+
<groupId>org.apache.maven.plugins</groupId>
42+
<artifactId>maven-war-plugin</artifactId>
43+
<version>${maven-war-plugin.version}</version>
44+
<executions>
45+
<execution>
46+
<phase>package</phase>
47+
</execution>
48+
</executions>
49+
<configuration>
50+
</configuration>
51+
</plugin>
52+
</plugins>
53+
</build>
54+
55+
</project>

‎jws/src/main/java/com/example/Hello.java‎ renamed to ‎security-modules/jws/src/main/java/com/example/Hello.java‎

File renamed without changes.

‎jws/src/main/resources/logback.xml‎ renamed to ‎security-modules/jws/src/main/resources/logback.xml‎

File renamed without changes.

‎jws/src/main/webapp/WEB-INF/web.xml‎ renamed to ‎security-modules/jws/src/main/webapp/WEB-INF/web.xml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
<!DOCTYPE web-app
2-
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
3-
"http://java.sun.com/dtd/web-app_2_3.dtd">
4-
<web-app>
5-
<display-name>Java Web Start</display-name>
6-
<description>JNLP Example for Java Web Start Article</description>
7-
8-
<servlet>
9-
<servlet-name>JnlpDownloadServlet</servlet-name>
10-
<servlet-class>jnlp.sample.servlet.JnlpDownloadServlet</servlet-class>
11-
</servlet>
12-
<servlet-mapping>
13-
<servlet-name>JnlpDownloadServlet</servlet-name>
14-
<url-pattern>*.jar</url-pattern>
15-
</servlet-mapping>
16-
<servlet-mapping>
17-
<servlet-name>JnlpDownloadServlet</servlet-name>
18-
<url-pattern>*.jnlp</url-pattern>
19-
</servlet-mapping>
20-
21-
<welcome-file-list>
22-
<welcome-file>index.html</welcome-file>
23-
</welcome-file-list>
24-
</web-app>
1+
<!DOCTYPE web-app
2+
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
3+
"http://java.sun.com/dtd/web-app_2_3.dtd">
4+
<web-app>
5+
<display-name>Java Web Start</display-name>
6+
<description>JNLP Example for Java Web Start Article</description>
7+
8+
<servlet>
9+
<servlet-name>JnlpDownloadServlet</servlet-name>
10+
<servlet-class>jnlp.sample.servlet.JnlpDownloadServlet</servlet-class>
11+
</servlet>
12+
<servlet-mapping>
13+
<servlet-name>JnlpDownloadServlet</servlet-name>
14+
<url-pattern>*.jar</url-pattern>
15+
</servlet-mapping>
16+
<servlet-mapping>
17+
<servlet-name>JnlpDownloadServlet</servlet-name>
18+
<url-pattern>*.jnlp</url-pattern>
19+
</servlet-mapping>
20+
21+
<welcome-file-list>
22+
<welcome-file>index.html</welcome-file>
23+
</welcome-file-list>
24+
</web-app>

‎jws/src/main/webapp/hello.jnlp‎ renamed to ‎security-modules/jws/src/main/webapp/hello.jnlp‎

File renamed without changes.

‎jws/src/main/webapp/index.html‎ renamed to ‎security-modules/jws/src/main/webapp/index.html‎

File renamed without changes.

0 commit comments

Comments
 (0)