Skip to content

Commit 6116069

Browse files
zahydozahydo
committed
1.Organización de los paquetes.
2.Cambios en el POM para generar las dependencias cuando se construye el .jar TODO: agregar los recursos externos como imágenes y demás al POM
1 parent ce7c2eb commit 6116069

File tree

17 files changed

+107
-123
lines changed

17 files changed

+107
-123
lines changed

‎nbactions.xml

+42-17
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,42 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<actions>
3-
<action>
4-
<actionName>run</actionName>
5-
<packagings>
6-
<packaging>jar</packaging>
7-
</packagings>
8-
<goals>
9-
<goal>process-classes</goal>
10-
<goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
11-
</goals>
12-
<properties>
13-
<exec.args>-classpath %classpath com.unicauca.arat.test.Main</exec.args>
14-
<exec.executable>java</exec.executable>
15-
</properties>
16-
</action>
17-
</actions>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<actions>
3+
<action>
4+
<actionName>run</actionName>
5+
<packagings>
6+
<packaging>jar</packaging>
7+
</packagings>
8+
<goals>
9+
<goal>process-classes</goal>
10+
<goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
11+
</goals>
12+
<properties>
13+
<exec.args>-classpath %classpath com.unicauca.arat.test.Main</exec.args>
14+
<exec.executable>java</exec.executable>
15+
</properties>
16+
</action>
17+
<action>
18+
<actionName>CUSTOM-clean install</actionName>
19+
<displayName>clean install</displayName>
20+
<goals>
21+
<goal>clean:clean</goal>
22+
<goal>install:install</goal>
23+
</goals>
24+
</action>
25+
<action>
26+
<actionName>CUSTOM-assembly</actionName>
27+
<displayName>assembly</displayName>
28+
<goals>
29+
<goal>clean:clean</goal>
30+
<goal>assembly:single</goal>
31+
</goals>
32+
</action>
33+
<action>
34+
<actionName>CUSTOM-compile install</actionName>
35+
<displayName>compile install</displayName>
36+
<goals>
37+
<goal>clean:clean</goal>
38+
<goal>compile</goal>
39+
<goal>install</goal>
40+
</goals>
41+
</action>
42+
</actions>

‎pom.xml

+26
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,30 @@
3131
</dependencies>
3232
<name>Architectural Rationale Annotations Tool</name>
3333
<description>Tool to document Architectutal Rationale in the source code with source code annotations.</description>
34+
<build>
35+
<plugins>
36+
<plugin>
37+
<artifactId>maven-assembly-plugin</artifactId>
38+
<configuration>
39+
<archive>
40+
<manifest>
41+
<mainClass>fully.qualified.MainClass</mainClass>
42+
</manifest>
43+
</archive>
44+
<descriptorRefs>
45+
<descriptorRef>jar-with-dependencies</descriptorRef>
46+
</descriptorRefs>
47+
</configuration>
48+
<executions>
49+
<execution>
50+
<id>make-assembly</id> <!-- this is used for inheritance merges -->
51+
<phase>package</phase> <!-- bind to the packaging phase -->
52+
<goals>
53+
<goal>single</goal>
54+
</goals>
55+
</execution>
56+
</executions>
57+
</plugin>
58+
</plugins>
59+
</build>
3460
</project>

‎src/main/java/com/unicauca/arat/business/model/implementations/Reflection_Impl_JAR.java ‎src/main/java/arat/business/model/implementations/Reflection_Impl_JAR.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.unicauca.arat.business.model.implementations;
1+
package arat.business.model.implementations;
22

3-
import com.unicauca.arat.business.model.interfaces.Reflection;
4-
import com.unicauca.arat.business.model.rationale.Information;
5-
import com.unicauca.arat.business.model.rationale.Rationale;
3+
import arat.business.model.interfaces.Reflection;
4+
import arat.business.model.rationale.Information;
5+
import arat.business.model.rationale.Rationale;
66
import java.lang.reflect.Method;
77
import java.util.HashMap;
88
import java.util.Set;

‎src/main/java/com/unicauca/arat/business/model/implementations/Report_Impl_Itext.java ‎src/main/java/arat/business/model/implementations/Report_Impl_Itext.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* To change this template file, choose Tools | Templates
44
* and open the template in the editor.
55
*/
6-
package com.unicauca.arat.business.model.implementations;
6+
package arat.business.model.implementations;
77

88
import com.itextpdf.text.BadElementException;
99
import com.itextpdf.text.Document;
@@ -17,18 +17,18 @@
1717
import com.itextpdf.text.pdf.PdfPCell;
1818
import com.itextpdf.text.pdf.PdfPTable;
1919
import com.itextpdf.text.pdf.PdfWriter;
20-
import com.unicauca.arat.business.model.rationale.Information;
21-
import com.unicauca.arat.business.model.rationale.Rationale;
22-
import com.unicauca.arat.utilities.JavaUtil;
20+
import arat.business.model.rationale.Information;
21+
import arat.business.model.rationale.Rationale;
22+
import arat.utilities.JavaUtil;
2323
import java.io.FileOutputStream;
2424
import java.io.IOException;
2525
import java.util.HashMap;
2626
import java.util.logging.Level;
2727
import java.util.logging.Logger;
2828
import java.io.FileNotFoundException;
2929
import java.util.Map;
30-
import com.unicauca.arat.business.model.interfaces.Report;
31-
import com.unicauca.arat.utilities.DefaultValues;
30+
import arat.business.model.interfaces.Report;
31+
import arat.utilities.DefaultValues;
3232
import java.util.Date;
3333

3434
/**

‎src/main/java/com/unicauca/arat/business/model/interfaces/Reflection.java ‎src/main/java/arat/business/model/interfaces/Reflection.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
* To change this template file, choose Tools | Templates
44
* and open the template in the editor.
55
*/
6-
package com.unicauca.arat.business.model.interfaces;
6+
package arat.business.model.interfaces;
77

8-
import com.unicauca.arat.business.model.rationale.Information;
9-
import com.unicauca.arat.business.model.rationale.Rationale;
8+
import arat.business.model.rationale.Information;
9+
import arat.business.model.rationale.Rationale;
1010
import java.lang.reflect.Method;
1111
import java.util.HashMap;
1212
import java.util.Set;

‎src/main/java/com/unicauca/arat/business/model/interfaces/Report.java ‎src/main/java/arat/business/model/interfaces/Report.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.unicauca.arat.business.model.interfaces;
1+
package arat.business.model.interfaces;
22

3-
import com.unicauca.arat.business.model.rationale.Information;
4-
import com.unicauca.arat.business.model.rationale.Rationale;
5-
import com.unicauca.arat.utilities.JavaUtil;
3+
import arat.business.model.rationale.Information;
4+
import arat.business.model.rationale.Rationale;
5+
import arat.utilities.JavaUtil;
66
import java.util.HashMap;
77

88
/**

‎src/main/java/com/unicauca/arat/business/model/rationale/Information.java ‎src/main/java/arat/business/model/rationale/Information.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* To change this template file, choose Tools | Templates
44
* and open the template in the editor.
55
*/
6-
package com.unicauca.arat.business.model.rationale;
6+
package arat.business.model.rationale;
77

88
/**
99
*

‎src/main/java/com/unicauca/arat/business/model/rationale/Rationale.java ‎src/main/java/arat/business/model/rationale/Rationale.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* To change this template file, choose Tools | Templates
44
* and open the template in the editor.
55
*/
6-
package com.unicauca.arat.business.model.rationale;
6+
package arat.business.model.rationale;
77

88
import java.lang.annotation.Documented;
99
import static java.lang.annotation.ElementType.METHOD;

‎src/main/java/com/unicauca/arat/business/model/reporter/Reporter.java ‎src/main/java/arat/business/model/reporter/Reporter.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package com.unicauca.arat.business.model.reporter;
1+
package arat.business.model.reporter;
22

3-
import com.unicauca.arat.business.model.interfaces.Reflection;
4-
import com.unicauca.arat.business.model.interfaces.Report;
5-
import com.unicauca.arat.business.model.rationale.Information;
6-
import com.unicauca.arat.business.model.rationale.Rationale;
3+
import arat.business.model.interfaces.Reflection;
4+
import arat.business.model.interfaces.Report;
5+
import arat.business.model.rationale.Information;
6+
import arat.business.model.rationale.Rationale;
77
import java.util.HashMap;
8-
import com.unicauca.arat.utilities.DefaultValues;
9-
import com.unicauca.arat.utilities.JavaUtil;
8+
import arat.utilities.DefaultValues;
9+
import arat.utilities.JavaUtil;
1010
import java.util.logging.Level;
1111
import java.util.logging.Logger;
1212

‎src/main/java/com/unicauca/arat/package-info.java ‎src/main/java/arat/package-info.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
reasons = "Razones que justifican las decisiones",
1515
links = "(opcional)"
1616
)
17-
package com.unicauca.arat;
17+
package arat;
1818

19-
import com.unicauca.arat.business.model.rationale.Rationale;
19+
import arat.business.model.rationale.Rationale;
2020

‎src/main/java/com/unicauca/arat/presentation/GraphicMain.form ‎src/main/java/arat/presentation/GraphicMain.form

File renamed without changes.

‎src/main/java/com/unicauca/arat/presentation/GraphicMain.java ‎src/main/java/arat/presentation/GraphicMain.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
* To change this template file, choose Tools | Templates
44
* and open the template in the editor.
55
*/
6-
package com.unicauca.arat.presentation;
6+
package arat.presentation;
77

8-
import com.unicauca.arat.utilities.JavaUtil;
8+
import arat.utilities.JavaUtil;
99
import javax.swing.JOptionPane;
1010

1111
/**

‎src/main/java/com/unicauca/arat/presentation/RationaleFacade.java ‎src/main/java/arat/presentation/RationaleFacade.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
* To change this template file, choose Tools | Templates
44
* and open the template in the editor.
55
*/
6-
package com.unicauca.arat.presentation;
6+
package arat.presentation;
77

8-
import com.unicauca.arat.business.model.reporter.Reporter;
9-
import com.unicauca.arat.utilities.DefaultValues;
10-
import com.unicauca.arat.utilities.JavaUtil;
8+
import arat.business.model.reporter.Reporter;
9+
import arat.utilities.DefaultValues;
10+
import arat.utilities.JavaUtil;
1111

1212
/**
1313
*

‎src/main/java/com/unicauca/arat/utilities/DefaultValues.java ‎src/main/java/arat/utilities/DefaultValues.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
* To change this template file, choose Tools | Templates
44
* and open the template in the editor.
55
*/
6-
package com.unicauca.arat.utilities;
6+
package arat.utilities;
77

8-
import com.unicauca.arat.business.model.implementations.Reflection_Impl_JAR;
9-
import com.unicauca.arat.business.model.implementations.Report_Impl_Itext;
8+
import arat.business.model.implementations.Reflection_Impl_JAR;
9+
import arat.business.model.implementations.Report_Impl_Itext;
1010
import java.util.Date;
1111

1212
/**

‎src/main/java/com/unicauca/arat/utilities/JavaUtil.java ‎src/main/java/arat/utilities/JavaUtil.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* To change this template file, choose Tools | Templates
44
* and open the template in the editor.
55
*/
6-
package com.unicauca.arat.utilities;
6+
package arat.utilities;
77

88
import java.io.File;
99
import java.util.logging.Logger;

‎src/main/java/com/unicauca/arat/presentation/Main.java

-67
This file was deleted.

‎target/maven-archiver/pom.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#Generated by Maven
2-
#Sun Jul 15 19:16:41 COT 2018
2+
#Fri Sep 14 22:42:54 COT 2018
33
version=1
44
groupId=com.arat
55
artifactId=arat-V1

0 commit comments

Comments
 (0)