Changeset 1780

Timestamp:

12/20/07 13:41:38 (1 year ago)

Author:

dsugar

Message:

fix problems with load libselinuxjava.so file
make it work like setools stuff is done.

Files:

• trunk/libselinux.linux.x86/META-INF/MANIFEST.MF (modified) (1 diff)
• trunk/libselinux.linux.x86/build.properties (modified) (1 diff)
• trunk/libselinux.linux.x86/src/com/tresys/framework/compiler/linkage/SELinuxjava.java (deleted)
• trunk/libselinux.linux.x86_64/META-INF/MANIFEST.MF (modified) (1 diff)
• trunk/libselinux.linux.x86_64/build.properties (modified) (1 diff)
• trunk/libselinux.linux.x86_64/src/com/tresys/framework/compiler/linkage/SELinuxjava.java (deleted)
• trunk/libselinux.place.holder/src/com/tresys/framework/compiler/linkage/SELinuxjava.java (deleted)
• trunk/libselinuxjava-plugin/META-INF/MANIFEST.MF (modified) (1 diff)
• trunk/libselinuxjava-plugin/build.properties (modified) (2 diffs)
• trunk/libselinuxjava-plugin/src/com/tresys/framework/compiler/linkage/libselinuxjava_plugin.java (modified) (4 diffs)

trunk/libselinux.linux.x86/META-INF/MANIFEST.MF

@@ -9 +9 @@
-Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86))
-Require-Bundle: org.eclipse.core.runtime.compatibility
-Bundle-ClassPath: libselinuxjava.jar
-Export-Package: com.tresys.framework.compiler.linkage.libselinuxjava

trunk/libselinux.linux.x86/build.properties

@@ -1 @@
-libselinuxjava.jar
-libselinuxjava.jar
+.
+.
-bin.includes = META-INF/,\
-libselinuxjava.jar
+.
-               libselinuxjava/libselinuxjava.so
-source.libselinuxjava.jar = src/

trunk/libselinux.linux.x86_64/META-INF/MANIFEST.MF

@@ -10 +10 @@
-Require-Bundle: org.eclipse.core.runtime.compatibility
-Export-Package: com.tresys.framework.compiler.linkage.libselinuxjava
-Bundle-ClassPath: libselinuxjava.jar

trunk/libselinux.linux.x86_64/build.properties

@@ -1 @@
-libselinuxjava.jar
-libselinuxjava.jar
+.
+.
-bin.includes = META-INF/,\
-libselinuxjava.jar
+.
-               libselinuxjava/libselinuxjava.so
-source.libselinuxjava.jar = src/

trunk/libselinuxjava-plugin/META-INF/MANIFEST.MF

@@ -13 +13 @@
- org.eclipse.core.runtime
-Bundle-Activator: com.tresys.framework.compiler.linkage.libselinuxjava_plugin
-rary
+selinux

trunk/libselinuxjava-plugin/build.properties

@@ -1 @@
-
-
+
-bin.includes = META-INF/,\
-rary
+selinux
-               plugin.properties
-src.includes = .classpath,\
@@ -9 +8 @@
-               build.properties,\
-               src/
-
-
+
+
+
-

trunk/libselinuxjava-plugin/src/com/tresys/framework/compiler/linkage/libselinuxjava_plugin.java

@@ -11 +11 @@
-package com.tresys.framework.compiler.linkage;
-
+import java.io.IOException;
+import java.net.URL;
+
+import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
@@ -17 +26 @@
-        extends Plugin
-{
+        // The plug-in ID
+        private static final String PLUGIN_ID = "com.tresys.libselinux";
-
-        static private libselinuxjava_plugin m_default;
+        private boolean m_bIsLoaded = false;
-        
-        public libselinuxjava_plugin ()
@@ -35 +47 @@
-        {
-                super.start (context);
+                
+                loadLibs (context);
-        }
-        
@@ -44 +58 @@
-        }
-
+        public boolean isLoaded ()
+        {
+                return m_bIsLoaded;
+        }
+        
+        /**
+         * Convenience method which returns the unique identifier of this plugin.
+         */
+        public static String getUniqueIdentifier()
+        {
+                if (getDefault() == null)
+                {
+                        // If the default instance is not yet initialized,
+                        // return a static identifier. This identifier must
+                        // match the plugin id defined in plugin.xml
+                        return PLUGIN_ID;
+                }
+                return getDefault().getBundle().getSymbolicName();
+        }
+
+        /**
+         * Check if a specific debugging option is turned on
+         * see http://wiki.eclipse.org/index.php/FAQ_How_do_I_use_the_platform_debug_tracing_facility%3F
+         * for more information and .options file in project for what is debugable
+         * settable in the launch configuration 'tracing' tab
+         * @param i_sDebugOption
+         * @return
+         */
+        public boolean isDebugging (String i_sDebugOption)
+        {
+                if (!isDebugging ())
+                        return false;
+                
+                String sOption = Platform.getDebugOption (getUniqueIdentifier () + i_sDebugOption);
+                return ("true".equals (sOption)); //$NON-NLS-1$
+        }
+
+        private void loadLibs (BundleContext context)
+        {
+                        // list of libs to load.  On most systems will only need to load the last 4.
+                        // but, there are cases when the others are needed.  If they are there, load them
+                        // if not, don't worry about it.
+                String [] aLibs = { 
+                                "selinuxjava"                   //$NON_NLS-1$
+                        };
+
+                for (int i = 0; i < aLibs.length; i++)
+                {
+                        try
+                        {
+                                String sLibName = "libselinuxjava/" + System.mapLibraryName (aLibs[i]);
+                                Bundle i_bundle = context.getBundle ();
+                                URL selinuxResource = i_bundle.getResource(sLibName);   //$NON-NLS-1$
+                                String sPath = null;
+                                if (selinuxResource != null)
+                                        sPath = Platform.asLocalURL(selinuxResource).getPath();
+                                
+                                if (sPath != null)
+                                {
+                                        System.load (sPath);
+                                        m_bIsLoaded = true;
+                                }
+                        }
+                        catch (UnsatisfiedLinkError ule)
+                        {
+                                Status status = new Status (Status.ERROR, getUniqueIdentifier (), "Unable to load lib: " + aLibs[i], ule);
+                                getLog ().log (status);
+                        }
+                        catch (IOException ioe)
+                        {
+                                Status status = new Status (Status.ERROR, getUniqueIdentifier (), "Unable to load lib: " + aLibs[i], ioe);
+                                getLog ().log (status);
+                        }
+                }
+                
+                if (!isLoaded ())
+                {
+                        Display.getDefault().syncExec( 
+                                new Runnable() 
+                                { 
+                                        public void run() 
+                                        {
+                                                MessageDialog waitBox = new MessageDialog(
+                                                                PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
+                                                                "Missing libselinuxjava", null,
+                                                                "Missing libselinuxjava, correct this problem before creating projects",
+                                                                MessageDialog.ERROR, new String[] { "OK"}, 1);                                                  
+                
+                                                waitBox.open();
+                                        }
+                                });
+                        
+                }
+        }
+        
+
-}