• Views
  • Iteration Report
  • My Iteration Report
  •  
OMERO.server
  • Login
  • Help/Guide
  • About Trac
  • Preferences
  • Wiki
  • Timeline
  • Roadmap
  • Browse Source
  • View Tickets
  • Search

Context Navigation

  • ← Previous Changeset
  • Next Changeset →

Changeset 718

Show
Ignore:
Timestamp:
06/16/06 20:25:20 (2 years ago)
Author:
jmoore
Message:

More renamings for #39. Also:

  • Added empty methods to AdminBean from #44
  • Fixed README.txt from #65 (r689)
  • Updated all poms and ran mvn install (new classpaths)

Location:
branches/ticket-39-rename
Files:
1 removed
18 modified

  • README.txt (modified) (1 diff)
  • components/antlib/resources/global.xml (modified) (2 diffs)
  • components/antlib/resources/macros.xml (modified) (1 diff)
  • components/antlib/resources/release.xml (modified) (2 diffs)
  • components/app/classpath.xml (modified) (2 diffs)
  • components/app/pom.xml (modified) (1 diff)
  • components/client/classpath.xml (modified) (2 diffs)
  • components/client/pom.xml (modified) (1 diff)
  • components/ejb/classpath.xml (modified) (2 diffs)
  • components/ejb/pom.xml (modified) (1 diff)
  • components/ejb/src/ome/ro/ejb/AdminBean.java (modified) (2 diffs)
  • components/ejb/test/integration.testng.xml (modified) (1 diff)
  • components/ice/pom.xml (modified) (1 diff)
  • components/policy/pom.xml (modified) (1 diff)
  • components/romio/.project (modified) (1 diff)
  • components/romio/classpath.xml (modified) (2 diffs)
  • components/romio/pom.xml (modified) (1 diff)
  • components/sandbox (deleted)
  • pom.xml (modified) (1 diff)

Legend:

Unmodified
Added
Removed

  • branches/ticket-39-rename/README.txt

    r651 r718  
    3939        build dependencies 
    4040 
    41  omero.properties: 
    42         property values for the build (global) 
    43  
    44  hibernate.properties: 
    45         property values specifically for Hibernate  
    46  
    47  log4j.properties: 
    48         logging configuration for all components 
     41 etc: 
     42        Configuration directory 
    4943 
    5044 docs: 

  • branches/ticket-39-rename/components/antlib/resources/global.xml

    r692 r718  
    228228                <antRun component="common"><target name="install"/></antRun> 
    229229                <antRun component="client"><target name="install"/></antRun> 
    230                 <antRun component="shoola-adapter"><target name="install"/></antRun> 
    231230        </target> 
    232231 
    233232        <target name="build-server" depends="check-system,model"> 
    234233                <antRun component="common"><target name="install"/></antRun> 
    235                 <antRun component="omeio-nio"><target name="install"/></antRun> 
     234                <antRun component="romio"><target name="install"/></antRun> 
    236235                <antRun component="rendering"><target name="install"/></antRun> 
    237236                <antRun component="server"><target name="install"/></antRun> 
    … …  
    239238 
    240239        <target name="deploy" depends="check-system,build-server"> 
    241                 <antRun component="omero-ejb"><target name="install"/></antRun> 
    242                 <antRun component="omero-app"> 
     240                <antRun component="ejb"><target name="install"/></antRun> 
     241                <antRun component="app"> 
    243242                        <target name="package"/> 
    244243                        <target name="deploy-ear-jboss"/> 

  • branches/ticket-39-rename/components/antlib/resources/macros.xml

    r717 r718  
    6565                <antRun component="app"       file="@{file}" inheritAll="@{inheritAll}" inheritRefs="@{inheritRefs}"><elem/> </antRun> 
    6666                <antRun component="client"    file="@{file}" inheritAll="@{inheritAll}" inheritRefs="@{inheritRefs}"><elem/> </antRun> 
    67                 <antRun component="shoola-adapter" file="@{file}" inheritAll="@{inheritAll}" inheritRefs="@{inheritRefs}"><elem/> </antRun> 
    6867                </sequential> 
    6968        </macrodef> 

  • branches/ticket-39-rename/components/antlib/resources/release.xml

    r637 r718  
    9393                        <patternset refid="all.java.files"/> 
    9494                </fileset> 
    95                 <fileset dir="components/omeio-nio/" defaultexcludes="yes"> 
     95                <fileset dir="components/romio/" defaultexcludes="yes"> 
    9696                        <patternset refid="all.java.files"/> 
    9797                </fileset> 
    … …  
    100100                </fileset> 
    101101                <fileset dir="components/client/" defaultexcludes="yes"> 
    102                         <patternset refid="all.java.files"/> 
    103                 </fileset> 
    104                 <fileset dir="components/shoola-adapter/" defaultexcludes="yes"> 
    105102                        <patternset refid="all.java.files"/> 
    106103                </fileset> 

  • branches/ticket-39-rename/components/app/classpath.xml

    r676 r718  
    11<!--  
    22 
    3 Code-generated ant classpath for omero-app component 
     3Code-generated ant classpath for app component 
    44====================================================== 
    55This file is generated by antClasspath.groovy under  
    … …  
    1414 
    1515--> 
    16 <project name="omero-app_classpath" default="classpath-generate" basedir="."> 
     16<project name="app_classpath" default="classpath-generate" basedir="."> 
    1717 
    1818  <dirname property="up-one" file="${basedir}"/> 
    1919  <import file="${up-one}/antlib/resources/global.xml"/> 
    2020 
    21   <property name="artifact.name" value="omero-app"/> 
     21  <property name="artifact.name" value="app"/> 
    2222  <property name="artifact.group" value="omero"/> 
    2323  <property name="artifact.version" value="3.0-TRUNK"/> 
    2424  <property name="artifact.packaging" value="jar"/><!-- Default; override in component/build.xml --> 
    25   <property name="artifact.final.name" value="omero-app-3.0-TRUNK.${artifact.packaging}"/> 
    26   <property name="artifact.path" value="omero/omero-app/3.0-TRUNK/${artifact.final.name}"/> 
     25  <property name="artifact.final.name" value="app-3.0-TRUNK.${artifact.packaging}"/> 
     26  <property name="artifact.path" value="omero/app/3.0-TRUNK/${artifact.final.name}"/> 
    2727 
    2828  <filelist id="generated.compile.filelist" dir="${omero.repo.local}"> 

  • branches/ticket-39-rename/components/app/pom.xml

    r637 r718  
    99  <modelVersion>4.0.0</modelVersion> 
    1010  <name>Ome Remote Objects - EJB3 Deployment</name> 
    11   <artifactId>omero-app</artifactId> 
     11  <artifactId>app</artifactId> 
    1212  <packaging>pom</packaging> 
    1313  <dependencies> 

  • branches/ticket-39-rename/components/client/classpath.xml

    r676 r718  
    11<!--  
    22 
    3 Code-generated ant classpath for omero-client component 
     3Code-generated ant classpath for client component 
    44====================================================== 
    55This file is generated by antClasspath.groovy under  
    … …  
    1414 
    1515--> 
    16 <project name="omero-client_classpath" default="classpath-generate" basedir="."> 
     16<project name="client_classpath" default="classpath-generate" basedir="."> 
    1717 
    1818  <dirname property="up-one" file="${basedir}"/> 
    1919  <import file="${up-one}/antlib/resources/global.xml"/> 
    2020 
    21   <property name="artifact.name" value="omero-client"/> 
     21  <property name="artifact.name" value="client"/> 
    2222  <property name="artifact.group" value="omero"/> 
    2323  <property name="artifact.version" value="3.0-TRUNK"/> 
    2424  <property name="artifact.packaging" value="jar"/><!-- Default; override in component/build.xml --> 
    25   <property name="artifact.final.name" value="omero-client-3.0-TRUNK.${artifact.packaging}"/> 
    26   <property name="artifact.path" value="omero/omero-client/3.0-TRUNK/${artifact.final.name}"/> 
     25  <property name="artifact.final.name" value="client-3.0-TRUNK.${artifact.packaging}"/> 
     26  <property name="artifact.path" value="omero/client/3.0-TRUNK/${artifact.final.name}"/> 
    2727 
    2828  <filelist id="generated.compile.filelist" dir="${omero.repo.local}"> 

  • branches/ticket-39-rename/components/client/pom.xml

    r676 r718  
    99  </parent> 
    1010  <name>Ome Client Library</name> 
    11   <artifactId>omero-client</artifactId> 
     11  <artifactId>client</artifactId> 
    1212  <packaging>pom</packaging> 
    1313  <dependencies> 

  • branches/ticket-39-rename/components/ejb/classpath.xml

    r676 r718  
    11<!--  
    22 
    3 Code-generated ant classpath for omero-ejb component 
     3Code-generated ant classpath for ejb component 
    44====================================================== 
    55This file is generated by antClasspath.groovy under  
    … …  
    1414 
    1515--> 
    16 <project name="omero-ejb_classpath" default="classpath-generate" basedir="."> 
     16<project name="ejb_classpath" default="classpath-generate" basedir="."> 
    1717 
    1818  <dirname property="up-one" file="${basedir}"/> 
    1919  <import file="${up-one}/antlib/resources/global.xml"/> 
    2020 
    21   <property name="artifact.name" value="omero-ejb"/> 
     21  <property name="artifact.name" value="ejb"/> 
    2222  <property name="artifact.group" value="omero"/> 
    2323  <property name="artifact.version" value="3.0-TRUNK"/> 
    2424  <property name="artifact.packaging" value="jar"/><!-- Default; override in component/build.xml --> 
    25   <property name="artifact.final.name" value="omero-ejb-3.0-TRUNK.${artifact.packaging}"/> 
    26   <property name="artifact.path" value="omero/omero-ejb/3.0-TRUNK/${artifact.final.name}"/> 
     25  <property name="artifact.final.name" value="ejb-3.0-TRUNK.${artifact.packaging}"/> 
     26  <property name="artifact.path" value="omero/ejb/3.0-TRUNK/${artifact.final.name}"/> 
    2727 
    2828  <filelist id="generated.compile.filelist" dir="${omero.repo.local}"> 

  • branches/ticket-39-rename/components/ejb/pom.xml

    r676 r718  
    1010  </parent> 
    1111  <name>Ome Remote Objects - EJB3</name> 
    12   <artifactId>omero-ejb</artifactId> 
     12  <artifactId>ejb</artifactId> 
    1313  <packaging>pom</packaging> 
    1414  <dependencies> 

  • branches/ticket-39-rename/components/ejb/src/ome/ro/ejb/AdminBean.java

    r704 r718  
    4343//Application-internal dependencies 
    4444import ome.api.IAdmin; 
     45import ome.model.IObject; 
     46import ome.model.internal.Permissions; 
     47import ome.model.meta.Experimenter; 
     48import ome.model.meta.ExperimenterGroup; 
    4549 
    4650@Stateless 
    … …  
    7680    } 
    7781 
     82    public Experimenter getExperimenter(Long arg0) 
     83    { 
     84        // TODO Auto-generated method stub 
     85        return null; 
     86         
     87    } 
     88 
     89    public Experimenter lookupExperimenter(String arg0) 
     90    { 
     91        // TODO Auto-generated method stub 
     92        return null; 
     93         
     94    } 
     95 
     96    public ExperimenterGroup getGroup(Long arg0) 
     97    { 
     98        // TODO Auto-generated method stub 
     99        return null; 
     100         
     101    } 
     102 
     103    public ExperimenterGroup lookupGroup(String arg0) 
     104    { 
     105        // TODO Auto-generated method stub 
     106        return null; 
     107         
     108    } 
     109 
     110    public Experimenter[] containedExperimenters(Long arg0) 
     111    { 
     112        // TODO Auto-generated method stub 
     113        return null; 
     114         
     115    } 
     116 
     117    public ExperimenterGroup[] containedGroups(Long arg0) 
     118    { 
     119        // TODO Auto-generated method stub 
     120        return null; 
     121         
     122    } 
     123 
     124    public Experimenter createUser(Experimenter arg0) 
     125    { 
     126        // TODO Auto-generated method stub 
     127        return null; 
     128         
     129    } 
     130 
     131    public Experimenter createSystemUser(Experimenter arg0) 
     132    { 
     133        // TODO Auto-generated method stub 
     134        return null; 
     135         
     136    } 
     137 
     138    public Experimenter createExperimenter(Experimenter arg0, ExperimenterGroup arg1, ExperimenterGroup[] arg2) 
     139    { 
     140        // TODO Auto-generated method stub 
     141        return null; 
     142         
     143    } 
     144 
     145    public ExperimenterGroup createGroup(ExperimenterGroup arg0) 
     146    { 
     147        // TODO Auto-generated method stub 
     148        return null; 
     149         
     150    } 
     151 
     152    public void addGroups(Experimenter arg0, ExperimenterGroup[] arg1) 
     153    { 
     154        // TODO Auto-generated method stub 
     155         
     156    } 
     157 
     158    public void removeGroups(Experimenter arg0, ExperimenterGroup[] arg1) 
     159    { 
     160        // TODO Auto-generated method stub 
     161         
     162    } 
     163 
     164    public void setDefaultGroup(Experimenter arg0, ExperimenterGroup arg1) 
     165    { 
     166        // TODO Auto-generated method stub 
     167         
     168    } 
     169 
     170    public void changeOwner(IObject arg0, String arg1) 
     171    { 
     172        // TODO Auto-generated method stub 
     173         
     174    } 
     175 
     176    public void changeGroup(IObject arg0, String arg1) 
     177    { 
     178        // TODO Auto-generated method stub 
     179         
     180    } 
     181 
     182    public void changePermissions(IObject arg0, Permissions arg1) 
     183    { 
     184        // TODO Auto-generated method stub 
     185         
     186    } 
     187 
     188    public void changePassword(String arg0) 
     189    { 
     190        // TODO Auto-generated method stub 
     191         
     192    } 
     193 
     194    public void changeUserPassword(String arg0, String arg1) 
     195    { 
     196        // TODO Auto-generated method stub 
     197         
     198    } 
     199 
    78200 
    79201} 

  • branches/ticket-39-rename/components/ejb/test/integration.testng.xml

    r693 r718  
    11<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > 
    22   
    3 <suite name="omero-ejb.integration" > 
     3<suite name="ejb.integration" > 
    44   
    5   <test name="omer-ejb.integration.active"> 
     5  <test name="ejb.integration.active"> 
    66    <groups> 
    77      <run> 

  • branches/ticket-39-rename/components/ice/pom.xml

    r637 r718  
    88  </parent> 
    99  <modelVersion>4.0.0</modelVersion> 
    10   <artifactId>omero-ice</artifactId> 
     10  <artifactId>ice</artifactId> 
    1111  <packaging>pom</packaging> 
    1212  <name>Ome Remote Objects - ICE</name> 

  • branches/ticket-39-rename/components/policy/pom.xml

    r637 r718  
    88  </parent> 
    99  <modelVersion>4.0.0</modelVersion> 
    10   <artifactId>omero-policy</artifactId> 
     10  <artifactId>policy</artifactId> 
    1111  <packaging>pom</packaging> 
    1212  <name>Omero Coding Policy - Enforced by AspectJ</name> 

  • branches/ticket-39-rename/components/romio/.project

    r638 r718  
    11<projectDescription> 
    2   <name>omeio-nio-3.0-TRUNK</name> 
     2  <name>omero-romio-3.0-TRUNK</name> 
    33  <comment/> 
    44  <projects/> 

  • branches/ticket-39-rename/components/romio/classpath.xml

    r639 r718  
    11<!--  
    22 
    3 Code-generated ant classpath for omeio-nio component 
     3Code-generated ant classpath for romio component 
    44====================================================== 
    55This file is generated by antClasspath.groovy under  
    … …  
    1414 
    1515--> 
    16 <project name="omeio-nio_classpath" default="classpath-generate" basedir="."> 
     16<project name="romio_classpath" default="classpath-generate" basedir="."> 
    1717 
    1818  <dirname property="up-one" file="${basedir}"/> 
    1919  <import file="${up-one}/antlib/resources/global.xml"/> 
    2020 
    21   <property name="artifact.name" value="omeio-nio"/> 
     21  <property name="artifact.name" value="romio"/> 
    2222  <property name="artifact.group" value="omero"/> 
    2323  <property name="artifact.version" value="3.0-TRUNK"/> 
    2424  <property name="artifact.packaging" value="jar"/><!-- Default; override in component/build.xml --> 
    25   <property name="artifact.final.name" value="omeio-nio-3.0-TRUNK.${artifact.packaging}"/> 
    26   <property name="artifact.path" value="omero/omeio-nio/3.0-TRUNK/${artifact.final.name}"/> 
     25  <property name="artifact.final.name" value="romio-3.0-TRUNK.${artifact.packaging}"/> 
     26  <property name="artifact.path" value="omero/romio/3.0-TRUNK/${artifact.final.name}"/> 
    2727 
    2828  <filelist id="generated.compile.filelist" dir="${omero.repo.local}"> 

  • branches/ticket-39-rename/components/romio/pom.xml

    r637 r718  
    88  </parent> 
    99  <modelVersion>4.0.0</modelVersion> 
    10   <artifactId>omeio-nio</artifactId> 
     10  <artifactId>romio</artifactId> 
    1111  <packaging>pom</packaging> 
    1212  <name>Omero IO Library - NIO</name> 

  • branches/ticket-39-rename/pom.xml

    r639 r718  
    6060    <module>components/dsl</module> 
    6161    <module>components/common</module> 
    62 <!--<module>components/omeio-bdb</module>--> 
    63     <module>components/omeio-nio</module> 
    64 <!--<module>components/sandbox</module> 
    65     <module>components/omero-ice</module>--> 
     62    <module>components/romio</module> 
    6663    <module>components/rendering</module> 
    6764    <module>components/server</module> 
    68     <module>components/omero-ejb</module> 
    69     <module>components/omero-app</module> 
     65    <module>components/ejb</module> 
     66    <module>components/app</module> 
    7067    <module>components/client</module> 
    71     <module>components/shoola-adapter</module> 
     68    <!--module>components/ice</module--> 
    7269  </modules> 
    7370  <repositories> 

Download in other formats:

  • Unified Diff
  • Zip Archive
Trac Powered

Powered by Trac 0.11
By Edgewall Software.

Visit the Trac open source project at
http://trac.edgewall.org/