• 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 1670

Show
Ignore:
Timestamp:
06/24/07 14:35:00 (18 months ago)
Author:
jmoore
Message:

[MERGING] source:branches/3.0-Beta2@1669 --> source:trunk (#740)

Location:
trunk/components/server/resources/ome/services
Files:
6 modified

  • security.xml (modified) (1 diff)
  • service-ome.api.IThumb.xml (modified) (1 diff)
  • service-ome.api.JobHandle.xml (modified) (1 diff)
  • service-ome.api.RawFileStore.xml (modified) (1 diff)
  • service-ome.api.RawPixelsStore.xml (modified) (1 diff)
  • service-omeis.providers.re.RenderingEngine.xml (modified) (1 diff)

Legend:

Unmodified
Added
Removed
  • trunk/components/server/resources/ome/services/security.xml

    r1392 r1670  
    3232 
    3333  <bean id="securitySystem" class="ome.security.basic.BasicSecuritySystem"> 
    34     <constructor-arg> 
    35       <bean class="ome.tools.spring.InternalServiceFactory"/> 
    36         </constructor-arg> 
     34    <constructor-arg ref="internal:ome.api.local.LocalQuery"/> 
     35    <constructor-arg ref="internal:ome.api.local.LocalUpdate"/> 
     36    <constructor-arg ref="sessionManager"/> 
     37    <constructor-arg ref="roles"/> 
    3738  </bean> 
     39   
     40  <bean id="roles" class="ome.system.Roles"/> 
    3841 
    3942  <!-- Scope: private --> 
  • trunk/components/server/resources/ome/services/service-ome.api.IThumb.xml

    r1378 r1670  
    3131  </bean> 
    3232   
    33   <bean id="managed:ome.api.ThumbnailStore" parent="managedStatefulService"> 
     33  <bean id="managed:ome.api.ThumbnailStore" parent="managedStatefulService" singleton="false"> 
    3434    <property name="proxyInterfaces" value="ome.api.ThumbnailStore"/> 
    3535    <property name="target" ref="internal:ome.api.ThumbnailStore"/>     
  • trunk/components/server/resources/ome/services/service-ome.api.JobHandle.xml

    r1397 r1670  
    2828  </bean> 
    2929 
    30   <bean id="managed:ome.api.JobHandle" parent="managedStatefulService"> 
     30  <bean id="managed:ome.api.JobHandle" parent="managedStatefulService" singleton="false"> 
    3131    <property name="proxyInterfaces" value="ome.api.JobHandle"/> 
    3232    <property name="target" ref="internal:ome.api.JobHandle"/> 
  • trunk/components/server/resources/ome/services/service-ome.api.RawFileStore.xml

    r1378 r1670  
    2828  </bean> 
    2929 
    30   <bean id="managed:ome.api.RawFileStore" parent="managedStatefulService"> 
     30  <bean id="managed:ome.api.RawFileStore" parent="managedStatefulService" singleton="false"> 
    3131    <property name="proxyInterfaces" value="ome.api.RawFileStore"/> 
    3232    <property name="target" ref="internal:ome.api.RawFileStore"/> 
  • trunk/components/server/resources/ome/services/service-ome.api.RawPixelsStore.xml

    r1378 r1670  
    3434  </bean> 
    3535 
    36   <bean id="managed:ome.api.RawPixelsStore" parent="managedStatefulService"> 
     36  <bean id="managed:ome.api.RawPixelsStore" parent="managedStatefulService" singleton="false"> 
    3737    <property name="proxyInterfaces" value="ome.api.RawPixelsStore"/> 
    3838    <property name="target" ref="internal:ome.api.RawPixelsStore"/> 
  • trunk/components/server/resources/ome/services/service-omeis.providers.re.RenderingEngine.xml

    r1167 r1670  
    2828  </bean> 
    2929 
    30   <bean id="managed:omeis.providers.re.RenderingEngine" parent="managedStatefulService"> 
     30  <bean id="managed:omeis.providers.re.RenderingEngine" parent="managedStatefulService" singleton="false"> 
    3131    <property name="proxyInterfaces" value="omeis.providers.re.RenderingEngine"/> 
    3232    <property name="target" ref="internal:omeis.providers.re.RenderingEngine"/> 

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/