Changeset 1744

Timestamp:

08/14/07 14:25:55 (15 months ago)

Author:

Aleksandra Tarkowska

Message:

changing logic to modularize compression library (#6)

Location:

trunk/components

Files:

• common/src/ome/system/ServiceFactory.java (modified) (2 diffs)
• server/resources/ome/services/service-ome.api.IThumb.xml (modified) (1 diff)
• server/src/ome/logic/LdapImpl.java (modified) (2 diffs)
• server/src/ome/security/LdapUtil.java (modified) (1 diff)
• server/src/ome/services/ThumbnailBean.java (modified) (8 diffs)
• server/test/ome/server/itests/ThumbnailServiceTest.java (modified) (1 diff)
• server/test/ome/server/itests/sec/LdapTest.java (modified) (9 diffs)

trunk/components/common/src/ome/system/ServiceFactory.java

@@ -16 +16 @@
 import ome.api.IAdmin;
 import ome.api.IAnalysis;
+import ome.api.ICompress;
 import ome.api.IConfig;
 import ome.api.ILdap;
@@ -179 +180 @@
     }
 
+    public ICompress getCompresService() {
+        return getServiceByClass(ICompress.class);
+    }
+    
     public IConfig getConfigService() {
         return getServiceByClass(IConfig.class);

trunk/components/server/resources/ome/services/service-ome.api.IThumb.xml

@@ -29 +29 @@
     <property name="scaleService" ref="internal:ome.api.IScale"/>
     <property name="IRepositoryInfo" ref="internal:ome.api.IRepositoryInfo"/>
+    <property name="ICompress" ref="internal:ome.api.ICompress"/>
   </bean>
   

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

@@ -179 +179 @@
         @RolesAllowed("system")
         public Experimenter searchByDN(DistinguishedName dn) {
-                Experimenter exp = new Experimenter();
                 return (Experimenter) ldapTemplate
                                 .lookup(dn, new PersonContextMapper());
@@ -446 +445 @@
                                         .getEnvironment();
 
-                        if (username != "" && username != null) {
+                        if (!username.equals("") && username != null) {
                                 env.put(Context.SECURITY_PRINCIPAL, username);
                                 if (password != null)

trunk/components/server/src/ome/security/LdapUtil.java

@@ -9 +9 @@
 
 // Java imports
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-
-import javax.naming.AuthenticationException;
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.naming.ldap.InitialLdapContext;
-import javax.naming.ldap.LdapContext;
-
-// Third-party libraries
 import org.springframework.jdbc.core.simple.SimpleJdbcOperations;
-import net.sf.ldaptemplate.support.DistinguishedName;
-
-// Application-internal dependencies
-import ome.api.IAdmin;
-import ome.api.ILdap;
-import ome.api.local.LocalAdmin;
-import ome.api.local.LocalLdap;
-import ome.model.meta.Experimenter;
-import ome.system.OmeroContext;
-import ome.system.Principal;
-import ome.system.Roles;
-import ome.system.ServiceFactory;
 
 /**

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

@@ -20 +20 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.OutputStream;
 import java.io.Serializable;
 import java.util.List;
@@ -35 +34 @@
 import javax.ejb.TransactionManagement;
 import javax.ejb.TransactionManagementType;
-import javax.imageio.IIOImage;
-import javax.imageio.ImageIO;
-import javax.imageio.ImageWriteParam;
-import javax.imageio.ImageWriter;
-import javax.imageio.stream.ImageOutputStream;
 import javax.interceptor.Interceptors;
-// Third-party libraries
-import org.springframework.transaction.annotation.Transactional;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.security.SecurityDomain;
-
+
+import ome.api.ICompress;
 import ome.api.IRepositoryInfo;
 import ome.api.IScale;
+import ome.api.ServiceInterface;
 import ome.api.ThumbnailStore;
-import ome.api.ServiceInterface;
 import ome.conditions.ApiUsageException;
 import ome.conditions.ResourceError;
 import ome.io.nio.ThumbnailService;
 import ome.logic.AbstractLevel2Service;
-import ome.logic.SimpleLifecycle;
 import ome.model.core.Pixels;
 import ome.model.display.Thumbnail;
@@ -67 +53 @@
 import omeis.providers.re.RenderingEngine;
 import omeis.providers.re.data.PlaneDef;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.annotation.ejb.LocalBinding;
+import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.security.SecurityDomain;
+import org.springframework.transaction.annotation.Transactional;
+
 import sun.awt.image.IntegerInterleavedRaster;
 
@@ -110 +104 @@
     /** the disk space checking service */
     private transient IRepositoryInfo iRepositoryInfo;
+    
+    /** the disk space checking service */
+    private transient ICompress iCompress;
 
     /** is file service checking for disk overflow */
@@ -275 +272 @@
         this.iRepositoryInfo = iRepositoryInfo;
     }
+    
+    /**
+     * Scale service Bean injector.
+     * 
+     * @param iCompress
+     *            an <code>ICompress</code>.
+     */
+    public void setICompress(ICompress iCompress) {
+        getBeanHelper().throwIfAlreadySet(this.iCompress, iCompress);
+        this.iCompress = iCompress;
+    }
+    
     /**
      * Creates a buffered image from a rendering engine RGB buffer without data
@@ -320 +329 @@
 
     /**
-     * Compresses a buffered image thumbnail to an output stream.
-     * 
-     * @param image
-     *            the thumbnail's buffered image.
-     * @param outputStream
-     *            the stream to write to.
-     * @throws IOException
-     *             if there is a problem when writing to <i>stream<i>.
-     */
-    private void compressThumbnailToStream(BufferedImage image,
-            OutputStream outputStream) throws IOException {
-        // Get a JPEG image writer
-        ImageWriter jpegWriter =
-                ImageIO.getImageWritersByFormatName("jpeg").next();
-
-        // Setup the compression value from (0.05, 0.75 and 0.95)
-        ImageWriteParam iwp = jpegWriter.getDefaultWriteParam();
-        iwp.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
-        iwp.setCompressionQuality(DEFAULT_COMPRESSION_QUALITY);
-
-        // Write the JPEG to our ByteArray stream
-        ImageOutputStream imageOutputStream = null;
-        try {
-                imageOutputStream = ImageIO.createImageOutputStream(outputStream);
-                jpegWriter.setOutput(imageOutputStream);
-                jpegWriter.write(null, new IIOImage(image, null, null), iwp);
-        } finally {
-                if (imageOutputStream != null)
-                        imageOutputStream.close();
-        }
-    }
-
-    /**
      * Compresses a buffered image thumbnail to disk.
      * 
@@ -370 +346 @@
 
         FileOutputStream stream = ioService.getThumbnailOutputStream(thumb);
-        compressThumbnailToStream(image, stream);
+        iCompress.compressThumbnailToStream(image, stream);
         stream.close();
     }
@@ -632 +608 @@
         ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
         try {
-            compressThumbnailToStream(image, byteStream);
+            iCompress.compressThumbnailToStream(image, byteStream);
             byte[] thumbnail = byteStream.toByteArray();
             return thumbnail;

trunk/components/server/test/ome/server/itests/ThumbnailServiceTest.java

@@ -60 +60 @@
     public void testThumbnailsDirect() throws Exception {
 
+        
         RenderingDef def = (RenderingDef) qs
                 .findAllByQuery(

trunk/components/server/test/ome/server/itests/sec/LdapTest.java

@@ -32 +32 @@
 
                 List<String> l = iLdap.searchDnInGroups("member",
-                                "cn=jburel, ou=edir, ou=people, ou=lifesci, o=dundee");
+                                "cn=jsmith, ou=example, ou=domain, o=com");
                 for (String s : l) {
                         System.out.println(s);
@@ -44 +44 @@
 
                 List<Experimenter> exps = iLdap.searchByAttribute(
-                                DistinguishedName.EMPTY_PATH, "sn", "Tarkowska");
+                                DistinguishedName.EMPTY_PATH, "sn", "Smith");
                 for (Experimenter e : exps) {
                         System.out.println(e.getOmeName());
@@ -60 +60 @@
                 String[] vals = new String[2];
                 vals[0] = "person";
-                vals[1] = "1614";
+                vals[1] = "1111";
 
                 List<Experimenter> exps = iLdap.searchByAttributes(
@@ -70 +70 @@
 
                 DistinguishedName dn = new DistinguishedName(
-                                "cn=atarkowska,ou=edir,ou=people");
+                                "cn=jsmith,ou=example");
                 List<Experimenter> exps1 = iLdap.searchByAttributes(dn, attrs, vals);
                 System.out.println("size " + exps1.size());
@@ -84 +84 @@
 
                 DistinguishedName dn = new DistinguishedName(
-                                "cn=atarkowska,ou=edir,ou=people");
+                                "cn=atarkowska,ou=example");
                 Experimenter exp = iLdap.searchByDN(dn);
                 System.out.println("Experimenter: " + exp.getFirstName() + " "
@@ -96 +96 @@
                 loginRoot();
 
-                DistinguishedName dn = iLdap.findDN("akrasowski");
+                DistinguishedName dn = iLdap.findDN("jsmith");
                 System.out.println("DN: " + dn.toString());
 
@@ -102 +102 @@
                 // should catch an exception
                 try {
-                        iLdap.findDN("atarkowska");
+                        iLdap.findDN("jsmith");
                 } catch (Exception e) {
                         e.printStackTrace();
@@ -123 +123 @@
         public void testValidatePassword() throws Exception {
                 loginRoot();
-                System.out.println(iLdap.validatePassword("cn=atarkowska,ou=edir,ou=people,ou=lifesci,o=dundee", "123"));
+                System.out.println(iLdap.validatePassword("cn=jsmith,ou=example,ou=domain,o=com", "passwod"));
                 
         }
@@ -130 +130 @@
         public void testCreateUserFromLdap() throws Exception {
                 loginRoot();
-                System.out.println(iLdap.createUserFromLdap("atarkowska", "123"));
+                System.out.println(iLdap.createUserFromLdap("jsmith", "passwd"));
                 
         }