Skip to content

Commit d0b0cf3

Browse files
committed
build fail
1 parent 0df2373 commit d0b0cf3

File tree

6 files changed

+903
-44
lines changed

6 files changed

+903
-44
lines changed

core-module/src/main/java/egovframework/com/ext/jstree/support/util/CodeGenerator.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,13 @@
55
import org.springframework.stereotype.Controller;
66
import org.springframework.web.bind.annotation.RequestMapping;
77

8-
/**
9-
* Created by Administrator on 2018-09-01.
10-
*/
118
@Controller
129
@RequestMapping(value = {"/com/ext/jstree/codeGenerator"})
1310
public class CodeGenerator extends GenericAbstractController {
1411

1512
@IncludedInfo(name = "Code-Generator", listUrl = "/com/ext/jstree/codeGenerator/index.do", order = 3370, gid = 313)
1613
@RequestMapping("/index.do")
17-
public String jsTreeSpringHibernate() {
18-
return "egovframework/com/ext/jstree/codeGenerator/index";
14+
public String jsTreeCodeGenerator() {
15+
return "egovframework/com/ext/jstree/codeGenerator";
1916
}
2017
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_1.xsd">
3+
4+
<classpath>
5+
<dir name="C:/DEV/ideaIU-15.0.6/jstree/backend/core-module/target/classes">
6+
</dir>
7+
</classpath>
8+
9+
</application>

web-module/pom.xml

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -231,45 +231,6 @@
231231
</execution>
232232
</executions>
233233
</plugin>
234-
<plugin>
235-
<groupId>com.github.wvengen</groupId>
236-
<artifactId>proguard-maven-plugin</artifactId>
237-
<version>2.0.14</version>
238-
<configuration>
239-
<includeDependency>false</includeDependency>
240-
<injar>${project.build.finalName}.${project.packaging}</injar>
241-
<outjar>${project.build.finalName}-proguard.${project.packaging}</outjar>
242-
<libs>
243-
<lib>${java.bootstrap.classes}</lib>
244-
<lib>${java.cryptographic.extension.classes}</lib>
245-
<lib>${java.secure.socket.extension.classes}</lib>
246-
</libs>
247-
<options>
248-
<option>-keepclasseswithmembers public class * { public static void main(java.lang.String[]); }</option>
249-
<option>-keepattributes Signature</option>
250-
<option>-keepattributes *Annotation*</option>
251-
<option>-keepattributes InnerClasses,EnclosingMethod</option>
252-
<option>-ignorewarnings</option>
253-
</options>
254-
</configuration>
255-
<dependencies>
256-
<dependency>
257-
<groupId>net.sf.proguard</groupId>
258-
<artifactId>proguard-base</artifactId>
259-
<version>${version.proguard-base}</version>
260-
<scope>runtime</scope>
261-
</dependency>
262-
</dependencies>
263-
<executions>
264-
<execution>
265-
<id>proguard</id>
266-
<phase>package</phase>
267-
<goals>
268-
<goal>proguard</goal>
269-
</goals>
270-
</execution>
271-
</executions>
272-
</plugin>
273234
<plugin>
274235
<groupId>com.spotify</groupId>
275236
<artifactId>dockerfile-maven-plugin</artifactId>

web-module/src/main/resources/egovframework/message/com/cmm/message-common_ko.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,16 @@ comCmm.left.700=\uCD94\uCC9C\uC0AC\uC774\uD2B8\uAD00\uB9AC
6565
comCmm.left.710=\uD589\uC0AC/\uC774\uBCA4\uD2B8/\uCEA0\uD398\uC778
6666
comCmm.left.711=\uC678\uBD80\uC778\uC0AC\uC815\uBCF4
6767

68+
6869
comCmm.left.3300=CSRF json
6970
comCmm.left.3310=Struts-iBatis
7071
comCmm.left.3320=Spring-iBatis
7172
comCmm.left.3330=DWR-Chat
7273
comCmm.left.3340=Spring-DWR
7374
comCmm.left.3350=BLANK
7475
comCmm.left.3360=Spring-Hibernate
76+
comCmm.left.3370=jsTree Code Generator
77+
7578

7679
comCmm.left.7000=Menu
7780
comCmm.left.7001=DirectChat

0 commit comments

Comments
 (0)