• 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 Change
  • Next Change →

Changeset 1644 for branches

Show
Ignore:
Timestamp:
06/18/07 15:44:35 (18 months ago)
Author:
jmoore
Message:

[MERGING] source:trunk r1642 --> source:branches/3.0-Beta2

Location:
branches/3.0-Beta2/components
Files:
5 modified
1 copied

  • blitz/resources/glacier2.config (modified) (1 diff)
  • blitz/resources/glacier2_example.config (copied) (copied from trunk/components/blitz/resources/glacier2_example.config)
  • blitz/resources/templates/combined.vm (modified) (1 diff)
  • server/build.xml (modified) (1 diff)
  • tools/licenses/build.xml (modified) (1 diff)
  • tools/make.xml (modified) (1 diff)

Legend:

Unmodified
Added
Removed

  • branches/3.0-Beta2/components/blitz/resources/glacier2.config

    r1266 r1644  
     1# 
     2#   $Id$ 
     3# 
     4#   Copyright 2007 Glencoe Software, Inc. All rights reserved. 
     5#   Use is subject to license terms supplied in LICENSE.txt 
     6# 
     7#   See the glacier2_example.config file for reference documentation 
     8# 
     9 
     10# 
     11# DO NOT CHANGE. Name to lookup on the blitz server. 
     12# 
    113Glacier2.InstanceName=OMEROGlacier2 
    214 
    315# 
    4 # We must set the stack size of new threads created by Glacier2. The 
    5 # default on Linux is typically in the 10MB range, which is way too 
    6 # high. 
     16# Host configurations. Only change the ip addresses, not the ports. 
     17#  If blitz and the router are colocated, only Client.Endpoints needs  
     18#  to be changed. 
    719# 
    8 # Since Glacier2 always uses thread-per-connection mode, we must use 
    9 # the property below to set the thread stack size. Internal Glacier2 
    10 # threads also use this property value. 
    11 # 
    12 Ice.ThreadPerConnection.StackSize=262144 
    13  
    14 # 
    15 # The client-visible endpoint of Glacier2. This should be an endpoint 
    16 # visible from the public Internet, and it should be secure. 
    17 #  
    1820Glacier2.Client.Endpoints=tcp -p 9998 -h 127.0.0.1 
    19  
    20 # 
    21 # The server-visible endpoint of Glacier2. This endpoint is only 
    22 # required if callbacks are needed (leave empty otherwise). This 
    23 # should be an endpoint on an internal network (like 192.168.x.x), or 
    24 # on the loopback, so that the server is not directly accessible from 
    25 # the Internet. 
    26 # 
    2721Glacier2.Server.Endpoints=tcp -h 127.0.0.1 
    28  
    29 #  
    30 # The configures the session manager. If no external session manager 
    31 # is used, sessions are only handled Glacier2 internally. 
    32 # 
    3322Glacier2.SessionManager=Manager:tcp -h 127.0.0.1 -p 9999 
    34  
    35 #  
    36 # For this demo, we use a dummy permissions verifier that is 
    37 # collocated with the session server process. This dummy permissions 
    38 # verifier allows any user-id / password combination. 
    39 #  
    4023Glacier2.PermissionsVerifier=Verifier:tcp -h 127.0.0.1 -p 9999 
    4124 
    4225# 
    43 # The timeout for inactive sessions. If any client session is inactive 
    44 # for longer than this value, the session expires and is removed. The 
    45 # unit is seconds. 
     26# Performance configurations.  
     27#   Especially useful is session timeout (effects license releases). 
    4628# 
    4729Glacier2.SessionTimeout=600 
    48  
    49 # 
    50 # Glacier can forward requests buffered or unbuffered. Unbuffered 
    51 # means a lower resource consumption, as buffering requires one 
    52 # additional thread per connected client or server. However, without 
    53 # buffering, messages cannot be batched and message overriding doesn't 
    54 # work either. Also, with unbuffered request forwarding, the caller 
    55 # thread blocks for twoway requests. 
    56 # 
    57 Glacier2.Client.Buffered=1 
    58 Glacier2.Server.Buffered=1 
    59  
    60 # 
    61 # These two lines instruct Glacier2 to forward contexts both for 
    62 # regular routing, as well as for callbacks (reverse routing). 
    63 # 
    64 Glacier2.Client.ForwardContext=1 
    65 Glacier2.Server.ForwardContext=1 
    66  
    67 # 
    68 # To prevent Glacier2 from being flooded with requests from or to one 
    69 # particular client, Glacier2 can be configured to sleep for a certain 
    70 # period after all current requests for this client have been 
    71 # forwarded. During this sleep period, new requests for the client are 
    72 # queued. These requests are then all sent once the sleep period is 
    73 # over. The unit is milliseconds. 
    74 # 
    75 Glacier2.Client.SleepTime=500 
    76 Glacier2.Server.SleepTime=500 
    77  
    78 # 
    79 # With the two settings below, Glacier2 can be instructed to always 
    80 # batch oneways, even if they are sent with a _fwd/o instead of a 
    81 # _fwd/O context. 
    82 # 
    83 Glacier2.Client.AlwaysBatch=0 
    84 Glacier2.Server.AlwaysBatch=0 
    85  
    86 # 
    87 # Glacier2 always disables active connection management so there is no 
    88 # need to configure this manually. Connection retry does not need to 
    89 # be disabled, as it's safe for Glacier2 to retry outgoing connections 
    90 # to servers. Retry for incoming connections from clients must be 
    91 # disabled in the clients. 
    92 # 
    93  
    94 # 
    95 # Various settings to trace requests, overrides, etc. 
    96 # 
    97 Glacier2.Client.Trace.Request=1 
    98 Glacier2.Server.Trace.Request=1 
    99 Glacier2.Client.Trace.Override=1 
    100 Glacier2.Server.Trace.Override=1 
    101 Glacier2.Client.Trace.Reject=1 
    102 Glacier2.Trace.Session=1 
    103 Glacier2.Trace.RoutingTable=1 
    104  
    105 # 
    106 # Warn about connection exceptions 
    107 # 
    108 Ice.Warn.Connections=1 
    109  
    110 # 
    111 # Network Tracing 
    112 # 
    113 # 0 = no network tracing 
    114 # 1 = trace connection establishment and closure 
    115 # 2 = like 1, but more detailed 
    116 # 3 = like 2, but also trace data transfer 
    117 # 
    118 #Ice.Trace.Network=1 
    119  
    120 # 
    121 # Protocol Tracing 
    122 # 
    123 # 0 = no protocol tracing 
    124 # 1 = trace protocol messages 
    125 # 
    126 #Ice.Trace.Protocol=1 
    127  
    128 # 
    129 # Security Tracing 
    130 # 
    131 # 0 = no security tracing 
    132 # 1 = trace messages 
    133 # 
    134 #IceSSL.Trace.Security=1 
    135  
    136 # 
    137 # SSL Configuration 
    138 # 
    139 #Ice.Plugin.IceSSL=IceSSL:createIceSSL 
    140 #IceSSL.DefaultDir=../../../certs 
    141 #IceSSL.CertAuthFile=cacert.pem 
    142 #IceSSL.CertFile=s_rsa1024_pub.pem 
    143 #IceSSL.KeyFile=s_rsa1024_priv.pem 
     30Ice.ThreadPerConnection.StackSize=262144 

  • branches/3.0-Beta2/components/blitz/resources/templates/combined.vm

    r1553 r1644  
    850850[$cpp]           ${property.name}.begin(), 
    851851[$cpp]           ${property.name}.end(), 
    852 [$cpp]           ${removeLinkPredicate}(link, false)); 
     852[$cpp]           ${removeLinkPredicate}(link, bothSides)); 
    853853[$cpp]         ${property.name}.erase(it,${property.name}.end()); 
    854854[$cpp]       }  

  • branches/3.0-Beta2/components/server/build.xml

    r1637 r1644  
    99            <arg value="${omero.rootpass}"/> 
    1010        </java> 
    11         <copy file="${sql.dir}/${omero.dbversion}__${omero.dbpatch}__schema.sql" tofile="${target.dir}/ddl.sql"/> 
    12         <copy file="${sql.dir}/${omero.dbversion}__${omero.dbpatch}__data.sql" tofile="${target.dir}/data.sql"/> 
     11        <copy file="${sql.dir}/${omero.dbversion}__${omero.dbpatch}__schema.sql" tofile="${target.dir}/ddl.sql"  overwrite="true"/> 
     12        <copy file="${sql.dir}/${omero.dbversion}__${omero.dbpatch}__data.sql" tofile="${target.dir}/data.sql"  overwrite="true"/> 
    1313        <replace file="${target.dir}/data.sql" token="@ROOTPASS@" value="${ROOTPASS}"/> 
    1414        <replace file="${target.dir}/data.sql" token="@DBPATCH@" value="${omero.dbpatch}"/> 

  • branches/3.0-Beta2/components/tools/licenses/build.xml

    r1568 r1644  
    3838        compile time to become a part of a distribution. --> 
    3939        <target name="compile" depends="generate" unless="skip.compile"> 
    40                 <hardWireCompile pattern="ome/services/licenses/LicenseBean" 
    41                    token="&quot;ome.services.licenses.Store&quot;" 
    42                    value="${ome.services.licenses.Store_class}"/> 
     40                <hard-wire file="ome/services/licenses/LicenseBean.java" 
     41                        token="&quot;ome.services.licenses.Store&quot;" 
     42                        value="${ome.services.licenses.Store_class}"/> 
     43                <myjavac> 
     44                        <exclude name="**/LicenseBean.java"/> 
     45                        <exclude name="**/LicenseWiring.java"/> 
     46                        <src path="${src.dest}"/> 
     47                        <src path="${src.dir}"/> 
     48                </myjavac> 
     49                <copy todir="${src.dest}"><fileset dir="${src.dir}" includes="**/LicenseWiring.java"/></copy> 
     50                <myjavac> 
     51                        <include name="**/LicenseBean.java"/> 
     52                        <include name="**/LicenseWiring.java"/> 
     53                        <src path="${src.dest}"/> 
     54                </myjavac> 
     55                <delete file="${src.dest}/ome/services/licenses/LicenseBean.java"/> 
     56                <delete file="${src.dest}/ome/services/licenses/LicenseWiring.java"/> 
    4357        </target> 
    4458 

  • branches/3.0-Beta2/components/tools/make.xml

    r1569 r1644  
    3131 
    3232    <target name="make_clean" unless="make.NOMAKE"> 
    33         <exec executable="make" failonerror="true"> <arg value="clean"/> </exec> 
     33        <exec executable="make" failonerror="true"> <arg value="maintainer-clean"/> </exec> 
    3434    </target> 
    3535 

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/