Skip to content

Commit

Permalink
#156, #183: Fixed CLI stand-alone executable program in multi-module …
Browse files Browse the repository at this point in the history 
…project
  • Loading branch information
@bbottema
bbottema committed Feb 8, 2019
1 parent 372ad1c commit ea57c7e
Show file tree
Hide file tree
Showing 4 changed files with 110 additions and 61 deletions.
75 changes: 72 additions & 3 deletions modules/cli-module/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,88 @@
<version>0.9.0</version>
</dependency>

<!-- test -->
<!-- dependencies that should be included in the assembly for the stand-alone jar -->
<dependency>
<groupId>org.simplejavamail</groupId>
<artifactId>core-test-module</artifactId>
<artifactId>authenticated-socks-module</artifactId>
<version>${library.version}</version>
<scope>test</scope>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.simplejavamail</groupId>
<artifactId>dkim-module</artifactId>
<version>${library.version}</version>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.simplejavamail</groupId>
<artifactId>outlook-module</artifactId>
<version>${library.version}</version>
<scope>runtime</scope>
</dependency>

<!-- test -->
<dependency>
<groupId>org.simplejavamail</groupId>
<artifactId>core-test-module</artifactId>
<version>${library.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>appassembler-maven-plugin</artifactId>
<version>1.8.1</version>
<configuration>
<configurationSourceDirectory>src/main/resources</configurationSourceDirectory>
<copyConfigurationDirectory>true</copyConfigurationDirectory>
<repositoryLayout>flat</repositoryLayout>
<repositoryName>lib</repositoryName>
<showConsoleWindow>true</showConsoleWindow>
<platforms>
<platform>unix</platform>
<platform>windows</platform>
</platforms>
<programs>
<program>
<mainClass>org.simplejavamail.cli.SimpleJavaMail</mainClass>
<id>sjm</id>
</program>
</programs>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>assemble</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<descriptors>
<descriptor>src/assembly/standalone-cli-descriptor.xml</descriptor>
</descriptors>
</configuration>
<executions>
<execution>
<id>assemble-all</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
15 changes: 10 additions & 5 deletions ...rc/assembly/standalone-cli-descriptor.xml → ...rc/assembly/standalone-cli-descriptor.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,32 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>standalone-cli</id>
<!-- FIXME doesn't this file need to go to Cli Module??? -->
<formats>
<format>tar</format>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>${project.build.directory}/appassembler</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>**/**</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.basedir}</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>LICENSE-2.0.txt</include>
<include>NOTICE.txt</include>
<include>RELEASE.txt</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.build.directory}/appassembler</directory>
<directory>${maven.multiModuleProjectDirectory}</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>**/**</include>
<include>LICENSE-2.0.txt</include>
<include>RELEASE.txt</include>
</includes>
</fileSet>
</fileSets>
Expand Down
28 changes: 28 additions & 0 deletions modules/cli-module/src/main/resources/log4j2.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--suppress XmlUnboundNsPrefix -->
<configuration status="INFO">
<appenders>
<Console name="console" target="SYSTEM_OUT">
<PatternLayout pattern="%d{HH:mm:ss} [%t] %-5level %c{1} - %msg%n" />
</Console>
<Console name="simpleConsole" target="SYSTEM_OUT">
<PatternLayout pattern="%d Simple Java Mail SOCKS5 bridge - %level %m%n" />
</Console>
</appenders>
<Loggers>
<Logger name="org.simplejavamail" level="debug"/>
<Logger name="org.simplejavamail.mailer.internal.MailerImpl" level="trace"/>
<Logger name="org.simplejavamail.internal.clisupport" level="info"/>

<!-- in case you're using authenticated proxy -->
<Logger name="socks5bridge" level="info" additivity="false">
<AppenderRef ref="simpleConsole" />
</Logger>
<Logger name="org.simplejavamail.api.mailer.internal.socks" level="info"/>
<Logger name="org.subethamail.smtp.server" level="info"/>

<Root level="debug">
<AppenderRef ref="console" />
</Root>
</Loggers>
</configuration>
53 changes: 0 additions & 53 deletions modules/simple-java-mail/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,59 +133,6 @@
<scope>runtime</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>appassembler-maven-plugin</artifactId>
<version>1.8.1</version>
<configuration>
<configurationSourceDirectory>src/main/resources</configurationSourceDirectory>
<copyConfigurationDirectory>true</copyConfigurationDirectory>
<repositoryLayout>flat</repositoryLayout>
<repositoryName>lib</repositoryName>
<showConsoleWindow>true</showConsoleWindow>
<platforms>
<platform>unix</platform>
<platform>windows</platform>
</platforms>
<programs>
<program>
<mainClass>org.simplejavamail.cli.SimpleJavaMail</mainClass>
<id>sjm</id>
</program>
</programs>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>assemble</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<descriptors>
<descriptor>src/assembly/standalone-cli-descriptor.xml</descriptor>
</descriptors>
</configuration>
<executions>
<execution>
<id>assemble-all</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

Expand Down

0 comments on commit ea57c7e

Please sign in to comment.