Skip to content

Commit ba93b8a

Browse files
mbot-devmbot-dev
committed
Version 2.6.0
1 parent 1e5ef21 commit ba93b8a

77 files changed

Lines changed: 1329 additions & 7538 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎LICENSE‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
Copyright (C) 2001-2014 OpenDolphin Lab., Life Sciences Computing, Corp.
1+
Copyright (C) 2001-2011 Kazushi Minagawa. Digital Globe, Inc.
22
825 Sylk BLDG., 1-Yamashita-Cho, Naka-Ku, Kanagawa-Ken, Yokohama-City, JAPAN.
33

44
This program is free software; you can redistribute it and/or modify it under the terms of the
5-
GNU General Public License as published by the Free Software Foundation; either version 3
5+
GNU General Public License as published by the Free Software Foundation; either version 2
66
of the License, or (at your option) any later version.
77

88
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
@@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with thi
1313
if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
1414
02111-1307 USA.
1515

16-
(R)OpenDolphin version 2.4, Copyright (C) 2001-2014 OpenDolphin Lab., Life Sciences Computing, Corp.
16+
(R)OpenDolphin version 2.2, Copyright (C) 2001-2011 Kazushi Minagawa, Digital Globe, Inc.
1717
(R)OpenDolphin comes with ABSOLUTELY NO WARRANTY; for details see the GNU General
18-
Public License, version 3 (GPLv3) This is free software, and you are welcome to redistribute
19-
it under certain conditions; see the GPLv3 for details.
18+
Public License, version 2 (GPLv2) This is free software, and you are welcome to redistribute
19+
it under certain conditions; see the GPLv2 for details.

‎License-sjis.txt‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎README.md‎

Lines changed: 34 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,41 @@
1-
2015-01-15　皆川和史、王勝偉　オープンドルフィン・ラボ
2-
3-
１．ライセンス
4-
・OpenDolphinのライセンスは GNU GPL3 です。
5-
・OpenDolphinは下記先生方の開発されたソースコードを含んでいます。
6-
　　札幌市元町皮ふ科の松村先生
7-
　　和歌山市増田内科の増田先生
8-
　　新宿ヒロクリニック
1+
# OpenDolphin
2+
OpenDolphin 2.6.0
3+
2015-08-08　皆川和史、王勝偉　オープンドルフィン・ラボ
4+
5+
#### １．ライセンス
6+
* OpenDolphinのライセンスは GNU GPL3 です。
7+
* OpenDolphinは下記先生方の開発されたソースコードを含んでいます。
8+
- 札幌市元町皮ふ科の松村先生
9+
- 和歌山市増田内科の増田先生
10+
- 新宿ヒロクリニック
11+
- 日本RedHat Takayoshi KimuraさんのJBoss as7 へのポーティング
12+
913
これらの部分の著作権はそれぞれの先生に帰属します。
10-
また Takayoshi KimuraさんのJBoss as7 へのポーティングを使用させていただきました。
11-
12-
２．開発環境
13-
・jdk 1.8.0_25
14-
・NetBeans 8.0.2
15-
・maven 3.2.1
16-
・JavaEE 6
17-
・JBoss-7.1.2.Final
18-
＊ソース/バイナリ形式は jdk1.7
19-
20-
３．依存性
21-
OpenDolphinは、maven でプロジェクト管理を行っています。
22-
ビルドするにはext_lib内の
23-
・iTextAsian.jar
24-
・AppleJavaExtensions.jar
14+
15+
#### ２．開発環境
16+
* jdk 1.8.0_51
17+
* NetBeans 8.0.2
18+
* maven 3.3.1
19+
* JavaEE 7
20+
* wildfly-9.0.1.Final
21+
* ソース/バイナリ形式は jdk1.8
22+
23+
#### ３．依存性
24+
OpenDolphinは、maven でプロジェクト管理を行っています。ビルドするにはext_lib内の
25+
* iTextAsian.jar
26+
* AppleJavaExtensions.jar
27+
2528
をローカルリポジトリーに手動でインストールする必要があります。
2629

2730
mvn install:install-file -Dfile=/path/to/iTextAsian.jar -DgroupId=opendolphin -DartifactId=itext-font -Dversion=1.0 -Dpackaging=jar
2831

2932
mvn install:install-file -Dfile=/path/to/AppleJavaExtensions.jar -DgroupId=com.apple -DartifactId=AppleJavaExtensions -Dversion=1.6 -Dpackaging=jar
3033

31-
４ ．コンパイル
32-
OpenDolphin（トップ）ディレクトリで
33-
mvn clean
34-
mvn package
34+
#### ４ ．コンパイル
35+
* git clone https://github.com/dolphin-dev/OpenDolphin.git ~/Desktop/OpenDolphin
36+
* mvn clean
37+
* mvn package
38+
39+
#### ５．Docker Image
40+
dolphin-dev リポジトリに Docker コンテナイメージ（docke-images）も置いています。[この手順](https://github.com/dolphin-dev/docker-images)
41+
に従うと最も簡単にOpenDolphinサーバーを構築することができます。

‎build.xml‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project name="project" default="all" basedir="/Users/oh/Develop/Dolphin/Develop/OpenDolphinPro">
3+
4+
<property name="modulesDir" location="${basedir}/modules"/>
5+
<property name="jarDir" location="${modulesDir}/jar"/>
6+
<property name="jnlpDir" location="${modulesDir}/dolphin"/>
7+
<property name="objDir" location="${basedir}/OpenDolphin/client/target"/>
8+
<property name="warDir" location="${basedir}/OpenDolphin/server/target"/>
9+
10+
<!-- Create APP -->
11+
<!-- Import environment variables -->
12+
<property environment="env"/>
13+
<!-- <property name="dir.jars" location="${modulesDir}/jars"/> -->
14+
<!-- <property name="dir.output" location="${modulesDir}/bundle-app-pro"/> -->
15+
<!-- compiled target: maven jar target -->
16+
<!-- <property name="dir.obj" location="${basedir}/OpenDolphin/client/target"/> -->
17+
<property name="common" value="opendolphin-common-2.5.12.jar"/>
18+
<property name="server" value="opendolphin-server-2.5.12.war"/>
19+
<property name="dolphin" value="OpenDolphin.jar"/>
20+
<property name="dolphinpro" value="OpenDolphinPro.jar"/>
21+
<property name="icns" value="${modulesDir}/icons/op.icns"/>
22+
<!-- Define the appbundler task -->
23+
<taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask"/>
24+
25+
<target name="clean">
26+
<delete dir="${jarDir}/open"/>
27+
<delete dir="${jarDir}/META-INF/plugins"/>
28+
</target>
29+
30+
<target name="copy">
31+
<copy file="${objDir}/${dolphin}" tofile="${jarDir}/${dolphin}"/>
32+
<copy file="${objDir}/lib/${common}" tofile="${jarDir}/${common}"/>
33+
<copy file="${warDir}/${server}" tofile="${jnlpDir}/${server}"/>
34+
</target>
35+
36+
<target name="unjar">
37+
<unjar src="${jarDir}/${common}" dest="${jarDir}"/>
38+
<unjar src="${jarDir}/OpenDolphin.jar" dest="${jarDir}"/>
39+
</target>
40+
41+
<target name="clean2">
42+
<delete file="${jarDir}/${common}"/>
43+
<delete file="${jarDir}/OpenDolphin.jar"/>
44+
<delete file="${jarDir}/META-INF/MANIFEST.MF"/>
45+
<delete file="${jarDir}/META-INF/jboss.xml"/>
46+
<delete file="${jarDir}/META-INF/persistence.xml"/>
47+
<delete dir="${jarDir}/META-INF/maven"/>
48+
</target>
49+
50+
<target name="jar">
51+
<jar destfile="${jarDir}/OpenDolphin.jar" basedir="${jarDir}">
52+
<manifest>
53+
<attribute name="Main-Class" value="open.dolphin.client.Dolphin"/>
54+
<attribute name="Permissions" value="all-permissions"/>
55+
</manifest>
56+
</jar>
57+
</target>
58+
59+
<target name="sign">
60+
<signjar jar="${jarDir}/OpenDolphin.jar"
61+
tsaurl="http://timestamp.digicert.com"
62+
keystore="/Users/oh/Develop/Dolphin/Develop/digiCert/openDolphin-2014-life/OpenDolphin.jks"
63+
storepass="silk825"
64+
alias="server"/>
65+
</target>
66+
67+
<target name="move">
68+
<move file="${jarDir}/${dolphin}" tofile="${jnlpDir}/${dolphin}"/>
69+
</target>
70+
71+
<target name="copy2">
72+
<copy file="${jnlpDir}/${dolphin}" tofile="${jnlpDir}/${dolphinpro}"/>
73+
</target>
74+
75+
<target name="all" depends="clean,copy,unjar,clean2,jar,sign,move,copy2">
76+
<echo message="Creating..." />
77+
<bundleapp outputdirectory="${modulesDir}/dolphin"
78+
name="OpenDolphinPro"
79+
displayname="OpenDolphinPro-1.5.12"
80+
identifier="jp.co.lscc.openDolphin"
81+
shortversion="1.5.12"
82+
icon="${icns}"
83+
applicationCategory="public.app-category.medical"
84+
mainclassname="open/dolphin/client/Dolphin">
85+
<runtime dir="${env.JAVA_HOME}"/>
86+
<classpath file="${modulesDir}/dolphin/${dolphinpro}"/>
87+
<option value="-Dapple.laf.useScreenMenuBar=true"/>
88+
<option value="-Dcom.apple.macos.smallTabs=true"/>
89+
<option value="-Dfile.encoding=UTF8"/>
90+
<option value="-Xms512m"/>
91+
<option value="-Xmx1024m"/>
92+
<argument value="pro"/>
93+
</bundleapp>
94+
</target>
95+
96+
</project>

‎client/nbactions.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<goal>org.codehaus.mojo:exec-maven-plugin:1.2:exec</goal>
88
</goals>
99
<properties>
10-
<exec.args>-Dfile.encoding=UTF8 -classpath %classpath open.dolphin.client.Dolphin pro</exec.args>
10+
<exec.args>-Dfile.encoding=UTF8 -classpath %classpath open.dolphin.client.Dolphin</exec.args>
1111
<exec.executable>java</exec.executable>
1212
<exec.classpathScope>runtime</exec.classpathScope>
1313
</properties>
@@ -19,7 +19,7 @@
1919
<goal>org.codehaus.mojo:exec-maven-plugin:1.2:exec</goal>
2020
</goals>
2121
<properties>
22-
<exec.args>-Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -Dfile.encoding=UTF8 -classpath %classpath open.dolphin.client.Dolphin pro</exec.args>
22+
<exec.args>-Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -Dfile.encoding=UTF8 -classpath %classpath open.dolphin.client.Dolphin</exec.args>
2323
<exec.executable>java</exec.executable>
2424
<exec.classpathScope>runtime</exec.classpathScope>
2525
<jpda.listen>true</jpda.listen>
@@ -32,7 +32,7 @@
3232
<goal>org.codehaus.mojo:exec-maven-plugin:1.2:exec</goal>
3333
</goals>
3434
<properties>
35-
<exec.args>${profiler.args} -Dfile.encoding=UTF8 -classpath %classpath open.dolphin.client.Dolphin pro</exec.args>
35+
<exec.args>-Dfile.encoding=UTF8 -classpath %classpath open.dolphin.client.Dolphin</exec.args>
3636
<exec.executable>${profiler.java}</exec.executable>
3737
<profiler.action>profile</profiler.action>
3838
</properties>

‎client/pom.xml‎

Lines changed: 17 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@
2222
<dependency>
2323
<groupId>javax.persistence</groupId>
2424
<artifactId>persistence-api</artifactId>
25-
<version>1.0</version>
25+
<version>1.0.2</version>
2626
</dependency>
2727
<dependency>
2828
<groupId>log4j</groupId>
2929
<artifactId>log4j</artifactId>
30-
<version>1.2.16</version>
30+
<version>1.2.17</version>
3131
</dependency>
3232
<dependency>
3333
<groupId>org.jdom</groupId>
3434
<artifactId>jdom</artifactId>
35-
<version>1.1</version>
35+
<version>1.1.3</version>
3636
</dependency>
3737
<dependency>
3838
<groupId>postgresql</groupId>
@@ -42,12 +42,12 @@
4242
<dependency>
4343
<groupId>commons-codec</groupId>
4444
<artifactId>commons-codec</artifactId>
45-
<version>1.5</version>
45+
<version>1.10</version>
4646
</dependency>
4747
<dependency>
4848
<groupId>javax.mail</groupId>
4949
<artifactId>mail</artifactId>
50-
<version>1.4.4</version>
50+
<version>1.4.7</version>
5151
</dependency>
5252
<dependency>
5353
<groupId>org.apache.velocity</groupId>
@@ -67,7 +67,7 @@
6767
<dependency>
6868
<groupId>jfree</groupId>
6969
<artifactId>jcommon</artifactId>
70-
<version>1.0.15</version>
70+
<version>1.0.16</version>
7171
</dependency>
7272
<dependency>
7373
<groupId>org.swinglabs</groupId>
@@ -77,29 +77,18 @@
7777
<dependency>
7878
<groupId>org.jboss.resteasy</groupId>
7979
<artifactId>resteasy-jaxrs</artifactId>
80-
<version>2.3.1.GA</version>
80+
<version>3.0.10.Final</version>
8181
</dependency>
8282
<dependency>
8383
<groupId>org.jboss.resteasy</groupId>
8484
<artifactId>resteasy-jackson-provider</artifactId>
85-
<version>2.3.1.GA</version>
85+
<version>3.0.10.Final</version>
8686
</dependency>
87-
<!-- Async Http Client
88-
<dependency>
89-
<groupId>com.ning</groupId>
90-
<artifactId>async-http-client</artifactId>
91-
<version>1.7.5</version>
92-
</dependency>
93-
-->
94-
<dependency>
95-
<groupId>org.apache.httpcomponents</groupId>
96-
<artifactId>httpasyncclient</artifactId>
97-
<version>4.0-beta3</version>
98-
</dependency>
9987
<dependency>
100-
<groupId>org.apache.httpcomponents</groupId>
101-
<artifactId>httpclient</artifactId>
102-
<version>4.2.1</version>
88+
<groupId>org.jboss.resteasy</groupId>
89+
<artifactId>resteasy-client</artifactId>
90+
<version>3.0.8.Final</version>
91+
<type>jar</type>
10392
</dependency>
10493
<dependency>
10594
<groupId>com.lowagie</groupId>
@@ -125,7 +114,7 @@
125114
<plugin>
126115
<groupId>org.apache.maven.plugins</groupId>
127116
<artifactId>maven-jar-plugin</artifactId>
128-
<version>2.3.2</version>
117+
<version>2.5</version>
129118
<configuration>
130119
<archive>
131120
<manifest>
@@ -155,12 +144,12 @@
155144
<plugin>
156145
<groupId>org.apache.maven.plugins</groupId>
157146
<artifactId>maven-compiler-plugin</artifactId>
158-
<version>2.3.2</version>
147+
<version>3.2</version>
159148
<configuration>
160149
<showDeprecation>true</showDeprecation>
161150
<debug>true</debug>
162-
<source>1.7</source>
163-
<target>1.7</target>
151+
<source>1.8</source>
152+
<target>1.8</target>
164153
</configuration>
165154
</plugin>
166155
</plugins>
@@ -178,5 +167,5 @@
178167
</resource>
179168
</resources>
180169
</build>
181-
<version>2.5.12</version>
170+
<version>2.7.0</version>
182171
</project>

‎client/src/main/java/open/dolphin/client/AboutDolphin.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
*/
1919
public final class AboutDolphin {
2020

21-
private final UserModel user;
22-
private final String[] copyrights;
21+
private UserModel user;
22+
private String[] copyrights;
2323
private JDialog dialog;
2424

2525
public AboutDolphin() {

0 commit comments

Comments
 (0)