Skip to content

Commit

Permalink
Reworked Tests and moved the whole project to maven for easier build.
Browse files Browse the repository at this point in the history
  • Loading branch information
sbamamoto committed Mar 8, 2015
1 parent d9dc850 commit ecb5c4d
Show file tree
Hide file tree
Showing 84 changed files with 651 additions and 2,181 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
target/
*log
*class
nb*

35 changes: 0 additions & 35 deletions Makefile

This file was deleted.

Binary file removed bin/JObexFTP2.jar
Binary file not shown.
8 changes: 0 additions & 8 deletions bin/jobexftp

This file was deleted.

21 changes: 0 additions & 21 deletions bin/jobexftp.bat

This file was deleted.

563 changes: 0 additions & 563 deletions bin/lib/LICENSE.txt

This file was deleted.

Binary file removed bin/lib/nrjavaserial-3.8.4.jar
Binary file not shown.
5 changes: 0 additions & 5 deletions lib/Install.txt

This file was deleted.

563 changes: 0 additions & 563 deletions lib/LICENSE.txt

This file was deleted.

Binary file removed lib/nrjavaserial-3.8.4.jar
Binary file not shown.
21 changes: 0 additions & 21 deletions lib/run-install.sh

This file was deleted.

Empty file added obex-folder-listing.dtd
Empty file.
75 changes: 75 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.lhf.obexftp</groupId>
<artifactId>JObexFtp</artifactId>
<packaging>jar</packaging>
<version>2.5-SNAPSHOT</version>
<name>JObexFtp</name>
<url>http://maven.apache.org</url>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifest>
<mainClass>com.lhf.jobexftp.StandAloneApp</mainClass>
<addClasspath>true</addClasspath>
<classpathPrefix>lib/</classpathPrefix>
</manifest>
</archive>
<excludes>
<exclude>doc/**/*</exclude>
<exclude>librxtx/**/*</exclude>
<exclude>bin/**/*</exclude>
<exclude>MANIFEST.MF</exclude>
<exclude>LICENSE</exclude>
<exclude>README</exclude>
<exclude>CHANGELOG</exclude>
</excludes>

</configuration>
</plugin>

</plugins>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
<descriptor>src/main/assembly/jobexftp-dist.xml</descriptor>
</descriptors>
</configuration>
</plugin>
</plugins>
</pluginManagement>

</build>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.rxtx</groupId>
<artifactId>rxtx</artifactId>
<version>2.1.7</version>
<type>jar</type>
</dependency>
</dependencies>
</project>
42 changes: 42 additions & 0 deletions src/main/assembly/jobexftp-dist.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>

<assembly>
<id>dist</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>${project.build.outputDirectory}</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>${project.build.finalName}.jar</include>
<include>*.jar</include>
<include>bin/**/*</include>
<include>doc/**/*</include>
<include>librxtx/**/*</include>
<include>LICENSE</include>
<include>README</include>
<include>CHANGELOG</include>
</includes>
</fileSet>

</fileSets>
<files>
<file>
<filtered>false</filtered>
<source>${project.build.directory}/${project.build.finalName}.jar</source>
<outputDirectory>/</outputDirectory>
</file>
</files>
<dependencySets>
<dependencySet>
<unpack>false</unpack>
<scope>runtime</scope>
<outputDirectory>lib</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
</dependencySets>

</assembly>
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit ecb5c4d

Please sign in to comment.