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

Show
Ignore:
Timestamp:
02/07/08 11:20:27 (10 months ago)
Author:
jmoore
Message:

OmeroSessions : Removing EJB security infrastructure

  • Removed app/resources/* files for security
  • Removed all "@SecurityDomain?" annotations
  • Removed ejb.properties
    • Removed all references to in- or out-of-container
    • Renamed out-of-container.xml to datalayer.xml (no more JTA)
Location:
trunk
Files:
6 removed
26 modified
1 moved

  • .project (modified) (1 diff)
  • components/antlib/resources/omero.xml (modified) (2 diffs)
  • components/app/build.xml (modified) (4 diffs)
  • components/app/resources/ejb.properties (deleted)
  • components/app/resources/jboss-app.xml (modified) (1 diff)
  • components/app/resources/jboss-login.xml (deleted)
  • components/app/resources/jboss-service.xml (deleted)
  • components/blitz/resources/beanRefContext.xml (modified) (1 diff)
  • components/server/.springBeans (modified) (2 diffs)
  • components/server/resources/beanRefContext.xml (modified) (2 diffs)
  • components/server/resources/ome/services/config-local.xml (modified) (1 diff)
  • components/server/resources/ome/services/datalayer.xml (moved) (moved from trunk/components/server/resources/ome/services/out-of-container.xml)
  • components/server/resources/ome/services/in-container.xml (deleted)
  • components/server/src/ome/logic/AdminImpl.java (modified) (2 diffs)
  • components/server/src/ome/logic/ConfigImpl.java (modified) (3 diffs)
  • components/server/src/ome/logic/LdapImpl.java (modified) (2 diffs)
  • components/server/src/ome/logic/PixelsImpl.java (modified) (2 diffs)
  • components/server/src/ome/logic/PojosImpl.java (modified) (2 diffs)
  • components/server/src/ome/logic/QueryImpl.java (modified) (2 diffs)
  • components/server/src/ome/logic/RenderingSettingsImpl.java (modified) (2 diffs)
  • components/server/src/ome/logic/RepositoryInfoImpl.java (modified) (2 diffs)
  • components/server/src/ome/logic/TypesImpl.java (modified) (2 diffs)
  • components/server/src/ome/logic/UpdateImpl.java (modified) (2 diffs)
  • components/server/src/ome/services/JobBean.java (modified) (2 diffs)
  • components/server/src/ome/services/RawFileBean.java (modified) (2 diffs)
  • components/server/src/ome/services/RawPixelsBean.java (modified) (2 diffs)
  • components/server/src/ome/services/RenderingBean.java (modified) (2 diffs)
  • components/server/src/ome/services/SearchBean.java (modified) (2 diffs)
  • components/server/src/ome/services/ThumbnailBean.java (modified) (2 diffs)
  • components/server/src/ome/services/delete/DeleteBean.java (modified) (2 diffs)
  • components/tools/licenses/resources/ome/services/service-ome.services.licenses.ILicense.xml (deleted)
  • etc/hibernate.properties (modified) (1 diff)
  • etc/omero-ds.xml (deleted)

Legend:

Unmodified
Added
Removed

  • trunk/.project

    r1784 r2128  
    11<?xml version="1.0" encoding="UTF-8"?> 
    22<projectDescription> 
    3         <name>omero.git</name> 
     3        <name>sessions.git</name> 
    44        <comment></comment> 
    55        <projects> 

  • trunk/components/antlib/resources/omero.xml

    r2026 r2128  
    6161                <not><available file="${basedir}/etc/local.properties"/></not></condition></fail> 
    6262 
    63                 <!-- copied from app/build.xml refactor --> 
    64       <tempfile property="temp.dir" prefix="omero"/> 
    65       <mkdir dir="${temp.dir}"/> 
    66       <copy file="${etc.dir}/omero-ds.xml" todir="${temp.dir}" /> 
    67       <replace file="${temp.dir}/omero-ds.xml"> 
    68          <replacefilter token="@@@JDBC.URL@@@" value="${hibernate.connection.url}"/> 
    69          <replacefilter token="@@@JDBC.DRIVER@@@" value="${hibernate.connection.driver_class}"/> 
    70          <replacefilter token="@@@JDBC.USERNAME@@@" value="${hibernate.connection.username}"/> 
    71          <replacefilter token="@@@JDBC.PASSWORD@@@" value="${hibernate.connection.password}"/> 
    72       </replace> 
    73  
    7463                <!-- Touching the etc files to force update in the case that  
    7564                the timezone or similar on a system has changed. Please refer to #779  
    … …  
    8675                        <fileset dir="${basedir}/etc"> 
    8776                                <patternset refid="etc.files"/> 
    88                         </fileset> 
    89                         <fileset dir="${temp.dir}"> 
    90                                 <include name="omero-ds.xml"/> 
    9177                        </fileset> 
    9278                </jar> 

  • trunk/components/app/build.xml

    r2100 r2128  
    3030   <target name="package" depends="generate" 
    3131           description="Packages the EAR by assembling all modules and deployment descriptors"> 
    32        
     32 
    3333      <delete> 
    3434        <fileset dir="${target.dir}/libs" includes="commons-logging*"/> 
    … …  
    4141 
    4242      <useServices dir="${target.dir}/libs"/> 
    43        
    44       <!-- DataSource with replacement. --> 
    45       <copy file="${etc.dir}/omero-ds.xml" todir="${target.dir}" overwrite="true"/> 
    46       <replace file="${target.dir}/omero-ds.xml"> 
    47          <replacefilter token="@@@JDBC.URL@@@" value="${hibernate.connection.url}"/> 
    48          <replacefilter token="@@@JDBC.DRIVER@@@" value="${hibernate.connection.driver_class}"/> 
    49          <replacefilter token="@@@JDBC.USERNAME@@@" value="${hibernate.connection.username}"/> 
    50          <replacefilter token="@@@JDBC.PASSWORD@@@" value="${hibernate.connection.password}"/> 
    51       </replace> 
    52        
     43 
    5344      <jar jarfile="${target.dir}/${ivy.module}.ear"> 
    5445         <metainf dir="${resrc.dir}"> 
    5546            <include name="application.xml" /> 
    5647            <include name="jboss-app.xml" /> 
    57             <include name="jboss-login.xml" /> 
    5848         </metainf> 
    5949         <fileset dir="${target.dir}/generated/resources" includes="enums.properties"/> 
    … …  
    6151         <fileset dir="${etc.dir}" includes="hibernate.properties"/> 
    6252         <fileset dir="${etc.dir}" includes="local.properties"/> 
    63          <fileset dir="${resrc.dir}" includes="ejb.properties"/> 
    64          <fileset dir="${resrc.dir}" includes="jboss-service.xml"/> 
    6553         <fileset dir="${target.dir}/libs" includes="*.jar" /> 
    66          <fileset dir="${target.dir}" includes="omero-ds.xml"/> 
    6754         <manifest> 
    6855            <attribute name="Product-Name"      value="${product.name}"/> 
    … …  
    8269 
    8370   <!-- This will change and all dependency on jboss will move to properties--> 
    84     <property name="jboss.home" value="${env.JBOSS_HOME}"/>    
     71    <property name="jboss.home" value="${env.JBOSS_HOME}"/> 
    8572    <property name="jboss.server.config" value="default"/> 
    8673    <property name="jboss.deploy.dir" value="${jboss.home}/server/${jboss.server.config}/deploy"/> 

  • trunk/components/app/resources/jboss-app.xml

    r1167 r2128  
    66  <loader-repository> 
    77    omero:app=omero-app 
    8     <loader-repository-config>  
    9       java2ParentDelegation=false  
     8    <loader-repository-config> 
     9      java2ParentDelegation=false 
    1010    </loader-repository-config> 
    1111  </loader-repository> 
    12   <module> 
    13     <service>omero-ds.xml</service> 
    14   </module> 
    15    <module> 
    16       <service>jboss-service.xml</service> 
    17    </module> 
    1812</jboss-app> 

  • trunk/components/blitz/resources/beanRefContext.xml

    r1813 r2128  
    1515                        <value>hibernate.properties</value>             
    1616                        <value>omero.properties</value>       
    17                         <value>ejb.properties</value> 
    1817                </list> 
    1918                </property> 

  • trunk/components/server/.springBeans

    r1967 r2128  
    1111                <config>resources/ome/services/service-ome.io.nio.PixelsService.xml</config> 
    1212                <config>resources/ome/services/service-ome.api.ITypes.xml</config> 
    13                 <config>resources/ome/services/in-container.xml</config> 
    1413                <config>resources/ome/services/services.xml</config> 
    1514                <config>resources/ome/services/service-ome.api.IQuery.xml</config> 
    … …  
    4544                                <config>resources/ome/services/service-ome.io.nio.PixelsService.xml</config> 
    4645                                <config>resources/ome/services/service-omeis.providers.re.RenderingEngine.xml</config> 
    47                                 <config>resources/ome/services/in-container.xml</config> 
    4846                        </configs> 
    4947                </configSet> 

  • trunk/components/server/resources/beanRefContext.xml

    r2030 r2128  
    1515                        <value>hibernate.properties</value> 
    1616                        <value>omero.properties</value> 
    17                         <value>ejb.properties</value> 
    1817                </list> 
    1918                </property> 
    … …  
    4140        <value>classpath*:ome/services/service-*.xml</value> 
    4241        <value>classpath:ome/services/hibernate.xml</value> 
    43         <value>classpath:ome/services/${container.status}.xml</value> 
     42        <value>classpath:ome/services/datalayer.xml</value> 
    4443      </list> 
    4544    </constructor-arg> 

  • trunk/components/server/resources/ome/services/config-local.xml

    r1167 r2128  
    3838                        <value>omero.properties</value> 
    3939                        <value>local.properties</value> 
    40                         <value>ejb.properties</value> 
    4140                </list> 
    4241                </property> 

  • trunk/components/server/src/ome/logic/AdminImpl.java

    r2122 r2128  
    7474import org.jboss.annotation.ejb.RemoteBinding; 
    7575import org.jboss.annotation.ejb.RemoteBindings; 
    76 import org.jboss.annotation.security.SecurityDomain; 
    7776import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; 
    7877import org.springframework.jmx.support.JmxUtils; 
    … …  
    109108@Local(IAdmin.class) 
    110109@LocalBinding(jndiBinding = "omero/local/ome.api.IAdmin") 
    111 @SecurityDomain("OmeroSecurity") 
    112110@Interceptors( { OmeroAroundInvoke.class, SimpleLifecycle.class }) 
    113111public class AdminImpl extends AbstractLevel2Service implements LocalAdmin { 

  • trunk/components/server/src/ome/logic/ConfigImpl.java

    r1949 r2128  
    3030import org.jboss.annotation.ejb.RemoteBinding; 
    3131import org.jboss.annotation.ejb.RemoteBindings; 
    32 import org.jboss.annotation.security.SecurityDomain; 
    3332import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; 
    3433import org.springframework.transaction.annotation.Transactional; 
    … …  
    137136 */ 
    138137@LocalBinding(jndiBinding = "omero/local/ome.api.IConfig") 
    139 /* 
    140  * Source: JBoss-specific Purpose: Defines which security manager service is 
    141  * responsible for calls to this service. This value is defined in: 
    142  *  
    143  * components/app/resourcs/jboss-login.xml 
    144  *  
    145  * and specifies where the manager should be found in JNDI. 
    146  */ 
    147 @SecurityDomain("OmeroSecurity") 
    148138/* 
    149139 * Source: EJB3 Specification Purpose: List of classes (with no-arg 
    … …  
    224214     * Source: EJB3 Specification Purpose: defines the role which must have been 
    225215     * obtained during authentication and authorization in order to access this 
    226      * method. This works in combination with the class-level @SecurityDomain 
    227      * annotation above to fully define security semantics. 
     216     * method. This works in combination with the BasicMethodSecurity to fully 
     217     * define security semantics. 
    228218     */ 
    229219    /** 

  • trunk/components/server/src/ome/logic/LdapImpl.java

    r2100 r2128  
    3939import org.jboss.annotation.ejb.RemoteBinding; 
    4040import org.jboss.annotation.ejb.RemoteBindings; 
    41 import org.jboss.annotation.security.SecurityDomain; 
    4241import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; 
    4342import org.springframework.jmx.support.JmxUtils; 
    … …  
    9594@Local(ILdap.class) 
    9695@LocalBinding(jndiBinding = "omero/local/ome.api.local.LocalLdap") 
    97 @SecurityDomain("OmeroSecurity") 
    9896@Interceptors( { OmeroAroundInvoke.class, SimpleLifecycle.class }) 
    9997public class LdapImpl extends AbstractLevel2Service implements LocalLdap { 

  • trunk/components/server/src/ome/logic/PixelsImpl.java

    r1966 r2128  
    2323import org.jboss.annotation.ejb.RemoteBinding; 
    2424import org.jboss.annotation.ejb.RemoteBindings; 
    25 import org.jboss.annotation.security.SecurityDomain; 
    2625import org.springframework.transaction.annotation.Transactional; 
    2726 
    … …  
    6160@Local(IPixels.class) 
    6261@LocalBinding(jndiBinding = "omero/local/ome.api.IPixels") 
    63 @SecurityDomain("OmeroSecurity") 
    6462@Interceptors( { OmeroAroundInvoke.class, SimpleLifecycle.class }) 
    6563class PixelsImpl extends AbstractLevel2Service implements IPixels { 

  • trunk/components/server/src/ome/logic/PojosImpl.java

    r2052 r2128  
    6363import org.jboss.annotation.ejb.RemoteBinding; 
    6464import org.jboss.annotation.ejb.RemoteBindings; 
    65 import org.jboss.annotation.security.SecurityDomain; 
    6665import org.springframework.transaction.annotation.Transactional; 
    6766 
    … …  
    8584@Local(IPojos.class) 
    8685@LocalBinding(jndiBinding = "omero/local/ome.api.IPojos") 
    87 @SecurityDomain("OmeroSecurity") 
    8886@Interceptors( { OmeroAroundInvoke.class, SimpleLifecycle.class }) 
    8987public class PojosImpl extends AbstractLevel2Service implements IPojos { 

  • trunk/components/server/src/ome/logic/QueryImpl.java

    r2098 r2128  
    4747import org.jboss.annotation.ejb.RemoteBinding; 
    4848import org.jboss.annotation.ejb.RemoteBindings; 
    49 import org.jboss.annotation.security.SecurityDomain; 
    5049import org.springframework.orm.hibernate3.HibernateCallback; 
    5150import org.springframework.transaction.annotation.Propagation; 
    … …  
    7069@Local(LocalQuery.class) 
    7170@LocalBinding(jndiBinding = "omero/local/ome.api.local.LocalQuery") 
    72 @SecurityDomain("OmeroSecurity") 
    7371@Interceptors( { OmeroAroundInvoke.class, SimpleLifecycle.class }) 
    7472public class QueryImpl extends AbstractLevel1Service implements LocalQuery { 

  • trunk/components/server/src/ome/logic/RenderingSettingsImpl.java

    r2002 r2128  
    3232import org.jboss.annotation.ejb.RemoteBinding; 
    3333import org.jboss.annotation.ejb.RemoteBindings; 
    34 import org.jboss.annotation.security.SecurityDomain; 
    3534import org.springframework.transaction.annotation.Transactional; 
    3635 
    … …  
    8382@Local(IRenderingSettings.class) 
    8483@LocalBinding(jndiBinding = "omero/local/ome.api.IRenderingSettings") 
    85 @SecurityDomain("OmeroSecurity") 
    8684@TransactionManagement(TransactionManagementType.BEAN) 
    8785@Transactional 

  • trunk/components/server/src/ome/logic/RepositoryInfoImpl.java

    r1949 r2128  
    2727import org.jboss.annotation.ejb.RemoteBinding; 
    2828import org.jboss.annotation.ejb.RemoteBindings; 
    29 import org.jboss.annotation.security.SecurityDomain; 
    3029import org.springframework.transaction.annotation.Transactional; 
    3130 
    … …  
    5857@Local(IRepositoryInfo.class) 
    5958@LocalBinding(jndiBinding = "omero/local/ome.api.IRepositoryInfo") 
    60 @SecurityDomain("OmeroSecurity") 
    6159@Interceptors( { SimpleLifecycle.class }) 
    6260public class RepositoryInfoImpl extends AbstractLevel2Service implements 

  • trunk/components/server/src/ome/logic/TypesImpl.java

    r2100 r2128  
    5656import org.jboss.annotation.ejb.RemoteBinding; 
    5757import org.jboss.annotation.ejb.RemoteBindings; 
    58 import org.jboss.annotation.security.SecurityDomain; 
    5958import org.springframework.transaction.annotation.Transactional; 
    6059import org.springframework.util.ResourceUtils; 
    … …  
    7776@Local(ITypes.class) 
    7877@LocalBinding(jndiBinding = "omero/local/ome.api.ITypes") 
    79 @SecurityDomain("OmeroSecurity") 
    8078@Interceptors( { OmeroAroundInvoke.class, SimpleLifecycle.class }) 
    8179public class TypesImpl extends AbstractLevel2Service implements ITypes { 

  • trunk/components/server/src/ome/logic/UpdateImpl.java

    r1949 r2128  
    3434import org.jboss.annotation.ejb.RemoteBinding; 
    3535import org.jboss.annotation.ejb.RemoteBindings; 
    36 import org.jboss.annotation.security.SecurityDomain; 
    3736import org.springframework.orm.hibernate3.HibernateCallback; 
    3837import org.springframework.transaction.annotation.Transactional; 
    … …  
    6766@Local(LocalUpdate.class) 
    6867@LocalBinding(jndiBinding = "omero/local/ome.api.local.LocalUpdate") 
    69 @SecurityDomain("OmeroSecurity") 
    7068@Interceptors( { OmeroAroundInvoke.class, SimpleLifecycle.class }) 
    7169public class UpdateImpl extends AbstractLevel1Service implements LocalUpdate { 

  • trunk/components/server/src/ome/services/JobBean.java

    r2008 r2128  
    4242import org.jboss.annotation.ejb.LocalBinding; 
    4343import org.jboss.annotation.ejb.RemoteBinding; 
    44 import org.jboss.annotation.security.SecurityDomain; 
    4544import org.springframework.transaction.annotation.Transactional; 
    4645 
    … …  
    6059@LocalBinding(jndiBinding = "omero/local/ome.api.JobHandle") 
    6160@Interceptors( { OmeroAroundInvoke.class }) 
    62 @SecurityDomain("OmeroSecurity") 
    6361public class JobBean extends AbstractStatefulBean implements JobHandle, 
    6462        ProcessCallback { 

  • trunk/components/server/src/ome/services/RawFileBean.java

    r1949 r2128  
    4444import org.jboss.annotation.ejb.RemoteBinding; 
    4545import org.jboss.annotation.ejb.RemoteBindings; 
    46 import org.jboss.annotation.security.SecurityDomain; 
    4746import org.springframework.transaction.annotation.Transactional; 
    4847 
    … …  
    6867@LocalBinding(jndiBinding = "omero/local/ome.api.RawFileStore") 
    6968@Interceptors( { OmeroAroundInvoke.class }) 
    70 @SecurityDomain("OmeroSecurity") 
    7169public class RawFileBean extends AbstractStatefulBean implements RawFileStore { 
    7270    /** 

  • trunk/components/server/src/ome/services/RawPixelsBean.java

    r1949 r2128  
    3232import org.jboss.annotation.ejb.RemoteBinding; 
    3333import org.jboss.annotation.ejb.RemoteBindings; 
    34 import org.jboss.annotation.security.SecurityDomain; 
    3534import org.springframework.transaction.annotation.Transactional; 
    3635 
    … …  
    7069@LocalBinding(jndiBinding = "omero/local/ome.api.RawPixelsStore") 
    7170@Interceptors( { OmeroAroundInvoke.class }) 
    72 @SecurityDomain("OmeroSecurity") 
    7371public class RawPixelsBean extends AbstractStatefulBean implements RawPixelsStore { 
    7472    /** The logger for this particular class */ 

  • trunk/components/server/src/ome/services/RenderingBean.java

    r2011 r2128  
    6969import org.jboss.annotation.ejb.RemoteBindings; 
    7070import org.jboss.annotation.ejb.cache.Cache; 
    71 import org.jboss.annotation.security.SecurityDomain; 
    7271import org.jboss.ejb3.cache.NoPassivationCache; 
    7372import org.springframework.transaction.annotation.Transactional; 
    … …  
    109108@Local(RenderingEngine.class) 
    110109@LocalBinding(jndiBinding = "omero/local/omeis.providers.re.RenderingEngine") 
    111 @SecurityDomain("OmeroSecurity") 
    112110@TransactionManagement(TransactionManagementType.BEAN) 
    113111@Transactional(readOnly = true) 

  • trunk/components/server/src/ome/services/SearchBean.java

    r2109 r2128  
    5151import org.jboss.annotation.ejb.LocalBinding; 
    5252import org.jboss.annotation.ejb.RemoteBinding; 
    53 import org.jboss.annotation.security.SecurityDomain; 
    5453import org.springframework.transaction.annotation.Transactional; 
    5554 
    … …  
    6968@LocalBinding(jndiBinding = "omero/local/ome.api.Search") 
    7069@Interceptors( { OmeroAroundInvoke.class }) 
    71 @SecurityDomain("OmeroSecurity") 
    7270public class SearchBean extends AbstractStatefulBean implements Search { 
    7371 

  • trunk/components/server/src/ome/services/ThumbnailBean.java

    r2011 r2128  
    6767import org.jboss.annotation.ejb.RemoteBinding; 
    6868import org.jboss.annotation.ejb.RemoteBindings; 
    69 import org.jboss.annotation.security.SecurityDomain; 
    7069import org.springframework.transaction.annotation.Transactional; 
    7170 
    … …  
    9392@LocalBinding(jndiBinding = "omero/local/ome.api.ThumbnailStore") 
    9493@Interceptors( { OmeroAroundInvoke.class }) 
    95 @SecurityDomain("OmeroSecurity") 
    9694public class ThumbnailBean extends AbstractLevel2Service implements 
    9795        ThumbnailStore, Serializable { 

  • trunk/components/server/src/ome/services/delete/DeleteBean.java

    r2033 r2128  
    5555import org.jboss.annotation.ejb.RemoteBinding; 
    5656import org.jboss.annotation.ejb.RemoteBindings; 
    57 import org.jboss.annotation.security.SecurityDomain; 
    5857import org.springframework.orm.hibernate3.HibernateCallback; 
    5958import org.springframework.transaction.annotation.Transactional; 
    … …  
    7877@Local(IDelete.class) 
    7978@LocalBinding(jndiBinding = "omero/local/ome.api.IDelete") 
    80 @SecurityDomain("OmeroSecurity") 
    8179@Interceptors( { OmeroAroundInvoke.class, SimpleLifecycle.class }) 
    8280public class DeleteBean extends AbstractLevel2Service implements IDelete { 

  • trunk/etc/hibernate.properties

    r2034 r2128  
    2222hibernate.validator.autoregister_listeners = false 
    2323 
    24 container.status=out-of-container 
    25 #This will be overwritten by ejb.properties during deployment 
    2624 

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/