Skip to content
This repository was archived by the owner on Jun 13, 2025. It is now read-only.

Commit de01f0f

Browse files
chmodssschmodsss
committed
changes according to CHANGELOG
1 parent 97bb084 commit de01f0f

61 files changed

Lines changed: 5313 additions & 4494 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
/.project
22
*/target/*
3-
*.prefs
3+
*.prefs
4+
portlet/node_modules/
5+
portlet/package-lock.json
6+
portlet/.idea
7+
portlet/*.iml

‎portlet/.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
/target/
2+
.classpath
3+
.project
4+
.settings

‎portlet/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "KnowledgeFinderII",
2+
"name": "KnowledgeFinder",
33
"version": "0.0.1",
44
"description": "",
55
"kewords": [

‎portlet/pom.xml‎

Lines changed: 57 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,37 @@
11
<?xml version="1.0"?>
22

3-
<!--
4-
Copyright 2016 DLR - German Aerospace Center
5-
6-
Licensed under the Apache License, Version 2.0 (the "License");
7-
you may not use this file except in compliance with the License.
8-
You may obtain a copy of the License at
9-
10-
http://www.apache.org/licenses/LICENSE-2.0
11-
12-
Unless required by applicable law or agreed to in writing, software
13-
distributed under the License is distributed on an "AS IS" BASIS,
14-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
See the License for the specific language governing permissions and
16-
limitations under the License.
17-
-->
3+
<!-- Copyright 2016 DLR - German Aerospace Center Licensed under the Apache
4+
License, Version 2.0 (the "License"); you may not use this file except in
5+
compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
6+
Unless required by applicable law or agreed to in writing, software distributed
7+
under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
8+
OR CONDITIONS OF ANY KIND, either express or implied. See the License for
9+
the specific language governing permissions and limitations under the License. -->
1810

1911
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2012
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
13+
<modelVersion>4.0.0</modelVersion>
14+
2115
<parent>
22-
<groupId>de.dlr.knowledgefinderII</groupId>
16+
<groupId>de.dlr.knowledgefinder</groupId>
2317
<artifactId>webapp</artifactId>
24-
<version>1.0.0-SNAPSHOT</version>
18+
<version>2.0.0</version>
2519
<relativePath>../pom.xml</relativePath>
2620
</parent>
27-
<modelVersion>4.0.0</modelVersion>
28-
<groupId>de.dlr.knowledgefinderII.webapp</groupId>
21+
22+
<groupId>de.dlr.knowledgefinder.webapp</groupId>
2923
<artifactId>portlet</artifactId>
3024
<packaging>war</packaging>
31-
<name>KnowledgeFinderII Portlet</name>
25+
<name>KnowledgeFinder Portlet</name>
3226

3327
<build>
34-
<finalName>KnowledgeFinderPortlet</finalName>
28+
<finalName>KnowledgeFinder-portlet</finalName>
3529
<plugins>
3630
<plugin>
3731
<artifactId>maven-war-plugin</artifactId>
3832
<configuration>
39-
<finalName>KnowledgeFinderPortlet</finalName>
40-
</configuration>
33+
<finalName>KnowledgeFinder-portlet</finalName>
34+
</configuration>
4135
</plugin>
4236
<plugin>
4337
<groupId>com.liferay.maven.plugins</groupId>
@@ -51,8 +45,27 @@
5145
</plugin>
5246
</plugins>
5347
</build>
48+
5449
<dependencies>
5550

51+
<!-- liferay -->
52+
<dependency>
53+
<groupId>com.liferay.portal</groupId>
54+
<artifactId>portal-service</artifactId>
55+
</dependency>
56+
<dependency>
57+
<groupId>com.liferay.portal</groupId>
58+
<artifactId>util-bridges</artifactId>
59+
</dependency>
60+
<dependency>
61+
<groupId>com.liferay.portal</groupId>
62+
<artifactId>util-taglib</artifactId>
63+
</dependency>
64+
<dependency>
65+
<groupId>com.liferay.portal</groupId>
66+
<artifactId>util-java</artifactId>
67+
</dependency>
68+
5669
<!-- Spring -->
5770
<dependency>
5871
<groupId>org.springframework</groupId>
@@ -76,7 +89,7 @@
7689
<groupId>org.codehaus.jackson</groupId>
7790
<artifactId>jackson-core-asl</artifactId>
7891
</dependency>
79-
92+
8093
<!-- CDI inject with liferay -->
8194
<!-- Required only for Tomcat -->
8295
<dependency>
@@ -90,25 +103,40 @@
90103
<artifactId>slf4j-api</artifactId>
91104
</dependency>
92105
<dependency>
106+
<groupId>com.liferay.portal</groupId>
107+
<artifactId>util-slf4j</artifactId>
108+
</dependency>
109+
<!--dependency>
93110
<groupId>org.slf4j</groupId>
94111
<artifactId>jcl-over-slf4j</artifactId>
95112
</dependency>
96-
<dependency>
97-
<groupId>org.slf4j</groupId>
98-
<artifactId>slf4j-log4j12</artifactId>
99-
</dependency>
100113
<dependency>
101114
<groupId>log4j</groupId>
102115
<artifactId>log4j</artifactId>
103116
</dependency>
117+
<dependency>
118+
<groupId>org.slf4j</groupId>
119+
<artifactId>slf4j-log4j12</artifactId>
120+
</dependency-->
104121

105122
<!-- @Inject -->
106123
<dependency>
107124
<groupId>javax.inject</groupId>
108125
<artifactId>javax.inject</artifactId>
109126
</dependency>
110127

111-
<!-- jstl -->
128+
<dependency>
129+
<groupId>javax.portlet</groupId>
130+
<artifactId>portlet-api</artifactId>
131+
</dependency>
132+
<dependency>
133+
<groupId>javax.servlet</groupId>
134+
<artifactId>servlet-api</artifactId>
135+
</dependency>
136+
<dependency>
137+
<groupId>javax.servlet.jsp</groupId>
138+
<artifactId>jsp-api</artifactId>
139+
</dependency>
112140
<dependency>
113141
<groupId>javax.servlet</groupId>
114142
<artifactId>jstl</artifactId>

0 commit comments

Comments
 (0)