Changeset 4691
- Timestamp:
- 12/15/06 16:57:15 (2 years ago)
- Location:
- trunk
- Files:
-
- 2 removed
- 8 modified
- 4 moved
-
CodeTemplate (modified) (1 diff)
-
README (modified) (7 diffs)
-
build/app.xml (modified) (1 diff)
-
build/build.xml (modified) (2 diffs)
-
build/dist.xml (modified) (5 diffs)
-
launch/INSTALL.txt (modified) (3 diffs)
-
launch/OMEROClient_macosx.sh (moved) (moved from trunk/launch/shoola_macosx.sh)
-
launch/OMEROClient_unix.sh (moved) (moved from trunk/launch/shoola_unix.sh)
-
launch/OMEROClient_windows.bat (moved) (moved from trunk/launch/shoola_windows.bat)
-
launch/osx/INSTALL (modified) (2 diffs)
-
launch/osx/omeroclient.icns (moved) (moved from trunk/launch/osx/shoola.icns)
-
legal/README (modified) (3 diffs)
-
legal/lgpl.txt (deleted)
-
shoola_Changelogs.txt (deleted)
Legend:
- Unmodified
- Added
- Removed
-
trunk/CodeTemplate
r3432 r4691 3 3 * 4 4 *------------------------------------------------------------------------------ 5 * 6 * Copyright (C) 2004 Open Microscopy Environment 7 * Massachusetts Institute of Technology, 8 * National Institutes of Health, 9 * University of Dundee 5 * Copyright (C) 2006 University of Dundee. All rights reserved. 10 6 * 11 7 * 12 * 13 * This library is free software; you can redistribute it and/or 14 * modify it under the terms of the GNU Lesser General Public 15 * License as published by the Free Software Foundation; either 16 * version 2.1 of the License, or (at your option) any later version. 17 * 18 * This library is distributed in the hope that it will be useful, 19 * but WITHOUT ANY WARRANTY; without even the implied warranty of 20 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 21 * Lesser General Public License for more details. 22 * 23 * You should have received a copy of the GNU Lesser General Public 24 * License along with this library; if not, write to the Free Software 25 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 8 * This program is free software; you can redistribute it and/or modify 9 * it under the terms of the GNU General Public License as published by 10 * the Free Software Foundation; either version 2 of the License, or 11 * (at your option) any later version. 12 * This program is distributed in the hope that it will be useful, 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * GNU General Public License for more details. 16 * 17 * You should have received a copy of the GNU General Public License along 18 * with this program; if not, write to the Free Software Foundation, Inc., 19 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 26 20 * 27 21 *------------------------------------------------------------------------------ -
trunk/README
r4663 r4691 6 6 OPEN MICROSCOPY ENVIRONMENT (OME) 7 7 8 S H O O L A8 OMEROClient 9 9 10 10 … … 14 14 15 15 16 OME -ShoolaProject16 OMEROClient Project 17 17 ------------------ 18 18 19 The OME -ShoolaProject is a sub-project of the Open Microscopy Environment19 The OMEROClient Project is a sub-project of the Open Microscopy Environment 20 20 Project (OME, http://www.openmicroscopy.org/) that focuses on delivering a 21 21 client for the visualization and manipulation of both image data and metadata 22 maintained at an OME server site. Shoolais completely written in Java.22 maintained at an OME server site. OMEROClient is completely written in Java. 23 23 24 24 … … 27 27 ------------------ 28 28 29 This directory is the repository of the software artifacts of the OME -Shoola29 This directory is the repository of the software artifacts of the OMEROClient 30 30 Project. Its contents are as follows: 31 31 … … 35 35 + docgen: Documentation artifacts that are used to build actual documents. 36 36 These are organized in two sub-directories: javadoc and xdocs. The 37 former only contains resources (like CSS files) to generate37 former only contains resources (like CSS files) to generate 38 38 programmer's documentation (JavaDoc) -- the actual documentation 39 39 contents are obtained from the source code. The latter contains both … … 57 57 58 58 59 Building Shoola60 --------------- 59 Building OMEROClient 60 ------------------- 61 61 62 62 The compilation, testing, launch, and delivery of the application are … … 82 82 --------- 83 83 84 This software is licensed under the terms of the GNU LesserGeneral Public85 License ( LGPL), a copy of which may be found in the lgpl.txt file under the84 This software is licensed under the terms of the GNU General Public 85 License (GPL), a copy of which may be found in the gpl.txt file under the 86 86 'legal' directory. The README file in that directory states which other 87 87 licenses apply to third-party artifacts used by our software. … … 92 92 --------- 93 93 94 Copyright (C) 2003-2006 Open Microscopy Environment 95 Massachusetts Institute of Technology, 96 National Institutes of Health, 97 University of Dundee 94 Copyright (C) 2006 University of Dundee. All rights reserved. 98 95 99 96 -
trunk/build/app.xml
r3492 r4691 118 118 depends="compile" 119 119 description="Run the app in its own JVM."> 120 <echo message="Launching Shoola..."/>120 <echo message="Launching OMEROClient..."/> 121 121 <java classname="${app.mainclass}" 122 122 classpathref="app.run.classpath" -
trunk/build/build.xml
r2468 r4691 2 2 3 3 <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 4 * Master build file for the OME -Shoolajava client.4 * Master build file for the OMEROClient java client. 5 5 * You can use this file to compile, run, test, and package the application 6 6 * for distribution. Furthermore, you can generate all other project artifacts, … … 44 44 * not) and are listed by the usage target. 45 45 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> 46 <project name="OME -Shoola" default="usage" basedir="../">46 <project name="OMEROClient" default="usage" basedir="../"> 47 47 48 <description>The OME -ShoolaJava Client Project.</description>48 <description>The OMEROClient Java Client Project.</description> 49 49 50 50 <!-- The build directory. Every target outputs below this directory. --> -
trunk/build/dist.xml
r4270 r4691 3 3 <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 4 4 * Child build file to create the app deliverables. 5 * This file is only meant to be used as an imported file within the Shoola5 * This file is only meant to be used as an imported file within the OMEROClient 6 6 * master build file. 7 7 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> … … 53 53 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> 54 54 <property name="dist.dir" location="${build.dir}/dist"/> 55 <property name="dist.jar.file" value=" shoola.jar"/>56 <property name="dist.bundle.name" value="omero -shoola"/>57 <property name="dist.bundle.version" value="3-M3_ 30-10-06"/>55 <property name="dist.jar.file" value="omeroclient.jar"/> 56 <property name="dist.bundle.name" value="omeroclient"/> 57 <property name="dist.bundle.version" value="3-M3_Beta_15-12-06"/> 58 58 <fileset id="dist.launch.scripts" dir="${base.launch.dir}"> 59 59 <include name="*.sh"/> … … 65 65 <basename property="dist.app.config.dir.name" file="${app.config.dir}"/> 66 66 <property name="dist.osx.icon" 67 location="${base.launch.dir}/osx/ shoola.icns"/>67 location="${base.launch.dir}/osx/omeroclient.icns"/> 68 68 <property name="dist.osx.stub" 69 69 location="${base.launch.dir}/osx/JavaApplicationStub"/> … … 105 105 <fileset dir="${app.compiled.dir}"/> 106 106 <manifest> 107 <attribute name="Created-By" value="OME Development Team"/>107 <attribute name="Created-By" value="OMERO Development Team"/> 108 108 <attribute name="Class-Path" value="${dist.jar.manifest.cp}"/> 109 109 <attribute name="Main-Class" value="${app.mainclass}"/> … … 155 155 description="Build and package the app for OS X distribution."> 156 156 <jarbundler dir="${dist.dir}" 157 name=" Shoola"157 name="OMEROClient" 158 158 mainclass="${app.mainclass}" 159 159 version="${dist.bundle.version}" 160 infostring="OMERO -ShoolaJava Client, ${dist.bundle.version}"161 aboutmenuname="OMERO -ShoolaJava Client"160 infostring="OMEROClient Java Client, ${dist.bundle.version}" 161 aboutmenuname="OMEROClient Java Client" 162 162 screenmenu="true" 163 163 icon="${dist.osx.icon}" -
trunk/launch/INSTALL.txt
r3567 r4691 8 8 The client software requires a J2SE Java Runtime Environment (JRE) to 9 9 run (version 1.5). Note that the client doesn't use features of Java 1.5. 10 If you don't have one already, you can 11 download the J2SE JRE install bundlefrom:10 If you don't have one already, you can download the J2SE JRE install bundle 11 from: 12 12 13 13 http://java.sun.com/j2se/downloads/ … … 31 31 * This install file. 32 32 33 Locate the "container.xml" file within the "config" directory and edit this34 file to specify the URL to the OMERO Data Server (OMERODS). All you have to35 do is to modify the content of the url tag within the following entry:36 37 <structuredEntry name="/services/OMERODS" type="OMERODS">38 <hostName>valewalker.openmicroscopy.org.uk</hostName>39 <port>1099</port>40 </structuredEntry>41 42 You have to replace "valewalker.openmicroscopy.org.uk" with43 the actual OMERODS URL in use at your site.44 33 45 34 If you're running on Unix or Mac OS X, make sure the provided startup script … … 50 39 Running The Software 51 40 52 Double-click on the startup script (for example "shoola_windows.bat") file 53 within the installation directory. A splash screen will pop up. Enter your 54 OME user name and password, then press the log in button. Enjoy OME! 41 Double-click on the startup script (for example "OMEROClient_windows.bat") 42 file within the installation directory. A splash screen will pop up. 43 Enter your OMERO user name, password and the name of the server then press 44 the log in button. Enjoy OMERO! 55 45 56 46 -
trunk/launch/osx/INSTALL
r2166 r4691 10 10 11 11 * A "config" directory. 12 * The " Shoola" application.12 * The "OMERO Client" application. 13 13 * A "LICENSE" file. 14 14 * This install file. 15 16 Locate the "container.xml" file within the "config" directory and edit this17 file to specify the URL to the OME Data Server (OMEDS). All you have to do18 is to modify the content of the url tag within the following entry:19 20 <structuredEntry name="/services/OMEDS" type = "OMEDS">21 <url>http://valewalker.openmicroscopy.org.uk/shoola</url>22 </structuredEntry>23 24 You have to replace "http://valewalker.openmicroscopy.org.uk/shoola" with25 the actual OMEDS URL in use at your site.26 15 27 16 … … 29 18 Running The Software 30 19 31 Double-click on the " Shoola" application icon within the installation32 directory. A splash screen will pop up. Enter your OME user name and33 password, then press the log in button. Enjoy OME!20 Double-click on the "OMERO Client" application icon within the installation 21 directory. A splash screen will pop up. Enter your OMERO user name, password 22 and the name of the server then press the log in button. Enjoy OMERO! 34 23 35 24 -
trunk/legal/README
r4663 r4691 6 6 OPEN MICROSCOPY ENVIRONMENT (OME) 7 7 8 S H O O L A8 OMEROClient 9 9 10 10 Legal … … 20 20 21 21 Within this document, the term 'third-party software' shall refer to the set 22 of all the files which are contained in the Shoola CVS module and which are 23 listed in each 'Artifacts' entry within the 'Third-Party Software Licenses' 24 section of this document. The term 'Shoola' or, equivalently, 'our software' 25 shall refer to any other file contained in the Shoola CVS module. 22 of all the files which are contained in the OMERO Client SVN module and which 23 are listed in each 'Artifacts' entry within the 24 'Third-Party Software Licenses' section of this document. 25 The term 'OMEROClient' or, equivalently, 'our software' 26 shall refer to any other file contained in the OMEROClient SVN module. 26 27 27 28 … … 30 31 ------- 31 32 32 This document states which licenses apply to which files in the Shoola CVS33 module. It also gives credit to other projects and developers that provided34 us with their valuable software.33 This document states which licenses apply to which files in the OMEROClient 34 SVN module. It also gives credit to other projects and developers that 35 provided us with their valuable software. 35 36 36 37 37 38 38 OME -ShoolaLicense39 OMEROClient License 39 40 ------------------ 40 41 41 Our software is licensed under the terms of the LesserGeneral Public License42 ( LGPL), a copy of which may be found in the 'lgpl.txt' file within this42 Our software is licensed under the terms of the GNU General Public License 43 (GPL), a copy of which may be found in the 'gpl.txt' file within this 43 44 directory. 44 45
