Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
<attributes>
<attribute name="owner.project.facets" value="java"/>
</attributes>
Expand Down
2 changes: 1 addition & 1 deletion .mymetadata
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
type="WEB"
name="WebRestService"
id="myeclipse.1435385958919"
context-root="/transfermaven"
context-root="/transfer"
j2ee-spec="6.0"
archive="WebRestService.war">
<attributes>
Expand Down
13 changes: 13 additions & 0 deletions .mymetadata.bak
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<project-module
type="WEB"
name="WebRestService"
id="myeclipse.1435385958919"
context-root="/transfermaven"
j2ee-spec="6.0"
archive="WebRestService.war">
<attributes>
<attribute name="webrootdir" value="src/main/webapp" />
</attributes>
</project-module>

2 changes: 1 addition & 1 deletion .settings/com.genuitec.eclipse.core.prefs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Tue Jul 07 09:14:25 CST 2015
#Thu Jul 16 18:04:25 CST 2015
eclipse.preferences.version=1
validator.Checked=src/main/webapp/js
validator.Revalidate=true
Expand Down
3 changes: 2 additions & 1 deletion .settings/com.genuitec.eclipse.j2eedt.core.prefs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#Sat Jun 27 14:19:17 CST 2015
#Wed Jul 22 20:55:07 CST 2015
defaultTldInfo=f\=http\://java.sun.com/jsf/core;http\://java.sun.com/jsf/html\=h;http\://struts.apache.org/tags-bean\=bean;http\://java.sun.com/jsp/jstl/fmt\=fmt;nested\=http\://struts.apache.org/tags-nested;bean\=http\://struts.apache.org/tags-bean;http\://java.sun.com/jsp/jstl/sql\=sql;c\=http\://java.sun.com/jsp/jstl/core;fmt\=http\://java.sun.com/jsp/jstl/fmt;http\://struts.apache.org/tags-logic\=logic;http\://java.sun.com/jsp/jstl/xml\=x;http\://java.sun.com/jsp/jstl/core\=c;logic\=http\://struts.apache.org/tags-logic;h\=http\://java.sun.com/jsf/html;http\://struts.apache.org/tags-tiles\=tiles;http\://java.sun.com/jsp/jstl/functions\=fn;tiles\=http\://struts.apache.org/tags-tiles;sql\=http\://java.sun.com/jsp/jstl/sql;http\://struts.apache.org/tags-html\=html;http\://struts.apache.org/tags-nested\=nested;html\=http\://struts.apache.org/tags-html;http\://java.sun.com/jsf/core\=f;fn\=http\://java.sun.com/jsp/jstl/functions;x\=http\://java.sun.com/jsp/jstl/xml
eclipse.preferences.version=1
useAssemblyMapping=true
8 changes: 4 additions & 4 deletions .settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#Wed Jul 08 18:50:26 CST 2015
#Wed Jul 22 20:55:10 CST 2015
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.compiler.source=1.6
2 changes: 1 addition & 1 deletion .settings/org.eclipse.wst.common.component
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
<property name="context-root" value="/transfermaven"/>
<property name="java-output-path" value="/WebRestService/src/main/webapp/WEB-INF/classes"/>
<property name="context-root" value="/transfer"/>
</wb-module>
</project-modules>
2 changes: 1 addition & 1 deletion .settings/org.eclipse.wst.common.project.facet.core.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
<fixed facet="wst.jsdt.web"/>
<installed facet="jst.web" version="3.0"/>
<installed facet="wst.jsdt.web" version="1.0"/>
<installed facet="java" version="1.7"/>
<installed facet="java" version="1.6"/>
</faceted-project>
Binary file modified J_airway_1.mat
Binary file not shown.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ After installation of Maven 3:

> mvn install

complete downloadZip
update again

http://localhost:8787/transfer/rest/remotefile/
13 changes: 0 additions & 13 deletions java/com/lungcare/dicomfile/App.java

This file was deleted.

5 changes: 0 additions & 5 deletions java/com/lungcare/dicomfile/client/ClientTest.java

This file was deleted.

7 changes: 0 additions & 7 deletions java/com/lungcare/dicomfile/dao/ILocalFileTransferDAO.java

This file was deleted.

21 changes: 0 additions & 21 deletions java/com/lungcare/dicomfile/dao/impl/LocalFileTransferDAOImp.java

This file was deleted.

35 changes: 0 additions & 35 deletions java/com/lungcare/dicomfile/entity/Customer.java

This file was deleted.

91 changes: 0 additions & 91 deletions java/com/lungcare/dicomfile/restful/CustomersResource.java

This file was deleted.

7 changes: 0 additions & 7 deletions java/com/lungcare/dicomfile/service/ILocalFileService.java

This file was deleted.

19 changes: 0 additions & 19 deletions java/com/lungcare/dicomfile/service/impl/LocalFileServiceImp.java

This file was deleted.

57 changes: 51 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<modelVersion>4.0.0</modelVersion>

<groupId>com.lungcare.dicomfile</groupId>
<artifactId>transfermaven</artifactId>
<artifactId>transfer</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>war</packaging>

<name>transfermaven</name>
<name>transfer</name>
<url>http://maven.apache.org</url>

<properties>
Expand All @@ -34,6 +34,9 @@
<artifactId>commons-io</artifactId>
<version>1.3.2</version>
</dependency>



<dependency>
<groupId>com.lungcare.matlab</groupId>
<artifactId>javabuilder-matlab</artifactId>
Expand All @@ -46,6 +49,43 @@
<version>0.0.1.RELEASE</version>
</dependency>


<dependency>
<groupId>com.lungcare.util</groupId>
<artifactId>dcm4che-core-3.3.8-SNAPSHOT</artifactId>
<version>0.0.1.RELEASE</version>
</dependency>
<dependency>
<groupId>com.lungcare.util</groupId>
<artifactId>dcm4che-tool-dcm2jpg-3.3.8-SNAPSHOT</artifactId>
<version>0.0.1.RELEASE</version>
</dependency>
<dependency>
<groupId>com.lungcare.util</groupId>
<artifactId>slf4j-api-1.6.4</artifactId>
<version>0.0.1.RELEASE</version>
</dependency>
<dependency>
<groupId>com.lungcare.util</groupId>
<artifactId>slf4j-log4j12-1.6.4</artifactId>
<version>0.0.1.RELEASE</version>
</dependency>
<dependency>
<groupId>com.lungcare.util</groupId>
<artifactId>dcm4che-image-3.3.8-SNAPSHOT</artifactId>
<version>0.0.1.RELEASE</version>
</dependency>
<dependency>
<groupId>com.lungcare.util</groupId>
<artifactId>dcm4che-imageio-3.3.8-SNAPSHOT</artifactId>
<version>0.0.1.RELEASE</version>
</dependency>






<!-- Jersey -->
<dependency>
<groupId>com.sun.jersey</groupId>
Expand Down Expand Up @@ -164,8 +204,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
<version>1.5.2</version>
<version>1.6.4</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.6.4</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
Expand Down Expand Up @@ -248,8 +293,8 @@

</dependencies>

<build>
<finalName>transfermaven</finalName>
<build>
<finalName>transfer</finalName>
<plugins>

<plugin>
Expand Down Expand Up @@ -296,7 +341,7 @@
<phase>package</phase>
<configuration>
<tasks>
<copy tofile="${catalina.home}/webapps/transfermaven.war" file="${project.build.directory}/transfermaven.war"/>
<copy tofile="${catalina.home}/webapps/transfer.war" file="${project.build.directory}/transfer.war"/>
</tasks>
</configuration>
<goals>
Expand Down
Loading