Commit 039cc878 authored by yannick legoc's avatar yannick legoc
Browse files

removed Controller.idl, Driver.idl and Servant.idl

parent d3f7691a
...@@ -60,21 +60,6 @@ ...@@ -60,21 +60,6 @@
<arg line="${idlFlags} ${idlCoreDir}/ServantManager.idl" /> <arg line="${idlFlags} ${idlCoreDir}/ServantManager.idl" />
</exec> </exec>
<echo message="Generating Servant.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCoreDir}/Servant.idl" />
</exec>
<echo message="Generating Controller.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCoreDir}/Controller.idl" />
</exec>
<echo message="Generating Driver.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCoreDir}/Driver.idl" />
</exec>
<echo message="Generating DatabaseAccessor.java" /> <echo message="Generating DatabaseAccessor.java" />
<exec executable="idl"> <exec executable="idl">
<arg line="${idlFlags} ${idlCoreDir}/DatabaseAccessor.idl" /> <arg line="${idlFlags} ${idlCoreDir}/DatabaseAccessor.idl" />
......
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
package fr.ill.ics.nscclient.servant; package fr.ill.ics.nscclient.servant;
import fr.ill.ics.nomadserver.core.Controller;
public class CorbaController extends CorbaServant { public class CorbaController extends CorbaServant {
......
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
package fr.ill.ics.nscclient.servant; package fr.ill.ics.nscclient.servant;
import fr.ill.ics.nomadserver.core.Driver;
public class CorbaDriver extends CorbaServant { public class CorbaDriver extends CorbaServant {
......
...@@ -18,8 +18,6 @@ ...@@ -18,8 +18,6 @@
package fr.ill.ics.nscclient.servant; package fr.ill.ics.nscclient.servant;
import java.util.ArrayList;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
...@@ -30,16 +28,6 @@ import fr.ill.ics.bridge.listeners.ServerProgressChangeListener; ...@@ -30,16 +28,6 @@ import fr.ill.ics.bridge.listeners.ServerProgressChangeListener;
import fr.ill.ics.bridge.listeners.ServerPropertyChangeListener; import fr.ill.ics.bridge.listeners.ServerPropertyChangeListener;
import fr.ill.ics.bridge.listeners.ServerResetCommandListener; import fr.ill.ics.bridge.listeners.ServerResetCommandListener;
import fr.ill.ics.core.command.CommandAction; import fr.ill.ics.core.command.CommandAction;
import fr.ill.ics.nomadserver.common.ListItem;
import fr.ill.ics.nomadserver.common.ListIterator;
import fr.ill.ics.nomadserver.core.Servant;
import fr.ill.ics.nomadserver.core.ServantPackage.IteratorFailureException;
import fr.ill.ics.nomadserver.dataprovider.ChildServantDescriptor;
import fr.ill.ics.nomadserver.dataprovider.ChildServantDescriptorHelper;
import fr.ill.ics.nomadserver.dataprovider.CommandDescriptor;
import fr.ill.ics.nomadserver.dataprovider.CommandDescriptorHelper;
import fr.ill.ics.nomadserver.dataprovider.PropertyDescriptor;
import fr.ill.ics.nomadserver.dataprovider.PropertyDescriptorHelper;
import fr.ill.ics.nscclient.dataprovider.CommandDatabase; import fr.ill.ics.nscclient.dataprovider.CommandDatabase;
import fr.ill.ics.nscclient.dataprovider.DataAccessor; import fr.ill.ics.nscclient.dataprovider.DataAccessor;
import fr.ill.ics.nscclient.dataprovider.DataAccessor.ClientCommandState; import fr.ill.ics.nscclient.dataprovider.DataAccessor.ClientCommandState;
......
...@@ -20,7 +20,6 @@ package fr.ill.ics.nscclient.servant; ...@@ -20,7 +20,6 @@ package fr.ill.ics.nscclient.servant;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
...@@ -31,21 +30,14 @@ import java.util.Map; ...@@ -31,21 +30,14 @@ import java.util.Map;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import fr.ill.ics.core.property.PropertyManager; import fr.ill.ics.core.property.PropertyManager;
import fr.ill.ics.nomadserver.common.ListItem;
import fr.ill.ics.nomadserver.common.ListIterator;
import fr.ill.ics.nomadserver.configuration.ServantDataConfiguration; import fr.ill.ics.nomadserver.configuration.ServantDataConfiguration;
import fr.ill.ics.nomadserver.configuration.ServantDataConfiguration.ServantData; import fr.ill.ics.nomadserver.configuration.ServantDataConfiguration.ServantData;
import fr.ill.ics.nomadserver.configuration.ServantDataConfiguration.ServantDataUpdate; import fr.ill.ics.nomadserver.configuration.ServantDataConfiguration.ServantDataUpdate;
import fr.ill.ics.nomadserver.configuration.ServantDataConfiguration.ServantDynamicProperties; import fr.ill.ics.nomadserver.configuration.ServantDataConfiguration.ServantDynamicProperties;
import fr.ill.ics.nomadserver.core.Driver;
import fr.ill.ics.nomadserver.core.ServantManager; import fr.ill.ics.nomadserver.core.ServantManager;
import fr.ill.ics.nomadserver.core.DriverPackage.DriverMode;
import fr.ill.ics.nomadserver.core.ServantManagerPackage.IteratorFailureException;
import fr.ill.ics.nomadserver.core.ServantManagerPackage.NoSuchServantException; import fr.ill.ics.nomadserver.core.ServantManagerPackage.NoSuchServantException;
import fr.ill.ics.nomadserver.core.ServantManagerPackage.ServantCreationException; import fr.ill.ics.nomadserver.core.ServantManagerPackage.ServantCreationException;
import fr.ill.ics.nomadserver.core.ServantManagerPackage.ServantRemovalException; import fr.ill.ics.nomadserver.core.ServantManagerPackage.ServantRemovalException;
import fr.ill.ics.nomadserver.dataprovider.ServantDescriptor;
import fr.ill.ics.nomadserver.dataprovider.ServantDescriptorHelper;
import fr.ill.ics.nscclient.dataprovider.CommandDatabase; import fr.ill.ics.nscclient.dataprovider.CommandDatabase;
import fr.ill.ics.nscclient.dataprovider.PropertyDatabase; import fr.ill.ics.nscclient.dataprovider.PropertyDatabase;
import fr.ill.ics.nscclient.dataprovider.ServantDatabase; import fr.ill.ics.nscclient.dataprovider.ServantDatabase;
......
...@@ -24,7 +24,6 @@ import java.util.Map; ...@@ -24,7 +24,6 @@ import java.util.Map;
import fr.ill.ics.bridge.scan.IParameterizableScan1D; import fr.ill.ics.bridge.scan.IParameterizableScan1D;
import fr.ill.ics.core.property.Property; import fr.ill.ics.core.property.Property;
import fr.ill.ics.nomadserver.core.Controller;
import fr.ill.ics.nscclient.servant.ClientServantDescriptor; import fr.ill.ics.nscclient.servant.ClientServantDescriptor;
import fr.ill.ics.nscclient.servant.CorbaController; import fr.ill.ics.nscclient.servant.CorbaController;
import fr.ill.ics.util.ConfigManager; import fr.ill.ics.util.ConfigManager;
......
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