Skip to content

Commit

Permalink
Merge pull request #21 from fixy/prod
Browse files Browse the repository at this point in the history 
Change monalisa address, add maven build script
  • Loading branch information
@fixy
fixy authored Oct 14, 2017
2 parents 0113c5a + 064343a commit 7c1a40a
Show file tree
Hide file tree
Showing 2 changed files with 294 additions and 1 deletion.
293 changes: 293 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,293 @@
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>fast-data-transfer</groupId>
<artifactId>fdt</artifactId>
<version>0.25.1-SNAPSHOT</version>
<description>Fast data transfer</description>
<packaging>jar</packaging>

<properties>
<jdk.version>1.7</jdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>edu.illinois.ncsa</groupId>
<artifactId>BCGSS</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov</artifactId>
<version>1.50.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.2.0</version>
</dependency>
<dependency>
<groupId>net.iharder.dnd</groupId>
<artifactId>filedrop</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.sshtools.common</groupId>
<artifactId>j2ssh-common</artifactId>
<version>0.2.7</version>
</dependency>
<dependency>
<groupId>com.sshtools.core</groupId>
<artifactId>j2ssh-core</artifactId>
<version>0.2.7</version>
</dependency>
<dependency>
<groupId>org.lirc.socket</groupId>
<artifactId>jlirc-unix-soc</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>uk.ac.rl.esc.browser</groupId>
<artifactId>libbrowser</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
<dependency>
<groupId>edu.illinois.ncsa</groupId>
<artifactId>ncsa-lcrypto</artifactId>
<version>1.4.6</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>not-yet-commons-ssl</artifactId>
<version>0.3.11</version>
</dependency>
<dependency>
<groupId>com.sshtools.ext</groupId>
<artifactId>putty-pk</artifactId>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>com.sshtools.tunnel</groupId>
<artifactId>SecureTunneling</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.sshtools.shift</groupId>
<artifactId>ShiFT</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.sshtools.sshterm</groupId>
<artifactId>SSHTerm</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.sshtools.sshvnc</groupId>
<artifactId>SSHVnc</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.jdesktop</groupId>
<artifactId>swing-layout</artifactId>
<version>1.0.3</version>
</dependency>
<dependency>
<groupId>org.globusonline</groupId>
<artifactId>TransferAPIClient</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.italiangrid</groupId>
<artifactId>voms-api-java</artifactId>
<version>3.0.1</version>
</dependency>
<dependency>
<groupId>org.globus</groupId>
<artifactId>axisg</artifactId>
<version>2.2.0</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20170516</version>
</dependency>
<dependency>
<groupId>org.globus</groupId>
<artifactId>gram</artifactId>
<version>2.2.0</version>
</dependency>
<dependency>
<groupId>org.globus</groupId>
<artifactId>gridftp</artifactId>
<version>2.2.0</version>
</dependency>
<dependency>
<groupId>org.globus.gsi.gssapi</groupId>
<artifactId>gss</artifactId>
<version>2.2.0</version>
</dependency>
<dependency>
<groupId>org.globus.io</groupId>
<artifactId>io</artifactId>
<version>2.2.0</version>
</dependency>
<dependency>
<groupId>org.globus.jsse</groupId>
<artifactId>jsse</artifactId>
<version>2.2.0</version>
</dependency>
<dependency>
<groupId>org.globus.myproxy</groupId>
<artifactId>myproxy</artifactId>
<version>2.2.0</version>
</dependency>
<dependency>
<groupId>org.globus</groupId>
<artifactId>ssl-proxies</artifactId>
<version>2.2.0</version>
</dependency>
</dependencies>
<build>
<sourceDirectory>src</sourceDirectory>
<resources>
<resource>
<directory>src</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<version>2.9</version>
<configuration>
<downloadSources>true</downloadSources>
<downloadJavadocs>false</downloadJavadocs>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>${jdk.version}</source>
<target>${jdk.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<!-- DO NOT include log4j.properties file in your Jar -->
<excludes>
<exclude>**/log4j.properties</exclude>
</excludes>
<archive>
<manifest>
<!-- Jar file entry point -->
<mainClass>lia.util.net.copy.FDTMain</mainClass>
</manifest>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version>
<configuration>
<archive>
<manifest>
<mainClass>lia.util.net.copy.FDTMain</mainClass>
</manifest>
</archive>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<finalName>${project.artifactId}-${project.version}</finalName>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<phase>package</phase>
<configuration>
<target>
<copy
file="${project.build.directory}/${project.artifactId}-${project.version}-jar-with-dependencies.jar"
tofile="${project.build.directory}/fdt.jar" />
<echo file="${project.build.directory}/fdt" append="false">java -jar fdt.jar "$@"</echo>
<chmod file="${project.build.directory}/fdt" perm="ugo+rx" />
</target>
<filemode>755</filemode>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rpm-maven-plugin</artifactId>
<version>2.1.5</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>attached-rpm</goal>
</goals>
<phase>package</phase>
</execution>
</executions>
<configuration>
<mappings>
<mapping>
<directory>/usr/bin/</directory>
<sources>
<source>
<location>target</location>
<includes>
<include>fdt.jar</include>
<include>fdt</include>
</includes>
</source>
</sources>
</mapping>
</mappings>
<classifier>${rpm.classifier}</classifier>
<copyright>Caltech</copyright>
<distribution>Linux</distribution>
<group>Applications/Internet</group>
<packager>${user.name}</packager>
<changelogFile>CHANGELOG</changelogFile>
<defaultDirmode>500</defaultDirmode>
<defaultFilemode>755</defaultFilemode>
</configuration>
</plugin>
</plugins>
</build>
</project>
2 changes: 1 addition & 1 deletion src/lia/util/net/copy/FDT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ private static void initLogger(String level, File logFile) {
long lStart = System.currentTimeMillis();
ApMon apmon = null;

String mlDestinations = "monalisa2.cern.ch:28884";
String mlDestinations = "monalisa2.cern.ch:8884";
final String apMonHosts = (configApMonHosts.length() > 0) ? configApMonHosts : mlDestinations;

logger.info("Trying to instantiate apMon to: " + apMonHosts);
Expand Down

0 comments on commit 7c1a40a

Please sign in to comment.