X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.project%2Fsrc%2Forg%2Fsimantics%2Fproject%2Fmanagement%2FServerManagerFactory.java;fp=bundles%2Forg.simantics.project%2Fsrc%2Forg%2Fsimantics%2Fproject%2Fmanagement%2FServerManagerFactory.java;h=feec73dc909002be8c37118961a66c6c71806671;hp=444585bbdc1463265815a479f75179393fb65b03;hb=fe866f9e4d3f464c3ac33b6651ad52df16c5d2fc;hpb=aa77a6eb0405967b38b84b81b819e317bc3fdd48

diff --git a/bundles/org.simantics.project/src/org/simantics/project/management/ServerManagerFactory.java b/bundles/org.simantics.project/src/org/simantics/project/management/ServerManagerFactory.java
index 444585bbd..feec73dc9 100644
--- a/bundles/org.simantics.project/src/org/simantics/project/management/ServerManagerFactory.java
+++ b/bundles/org.simantics.project/src/org/simantics/project/management/ServerManagerFactory.java
@@ -11,16 +11,7 @@
  *******************************************************************************/
 package org.simantics.project.management;
 
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.net.URLDecoder;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
 
 import org.simantics.db.DatabaseUserAgent;
 import org.simantics.db.Driver;
@@ -42,168 +33,5 @@ public class ServerManagerFactory {
             driver.setDatabaseUserAgent(address, agent);
         return new ServerManager(driver);
     }
-	/**
-	 * Create a server manager in OSGi platform.
-	 *
-	 * @return
-	 * @throws IOException
-	 * @throws ClassNotFoundException
-	 * @throws RuntimeException unexpected problem with OSGi environment
-	 */
-	public static ServerManager createOSGI() throws IOException, RuntimeException {
-		try {
-			ClassLoader cl = ServerManager.class.getClassLoader();
-
-			// Object bundle = Platform.getBundle("org.simantics.db.build");
-			Class<?> Platform_class = cl.loadClass("org.eclipse.core.runtime.Platform");
-			Method Platform_getBundle = Platform_class.getMethod("getBundle", String.class);
-			Object bundle = Platform_getBundle.invoke(null, "org.simantics.db.build");
-			if (bundle==null) throw new RuntimeException("Bundle org.simantics.db.build not found.");
-
-			// URL db_build_url = bundle.getEntry("/");
-			Class<?> Bundle_class = cl.loadClass("org.osgi.framework.Bundle");
-			Method Bundle_getEntry = Bundle_class.getMethod("getEntry", String.class);
-			URL db_build_url = (URL) Bundle_getEntry.invoke(bundle, "/");
-
-	        // URL db_build_file_url = FileLocator.toFileURL( db_build_url );
-			Class<?> FileLocator_class = cl.loadClass("org.eclipse.core.runtime.FileLocator");
-			Method FileLocator_toFileURL = FileLocator_class.getMethod("toFileURL", URL.class);
-			URL db_build_file_url = (URL) FileLocator_toFileURL.invoke(null, db_build_url);
-
-			@SuppressWarnings("unused")
-            String buildFile = URLDecoder.decode(db_build_file_url.getPath(), "UTF-8");
-
-//	        File db_build_file = new File( buildFile );
-	        //return new ServerManager( db_build_file );
-	        throw new RuntimeException("ServerManager.createOSGI not implemented.");
-		} catch( ClassNotFoundException e ) {
-			throw new RuntimeException(e);
-		} catch (SecurityException e) {
-			throw new RuntimeException(e);
-		} catch (NoSuchMethodException e) {
-			throw new RuntimeException(e);
-		} catch (IllegalArgumentException e) {
-			throw new RuntimeException(e);
-		} catch (IllegalAccessException e) {
-			throw new RuntimeException(e);
-		} catch (InvocationTargetException e) {
-			throw new RuntimeException(e.getCause());
-		}
-	}
-
-	/**
-	 * Create a server manager in an POJO environment.
-	 *
-	 * @return
-	 * @throws IOException
-	 */
-	public static ServerManager createPOJO() throws IOException {
-		String tempPath = System.getenv("tmp");
-		if (tempPath==null) tempPath = "c:/temp/";
-		File driverDir = new File(tempPath+"/core_drivers");
-		if (!driverDir.exists()) {
-			System.out.println("Extracting Core drivers to "+driverDir);
-			driverDir.mkdirs();
-			ServerManagerFactory.extractDrivers(driverDir);
-		} else {
-			System.out.println("Loading Core drivers from "+driverDir);
-		}
-		//return new ServerManager(driverDir);
-        throw new RuntimeException("ServerManager.createPOJO not implemented.");
-	}
-
-    public static ServerManager createPOJO(File driverDir) throws IOException {
-        //return new ServerManager(driverDir);
-        throw new RuntimeException("ServerManager.createPOJO not implemented.");
-    }
-
-    static ServerManager cached;
-
-    public static boolean isOSGi() {
-    	try {
-    		ServerManager.class.getClassLoader().loadClass("org.osgi.framework.Bundle");
-    		return true;
-    	} catch (ClassNotFoundException e) {
-    		return false;
-    	}
-    }
-
-    public synchronized static ServerManager getServerManager() {
-    	if (cached!=null) return cached;
-    	try {
-    		try {
-    			return createOSGI();
-    		} catch(RuntimeException e) {
-    			return createPOJO();
-    		}
-    	} catch (IOException e) {
-    		throw new RuntimeException(e);
-    	}
-    }
-
-
-    /**
-     * Extracts drivers files to a location.
-     *
-     * @param path location where to extract application files
-     * @throws IOException
-     */
-	public static void extractDrivers(File path)
-	throws IOException
-	{
-		// Extract org.simantics.db.build.zip to workspace
-		InputStream is = ServerManager.class.getResource("org.simantics.db.build.zip").openStream();
-		try {
-			extractZip(is, path);
-		} finally {
-			is.close();
-		}
-	}
-
-    /**
-     * Extract a zip file into a directory
-     *
-     * @param zipInput
-     * @param dst directory
-     * @throws IOException
-     */
-    private static void extractZip(InputStream zipInput, File dst) throws IOException {
-        byte[] buf = new byte[8192];
-        ZipInputStream zis = new ZipInputStream(zipInput);
-        ZipEntry entry;
-
-        entry = zis.getNextEntry();
-        while (entry != null) {
-            // for each entry to be extracted
-            String name = entry.getName();
-            LOGGER.debug("Extracting "+name);
-            File file = new File(dst, name);
-
-            if (entry.isDirectory())
-            {
-                if ( !file.exists() ) file.mkdirs();
-            } else {
-                File parent = file.getParentFile();
-                if (!parent.exists()) parent.mkdirs();
-                if (!file.exists()) file.createNewFile();
-
-                FileOutputStream fileoutputstream = new FileOutputStream(file);
-                try {
-                    int n = 0;
-                    while ((n = zis.read(buf, 0, buf.length)) > -1)
-                        fileoutputstream.write(buf, 0, n);
-                } finally {
-                    fileoutputstream.close();
-                }
-            }
-
-            zis.closeEntry();
-            entry = zis.getNextEntry();
-        }// while
-
-        zis.close();
-    }
-
-
-}
 
+}
\ No newline at end of file