Commit: b7d0ab0dc45294c31c53547b9819e9c4a0453ed7 - FileCleaner (git)

Commit MetaInfo

• Revision: b7d0ab0dc45294c31c53547b9819e9c4a0453ed7 (tree)
• Zeit: 2018-01-08 21:45:05
• Autor: [e-mail] <shupeluter@hotm...>
• Commiter: [e-mail]

Log Message

不要なテストリソースを削除
実行Jarを作成するための設定をpom.xmlに追加

Ändern Zusammenfassung

• add: nbactions.xml
• modified: pom.xml
• add: src/main/resources/replace.properties
• modified: src/test/java/jp/co/nec/jsight/filecleaner/FileObjectScannerTest.java
• modified: src/test/java/jp/co/nec/jsight/filecleaner/ReplaceInfoManagerTest.java
• delete: src/test/resources/FileObjectScanerTest/Case1/Case1-1.xls
• delete: src/test/resources/FileObjectScanerTest/Case1/Case1-2.xls
• delete: src/test/resources/FileObjectScanerTest/Case1/Case1-3.doc
• delete: src/test/resources/FileObjectScanerTest/Case1/Case1-4.java
• delete: src/test/resources/FileObjectScanerTest/Case1/Case1-5.html
• delete: src/test/resources/FileObjectScanerTest/Case2/Case2-1/Case2-1.xls
• delete: src/test/resources/FileObjectScanerTest/Case2/Case2-1/Case2-2.xls
• delete: src/test/resources/FileObjectScanerTest/Case2/Case2-1/Case2-3.doc
• delete: src/test/resources/FileObjectScanerTest/Case2/Case2-1/Case2-4.java
• delete: src/test/resources/FileObjectScanerTest/Case2/Case2-1/Case2-5.html
• delete: src/test/resources/FileObjectScanerTest/Case3-1.xls
• modified: src/test/resources/FileObjectScanerTest/Case3-2.xls
• modified: src/test/resources/FileObjectScanerTest/Case3_4.java
• modified: src/test/resources/JavaCleanerTest/TestTarget1.java

Diff

--- /dev/null
+++ b/nbactions.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actions>
+        <action>
+            <actionName>run</actionName>
+            <packagings>
+                <packaging>jar</packaging>
+            </packagings>
+            <goals>
+                <goal>process-classes</goal>
+                <goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
+            </goals>
+            <properties>
+                <exec.args>-classpath %classpath jp.co.nec.jsight.filecleaner.CleanerMainCUI src\test\resources</exec.args>
+                <exec.executable>java</exec.executable>
+            </properties>
+        </action>
+        <action>
+            <actionName>debug</actionName>
+            <packagings>
+                <packaging>jar</packaging>
+            </packagings>
+            <goals>
+                <goal>process-classes</goal>
+                <goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
+            </goals>
+            <properties>
+                <exec.args>-Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -classpath %classpath jp.co.nec.jsight.filecleaner.CleanerMainCUI src\test\resources</exec.args>
+                <exec.executable>java</exec.executable>
+                <jpda.listen>true</jpda.listen>
+            </properties>
+        </action>
+        <action>
+            <actionName>profile</actionName>
+            <packagings>
+                <packaging>jar</packaging>
+            </packagings>
+            <goals>
+                <goal>process-classes</goal>
+                <goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
+            </goals>
+            <properties>
+                <exec.args>-classpath %classpath jp.co.nec.jsight.filecleaner.CleanerMainCUI src\test\resources</exec.args>
+                <exec.executable>java</exec.executable>
+            </properties>
+        </action>
+    </actions>

--- a/pom.xml
+++ b/pom.xml
@@ -5,6 +5,42 @@
     <artifactId>FileCleaner</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>lib</classpathPrefix>
+                            <mainClass>jp.co.nec.jsight.filecleaner.CleanerMainCUI</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>
+                                ${project.build.directory}/lib
+                            </outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    
     <dependencies>
         <dependency>
             <groupId>stux</groupId>

--- /dev/null
+++ b/src/main/resources/replace.properties
@@ -0,0 +1,9 @@
+# To change this license header, choose License Headers in Project Properties.
+# To change this template file, choose Tools | Templates
+# and open the template in the editor.
+
+#\u7f6e\u63db\u5bfe\u8c61\u30ad\u30fc\u30ef\u30fc\u30c9
+rep.from=XX\u30c6\u30b9\u30c8,XX\u30c6\u30b9\u30c8\uff12,\u00d7\u00d7,xx
+rep.to=\u3007\u3007\u30c6\u30b9\u30c8,\u3007\u3007\u30c6\u30b9\u30c8\uff12,\u3007\u3007,oo
+rep.id=java,xls
+rep.class=jp.co.nec.jsight.filecleaner.JavaCleaner,jp.co.nec.jsight.filecleaner.ExcelCleaner
\ No newline at end of file

--- a/src/test/java/jp/co/nec/jsight/filecleaner/FileObjectScannerTest.java
+++ b/src/test/java/jp/co/nec/jsight/filecleaner/FileObjectScannerTest.java
@@ -66,7 +66,7 @@ public class FileObjectScannerTest {
         FileObjectScanner fos = new FileObjectScanner(target);
         List<File> results = fos.getFiles();
         
-        assertEquals(12,results.size() );
+        assertEquals(3,results.size() );
         
         for(File file: results){
             System.out.println(file);

--- a/src/test/java/jp/co/nec/jsight/filecleaner/ReplaceInfoManagerTest.java
+++ b/src/test/java/jp/co/nec/jsight/filecleaner/ReplaceInfoManagerTest.java
@@ -56,7 +56,7 @@ public class ReplaceInfoManagerTest {
         System.out.println("getReplaceStrs");
         ReplaceInfoManager instance = new ReplaceInfoManager();
         List result = instance.getReplaceStrs();
-        assertEquals(3, result.size());
+        assertEquals(4, result.size());
     }
     
 }

Binary files a/src/test/resources/FileObjectScanerTest/Case1/Case1-1.xls and /dev/null differ

Binary files a/src/test/resources/FileObjectScanerTest/Case1/Case1-2.xls and /dev/null differ

--- a/src/test/resources/FileObjectScanerTest/Case1/Case1-3.doc
+++ /dev/null
@@ -1 +0,0 @@
-

--- a/src/test/resources/FileObjectScanerTest/Case1/Case1-4.java
+++ /dev/null
@@ -1 +0,0 @@
-

--- a/src/test/resources/FileObjectScanerTest/Case1/Case1-5.html
+++ /dev/null
@@ -1 +0,0 @@
-

Binary files a/src/test/resources/FileObjectScanerTest/Case2/Case2-1/Case2-1.xls and /dev/null differ

Binary files a/src/test/resources/FileObjectScanerTest/Case2/Case2-1/Case2-2.xls and /dev/null differ

--- a/src/test/resources/FileObjectScanerTest/Case2/Case2-1/Case2-3.doc
+++ /dev/null
@@ -1 +0,0 @@
-

--- a/src/test/resources/FileObjectScanerTest/Case2/Case2-1/Case2-4.java
+++ /dev/null
@@ -1 +0,0 @@
-

--- a/src/test/resources/FileObjectScanerTest/Case2/Case2-1/Case2-5.html
+++ /dev/null
@@ -1 +0,0 @@
-

Binary files a/src/test/resources/FileObjectScanerTest/Case3-1.xls and /dev/null differ

Binary files a/src/test/resources/FileObjectScanerTest/Case3-2.xls and b/src/test/resources/FileObjectScanerTest/Case3-2.xls differ

--- a/src/test/resources/FileObjectScanerTest/Case3_4.java
+++ b/src/test/resources/FileObjectScanerTest/Case3_4.java
@@ -17,8 +17,8 @@ public class Case3_4 {
         
     }
     
-    public void testxx(){
-       //××
+    public void testoo(){
+       //�?
     }
 }
 

--- a/src/test/resources/JavaCleanerTest/TestTarget1.java
+++ b/src/test/resources/JavaCleanerTest/TestTarget1.java
@@ -18,6 +18,6 @@ public class TestTarget1 {
     }
     
     public void testoo(){
-       //××
+       //×??
     }
 }