[CIShell-SVN] SF.net SVN: cishell: [716] trunk/clients/scripting/org.cishell.reference. scripting

[<bh...@us...>]

Revision: 716
          http://cishell.svn.sourceforge.net/cishell/?rev=716&view=rev
Author:   bh2
Date:     2008-03-26 06:30:42 -0700 (Wed, 26 Mar 2008)

Log Message:
-----------
updated scripting layer to be cishell 1.0 compatible

Modified Paths:
--------------
    trunk/clients/scripting/org.cishell.reference.scripting/META-INF/MANIFEST.MF
    trunk/clients/scripting/org.cishell.reference.scripting/src/org/cishell/reference/scripting/test.py
    trunk/clients/scripting/org.cishell.reference.scripting/src/org/cishell/reference/scripting/test2.py

Modified: trunk/clients/scripting/org.cishell.reference.scripting/META-INF/MANIFEST.MF
===================================================================
--- trunk/clients/scripting/org.cishell.reference.scripting/META-INF/MANIFEST.MF	2008-03-25 21:08:31 UTC (rev 715)
+++ trunk/clients/scripting/org.cishell.reference.scripting/META-INF/MANIFEST.MF	2008-03-26 13:30:42 UTC (rev 716)
@@ -2,12 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Reference Scripting Client
 Bundle-SymbolicName: org.cishell.reference.scripting
-Bundle-Version: 0.0.1
+Bundle-Version: 1.0.0
 Bundle-Activator: org.cishell.reference.scripting.Activator
-Bundle-Localization: plugin
-Import-Package: org.cishell.framework,
- org.cishell.framework.algorithm,
- org.cishell.framework.data,
+Import-Package: org.cishell.framework;version="1.0.0",
+ org.cishell.framework.algorithm;version="1.0.0",
+ org.cishell.framework.data;version="1.0.0",
  org.osgi.framework;version="1.3.0",
  org.osgi.service.log;version="1.3.0",
  org.python.core,

Modified: trunk/clients/scripting/org.cishell.reference.scripting/src/org/cishell/reference/scripting/test.py
===================================================================
--- trunk/clients/scripting/org.cishell.reference.scripting/src/org/cishell/reference/scripting/test.py	2008-03-25 21:08:31 UTC (rev 715)
+++ trunk/clients/scripting/org.cishell.reference.scripting/src/org/cishell/reference/scripting/test.py	2008-03-26 13:30:42 UTC (rev 716)
@@ -15,11 +15,11 @@
 def getService(service):
     return bContext.getService(bContext.getServiceReference(str(service)))
 
-from org.cishell.framework.datamodel import BasicDataModel
+from org.cishell.framework.data import BasicData
 
 refs = findAlgorithms()
 factory = getAlgorithm(refs[2])
-alg = factory.createAlgorithm([BasicDataModel(None)],Hashtable(),ciContext)
+alg = factory.createAlgorithm([BasicData(None)],Hashtable(),ciContext)
 dm1 = alg.execute()
 
 dm2 = [BasicDataModel("100"),]

Modified: trunk/clients/scripting/org.cishell.reference.scripting/src/org/cishell/reference/scripting/test2.py
===================================================================
--- trunk/clients/scripting/org.cishell.reference.scripting/src/org/cishell/reference/scripting/test2.py	2008-03-25 21:08:31 UTC (rev 715)
+++ trunk/clients/scripting/org.cishell.reference.scripting/src/org/cishell/reference/scripting/test2.py	2008-03-26 13:30:42 UTC (rev 716)
@@ -11,14 +11,14 @@
 def getService(service):
     return bContext.getService(bContext.getServiceReference(str(service)))
 
-from org.cishell.framework.datamodel import BasicDataModel
+from org.cishell.framework.data import BasicData
 
 
 refs = findAlgorithms("(service.pid=org.cishell.tests.conversion1.algA)")
 factory = getAlgorithm(refs[0])
 ht = Hashtable()
 ht["org.cishell.tests.conversion1.AlgA.myInput"] = "100"
-alg = factory.createAlgorithm([BasicDataModel(None)],ht,ciContext)
+alg = factory.createAlgorithm([],ht,ciContext)
 dm1 = alg.execute()
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.