Commit f09e0c2f authored by Gwenael Cattez's avatar Gwenael Cattez

Reflect changes from introspection-impl module to introspection-fscript-impl

parent a34b5aaf
......@@ -41,7 +41,7 @@ import org.ow2.frascati.fscript.model.ScaComponentNode;
import org.ow2.frascati.fscript.model.ScaReferenceNode;
import org.ow2.frascati.fscript.model.ScaServiceNode;
import org.ow2.frascati.remote.introspection.resources.Node;
import org.ow2.frascati.remote.introspection.util.ResourceUtilImpl;
import org.ow2.frascati.remote.introspection.util.ResourceUtilItf;
/**
* This SCA component is used to enable remote introspection and reconfiguration
......@@ -53,6 +53,11 @@ public class ReconfigurationImpl implements Reconfiguration
/** A reference to the FraSCAti FScript engine */
@Reference(name = "fscript-engine")
protected InvocableScriptEngine engine;
/** A reference to the remote ResourceUtil service */
@Reference(name = "resourceUtil")
protected ResourceUtilItf resourceUtil;
/** The logger */
public final static Logger log = Logger.getLogger(ReconfigurationImpl.class.getCanonicalName());
......@@ -75,15 +80,15 @@ public class ReconfigurationImpl implements Reconfiguration
{
if (obj instanceof ScaComponentNode)
{
return ResourceUtilImpl.getFullComponentResource(((ScaComponentNode) obj).getComponent());
return resourceUtil.getFullComponentResource(((ScaComponentNode) obj).getComponent());
}
if (obj instanceof ScaServiceNode)
{
return ResourceUtilImpl.getPortResource(((ScaServiceNode) obj).getInterface());
return resourceUtil.getPortResource(((ScaServiceNode) obj).getInterface());
}
if (obj instanceof ScaReferenceNode)
{
return ResourceUtilImpl.getPortResource(((ScaReferenceNode) obj).getInterface());
return resourceUtil.getPortResource(((ScaReferenceNode) obj).getInterface());
}
Node node = new Node();
......
......@@ -41,6 +41,10 @@
<reference name="fscript-engine">
<interface.java interface="org.objectweb.fractal.fscript.jsr223.InvocableScriptEngine"/>
</reference>
<reference name="resourceUtil">
<interface.java interface="org.ow2.frascati.remote.introspection.util.ResourceUtilItf"/>
</reference>
</component>
<wire source="reconfig/resourceUtil" target="resourceUtil/util"></wire>
</composite>
......@@ -31,6 +31,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Enumeration;
import java.util.logging.Logger;
import java.util.zip.ZipEntry;
import java.util.zip.ZipException;
import java.util.zip.ZipFile;
......@@ -38,14 +39,12 @@ import java.util.zip.ZipFile;
import org.apache.cxf.common.util.Base64Exception;
import org.apache.cxf.common.util.Base64Utility;
import com.sun.istack.logging.Logger;
/**
* Utility class providing convenient ways to handle Files.
*/
public class FileUtil
{
private static final Logger logger=Logger.getLogger(FileUtil.class);
private static final Logger logger=Logger.getLogger(FileUtil.class.getName());
public final static String JAR_ENTRIES_SEPARATOR="%S%";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment