Menu
▾
▴
[CIShell-SVN] SF.net SVN: cishell: [103] trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting
|
From: <bh...@us...> - 2006-07-28 20:08:39
|
Revision: 103 Author: bh2 Date: 2006-07-27 09:36:50 -0700 (Thu, 27 Jul 2006) ViewCVS: http://svn.sourceforge.net/cishell/?rev=103&view=rev Log Message: ----------- * cleaned up the reference remoting code a little bit Modified Paths: -------------- trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/CIShellClient.java trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/CIShellServer.java trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/ObjectRegistry.java trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/RemotingClient.java trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/client/DataModelRegistryClient.java trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/frontend/CIShellClientAlg.java trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/AlgorithmFactoryRegistryServer.java trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/service/conversion/RemoteDataConversionServiceServer.java trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/service/guibuilder/RemoteGUIBuilder.java trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/service/prefs/RemotePreferencesService.java Removed Paths: ------------- trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/service/prefs/RemotePreferences.java Modified: trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/CIShellClient.java =================================================================== --- trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/CIShellClient.java 2006-07-26 20:12:33 UTC (rev 102) +++ trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/CIShellClient.java 2006-07-27 16:36:50 UTC (rev 103) @@ -188,7 +188,7 @@ if ("AlgServiceListener".equalsIgnoreCase( (String)inEvent.get(CIShellEventConstants.TARGET_SERVICE))){ - updateAlgs(event); + processAlgEvent(event); } else { eventAdmin.postEvent(event); } @@ -196,7 +196,7 @@ } } - private void updateAlgs(Event inEvent) { + private void processAlgEvent(Event inEvent) { String pid = (String) inEvent.getProperty(Constants.SERVICE_PID); String event = ((String) inEvent.getProperty(CIShellEventConstants.EVENT_TYPE)); Modified: trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/CIShellServer.java =================================================================== --- trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/CIShellServer.java 2006-07-26 20:12:33 UTC (rev 102) +++ trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/CIShellServer.java 2006-07-27 16:36:50 UTC (rev 103) @@ -39,10 +39,7 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceRegistration; -/** - * - * @author Bruce Herr (bh...@bh...) - */ + public class CIShellServer { private BundleContext bContext; private List services; Modified: trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/ObjectRegistry.java =================================================================== --- trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/ObjectRegistry.java 2006-07-26 20:12:33 UTC (rev 102) +++ trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/ObjectRegistry.java 2006-07-27 16:36:50 UTC (rev 103) @@ -16,10 +16,7 @@ import java.util.HashMap; import java.util.Map; -/** - * - * @author Bruce Herr (bh...@bh...) - */ + public class ObjectRegistry { long lastID; Map idToObjectMap; Modified: trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/RemotingClient.java =================================================================== --- trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/RemotingClient.java 2006-07-26 20:12:33 UTC (rev 102) +++ trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/RemotingClient.java 2006-07-27 16:36:50 UTC (rev 103) @@ -16,6 +16,7 @@ import java.io.PrintWriter; import java.io.StringWriter; import java.lang.reflect.Array; +import java.util.Arrays; import java.util.Dictionary; import java.util.Enumeration; import java.util.HashMap; @@ -32,10 +33,6 @@ import org.ksoap2.transport.HttpTransportSE; -/** - * - * @author Bruce Herr (bh...@bh...) - */ public class RemotingClient { public static final String NULL_STR = "@@NULL@@"; @@ -61,8 +58,8 @@ slowCache = new CacheMap(10000); } - protected void setCacheing(String command, boolean fastCacheing) { - if (fastCacheing) { + protected void setCacheing(String command, boolean doFastCacheing) { + if (doFastCacheing) { caches.put(command, fastCache); } else { caches.put(command, slowCache); @@ -74,7 +71,7 @@ endpoint = host + servicePath; httpTransport = new HttpTransportSE(endpoint); - httpTransport.debug = true; + httpTransport.debug = bDebug; soapEnvelope = new SoapSerializationEnvelope(SoapEnvelope.VER12); new MarshalHashtable().register(soapEnvelope); @@ -131,10 +128,8 @@ new MarshalHashtable().register(soapEnvelope); new MarshalBase64().register(soapEnvelope); - SoapObject rpc = new SoapObject( - "http://www.w3.org/2001/12/soap-envelope", opName); -// SoapObject rpc = new SoapObject( -// "http://schemas.xmlsoap.org/soap/envelope/", opName); + SoapObject rpc = new SoapObject( + "http://www.w3.org/2001/12/soap-envelope", opName); for (int i = 0; i < params.length; i++) { if (bDebug) @@ -156,11 +151,9 @@ } return r; } catch (Exception e) { - e.printStackTrace(); throw new NestedRuntimeException("Failed to call " + opName + ": ", e); } - } protected long[] toLongArray(Object obj) { @@ -216,7 +209,20 @@ //TODO: better hashtable parsing for (Enumeration i = dict.keys(); i.hasMoreElements() ;) { Object key = i.nextElement().toString(); - ht.put(key, "" + dict.get(key)); + + Object value = dict.get(key); + + if (value instanceof Vector) { + + } else if (value instanceof Dictionary) { + value = toHashtable(dict); + } else if (value instanceof String[]) { + value = new Vector(Arrays.asList((String[])value)); + } else { + value = "" + value; + } + + ht.put(key, value); } return ht; Modified: trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/client/DataModelRegistryClient.java =================================================================== --- trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/client/DataModelRegistryClient.java 2006-07-26 20:12:33 UTC (rev 102) +++ trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/client/DataModelRegistryClient.java 2006-07-27 16:36:50 UTC (rev 103) @@ -130,16 +130,11 @@ } else { Hashtable properties = null; if (dm.getMetaData() != null) { - properties = new Hashtable(dm.getMetaData().size()); - for (Enumeration i = dm.getMetaData().keys(); i.hasMoreElements(); ) { - Object key = i.nextElement(); - properties.put(key, dm.getMetaData().get(key).toString()); - } + properties = toHashtable(dm.getMetaData()); } else { properties = new Hashtable(); } - //find file-friendly format to convert to String format = dm.getFormat(); String finalOutFormat = null; @@ -289,20 +284,12 @@ out.write(raw); out.close(); - data = file; + DataModel dm = new BasicDataModel(new Hashtable(), + file, inFormat); + dm = convert[0].convert(dm); - Dictionary props = new Hashtable(); - - DataModel[] dm = new DataModel[] { - new BasicDataModel(props, data, inFormat) - }; - - AlgorithmFactory factory = convert[0].getAlgorithmFactory(); - Algorithm alg = factory.createAlgorithm(dm, new Hashtable(), ciContext); - dm = alg.execute(); - if (dm != null) { - data = dm[0].getData(); + data = dm.getData(); } } } catch (IOException e) { Modified: trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/frontend/CIShellClientAlg.java =================================================================== --- trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/frontend/CIShellClientAlg.java 2006-07-26 20:12:33 UTC (rev 102) +++ trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/frontend/CIShellClientAlg.java 2006-07-27 16:36:50 UTC (rev 103) @@ -53,8 +53,6 @@ int port = ((Integer) parameters.get("org.cishell.reference.remoting.frontend.client.port")).intValue(); new ClientInstanceAlg(bContext, context).connect(host, port); -// new ClientInstanceAlg(bContext).connect("localhost", 8180); - return null; }}; Modified: trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/AlgorithmFactoryRegistryServer.java =================================================================== --- trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/AlgorithmFactoryRegistryServer.java 2006-07-26 20:12:33 UTC (rev 102) +++ trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/AlgorithmFactoryRegistryServer.java 2006-07-27 16:36:50 UTC (rev 103) @@ -13,6 +13,7 @@ * ***************************************************************************/ package org.cishell.reference.remoting.server; +import java.util.Arrays; import java.util.HashMap; import java.util.Hashtable; import java.util.Map; @@ -71,9 +72,6 @@ DataModel[] dm = dmReg.getDataModels(dataModelIDs); CIShellContext ciContext = null; - //TODO: fix dictionary parsing - //long mtpID = createParameters(servicePID, dataModelIDs); - //dictionary = mtpReg.parseDictionary(mtpID, "-1", dictionary); synchronized (sidToContextMap) { ciContext = (CIShellContext) sidToContextMap.get(sessionID); @@ -83,6 +81,8 @@ } } + //TODO: should parse the given hashtable since values may need to + //be changed to different types (Vector->String[], etc...) Algorithm alg = factory.createAlgorithm(dm, dictionary, ciContext); if (alg != null) { algID = algReg.registerAlgorithm(alg); @@ -129,7 +129,17 @@ String[] keys = refs[0].getPropertyKeys(); for (int i=0; i < keys.length; i++) { - ht.put(keys[i], ""+refs[0].getProperty(keys[i])); + Object value = refs[0].getProperty(keys[i]); + + if (value instanceof Vector) { + + } else if (value instanceof String[]) { + value = new Vector(Arrays.asList((String[])value)); + } else { + value = "" + value; + } + + ht.put(keys[i], value); } return ht; Modified: trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/service/conversion/RemoteDataConversionServiceServer.java =================================================================== --- trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/service/conversion/RemoteDataConversionServiceServer.java 2006-07-26 20:12:33 UTC (rev 102) +++ trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/service/conversion/RemoteDataConversionServiceServer.java 2006-07-27 16:36:50 UTC (rev 103) @@ -91,16 +91,17 @@ return null; } + /** + * @see org.cishell.remoting.service.conversion.RemoteDataConversionService#getConversions(java.lang.String, java.lang.String) + */ public Vector getConversions(String dataModelID, String outFormat) { DataModelRegistry dmRegistry = (DataModelRegistry) dmReg.getService(); - DataConversionService converter = getConverter(); + DataModel dm = dmRegistry.getDataModel(dataModelID); Set conversions = new HashSet(); - Vector formats = dmRegistry.getDataFormats(dataModelID); - for (Iterator i=formats.iterator(); i.hasNext(); ) { - String inFormat = (String) i.next(); + if (dm != null) { + Converter[] converters = getConverter().findConverters(dm, outFormat); - Converter[] converters = converter.findConverters(inFormat, outFormat); for (int j=0; j < converters.length; j++) { conversions.add(converters[j].getProperties().get(AlgorithmProperty.OUT_DATA)); } Modified: trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/service/guibuilder/RemoteGUIBuilder.java =================================================================== --- trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/service/guibuilder/RemoteGUIBuilder.java 2006-07-26 20:12:33 UTC (rev 102) +++ trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/service/guibuilder/RemoteGUIBuilder.java 2006-07-27 16:36:50 UTC (rev 103) @@ -22,6 +22,7 @@ import org.osgi.service.metatype.MetaTypeProvider; /** + * TODO: Finish this class and integrate it. * * @author Bruce Herr (bh...@bh...) */ @@ -35,7 +36,6 @@ * @see org.cishell.service.guibuilder.GUIBuilderService#createGUI(java.lang.String, org.osgi.service.metatype.MetaTypeProvider) */ public GUI createGUI(String id, MetaTypeProvider parameters) { - return null; } @@ -43,7 +43,6 @@ * @see org.cishell.service.guibuilder.GUIBuilderService#createGUIandWait(java.lang.String, org.osgi.service.metatype.MetaTypeProvider) */ public Dictionary createGUIandWait(String id, MetaTypeProvider parameters) { - // TODO Auto-generated method stub return null; } @@ -51,7 +50,6 @@ * @see org.cishell.service.guibuilder.GUIBuilderService#showConfirm(java.lang.String, java.lang.String, java.lang.String) */ public boolean showConfirm(String title, String message, String detail) { - // TODO Auto-generated method stub return false; } @@ -59,31 +57,24 @@ * @see org.cishell.service.guibuilder.GUIBuilderService#showError(java.lang.String, java.lang.String, java.lang.String) */ public void showError(String title, String message, String detail) { - // TODO Auto-generated method stub - } /** * @see org.cishell.service.guibuilder.GUIBuilderService#showError(java.lang.String, java.lang.String, java.lang.Throwable) */ public void showError(String title, String message, Throwable error) { - // TODO Auto-generated method stub - } /** * @see org.cishell.service.guibuilder.GUIBuilderService#showInformation(java.lang.String, java.lang.String, java.lang.String) */ public void showInformation(String title, String message, String detail) { - // TODO Auto-generated method stub - } /** * @see org.cishell.service.guibuilder.GUIBuilderService#showQuestion(java.lang.String, java.lang.String, java.lang.String) */ public boolean showQuestion(String title, String message, String detail) { - // TODO Auto-generated method stub return false; } @@ -91,8 +82,5 @@ * @see org.cishell.service.guibuilder.GUIBuilderService#showWarning(java.lang.String, java.lang.String, java.lang.String) */ public void showWarning(String title, String message, String detail) { - // TODO Auto-generated method stub - } - } Deleted: trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/service/prefs/RemotePreferences.java =================================================================== --- trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/service/prefs/RemotePreferences.java 2006-07-26 20:12:33 UTC (rev 102) +++ trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/service/prefs/RemotePreferences.java 2006-07-27 16:36:50 UTC (rev 103) @@ -1,233 +0,0 @@ -/* **************************************************************************** - * CIShell: Cyberinfrastructure Shell, An Algorithm Integration Framework. - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the Apache License v2.0 which accompanies - * this distribution, and is available at: - * http://www.apache.org/licenses/LICENSE-2.0.html - * - * Created on Jul 13, 2006 at Indiana University. - * - * Contributors: - * Indiana University - - * ***************************************************************************/ -package org.cishell.reference.remoting.server.service.prefs; - -import org.osgi.service.prefs.BackingStoreException; -import org.osgi.service.prefs.Preferences; - -/** - * - * @author Bruce Herr (bh...@bh...) - */ -public class RemotePreferences implements Preferences { - - /** - * @see org.osgi.service.prefs.Preferences#absolutePath() - */ - public String absolutePath() { - // TODO Auto-generated method stub - return null; - } - - /** - * @see org.osgi.service.prefs.Preferences#childrenNames() - */ - public String[] childrenNames() throws BackingStoreException { - // TODO Auto-generated method stub - return null; - } - - /** - * @see org.osgi.service.prefs.Preferences#clear() - */ - public void clear() throws BackingStoreException { - // TODO Auto-generated method stub - - } - - /** - * @see org.osgi.service.prefs.Preferences#flush() - */ - public void flush() throws BackingStoreException { - // TODO Auto-generated method stub - - } - - /** - * @see org.osgi.service.prefs.Preferences#get(java.lang.String, java.lang.String) - */ - public String get(String key, String def) { - // TODO Auto-generated method stub - return null; - } - - /** - * @see org.osgi.service.prefs.Preferences#getBoolean(java.lang.String, boolean) - */ - public boolean getBoolean(String key, boolean def) { - // TODO Auto-generated method stub - return false; - } - - /** - * @see org.osgi.service.prefs.Preferences#getByteArray(java.lang.String, byte[]) - */ - public byte[] getByteArray(String key, byte[] def) { - // TODO Auto-generated method stub - return null; - } - - /** - * @see org.osgi.service.prefs.Preferences#getDouble(java.lang.String, double) - */ - public double getDouble(String key, double def) { - // TODO Auto-generated method stub - return 0; - } - - /** - * @see org.osgi.service.prefs.Preferences#getFloat(java.lang.String, float) - */ - public float getFloat(String key, float def) { - // TODO Auto-generated method stub - return 0; - } - - /** - * @see org.osgi.service.prefs.Preferences#getInt(java.lang.String, int) - */ - public int getInt(String key, int def) { - // TODO Auto-generated method stub - return 0; - } - - /** - * @see org.osgi.service.prefs.Preferences#getLong(java.lang.String, long) - */ - public long getLong(String key, long def) { - // TODO Auto-generated method stub - return 0; - } - - /** - * @see org.osgi.service.prefs.Preferences#keys() - */ - public String[] keys() throws BackingStoreException { - // TODO Auto-generated method stub - return null; - } - - /** - * @see org.osgi.service.prefs.Preferences#name() - */ - public String name() { - // TODO Auto-generated method stub - return null; - } - - /** - * @see org.osgi.service.prefs.Preferences#node(java.lang.String) - */ - public Preferences node(String pathName) { - // TODO Auto-generated method stub - return null; - } - - /** - * @see org.osgi.service.prefs.Preferences#nodeExists(java.lang.String) - */ - public boolean nodeExists(String pathName) throws BackingStoreException { - // TODO Auto-generated method stub - return false; - } - - /** - * @see org.osgi.service.prefs.Preferences#parent() - */ - public Preferences parent() { - // TODO Auto-generated method stub - return null; - } - - /** - * @see org.osgi.service.prefs.Preferences#put(java.lang.String, java.lang.String) - */ - public void put(String key, String value) { - // TODO Auto-generated method stub - - } - - /** - * @see org.osgi.service.prefs.Preferences#putBoolean(java.lang.String, boolean) - */ - public void putBoolean(String key, boolean value) { - // TODO Auto-generated method stub - - } - - /** - * @see org.osgi.service.prefs.Preferences#putByteArray(java.lang.String, byte[]) - */ - public void putByteArray(String key, byte[] value) { - // TODO Auto-generated method stub - - } - - /** - * @see org.osgi.service.prefs.Preferences#putDouble(java.lang.String, double) - */ - public void putDouble(String key, double value) { - // TODO Auto-generated method stub - - } - - /** - * @see org.osgi.service.prefs.Preferences#putFloat(java.lang.String, float) - */ - public void putFloat(String key, float value) { - // TODO Auto-generated method stub - - } - - /** - * @see org.osgi.service.prefs.Preferences#putInt(java.lang.String, int) - */ - public void putInt(String key, int value) { - // TODO Auto-generated method stub - - } - - /** - * @see org.osgi.service.prefs.Preferences#putLong(java.lang.String, long) - */ - public void putLong(String key, long value) { - // TODO Auto-generated method stub - - } - - /** - * @see org.osgi.service.prefs.Preferences#remove(java.lang.String) - */ - public void remove(String key) { - // TODO Auto-generated method stub - - } - - /** - * @see org.osgi.service.prefs.Preferences#removeNode() - */ - public void removeNode() throws BackingStoreException { - // TODO Auto-generated method stub - - } - - /** - * @see org.osgi.service.prefs.Preferences#sync() - */ - public void sync() throws BackingStoreException { - // TODO Auto-generated method stub - - } - -} Modified: trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/service/prefs/RemotePreferencesService.java =================================================================== --- trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/service/prefs/RemotePreferencesService.java 2006-07-26 20:12:33 UTC (rev 102) +++ trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/service/prefs/RemotePreferencesService.java 2006-07-27 16:36:50 UTC (rev 103) @@ -22,7 +22,7 @@ import org.osgi.service.prefs.PreferencesService; import org.osgi.util.tracker.ServiceTracker; -//TODO: Finish making this class.. +//TODO: Finish making remote prefrences class.. public class RemotePreferencesService extends AbstractEventConsumerProducer { ServiceTracker localPrefs; String[] users; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
