Skip to content

GitLab

Commit 35987fca authored by yannick legoc's avatar yannick legoc
Browse files

Mavenization

parent 40ee5151
Expand all Show whitespace changes
Inline Side-by-side
.classpath
View file @ 35987fca
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib64/avalon-framework-4.2.0.jar"/>
<classpathentry kind="lib" path="lib64/jacorb.jar"/>
<classpathentry kind="lib" path="lib64/logkit-2.0.jar"/>
<classpathentry kind="lib" path="lib64/protobuf-2.5.0.jar"/>
<classpathentry kind="output" path="bin"/>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
.classpath32 deleted 100644 → 0
View file @ 40ee5151
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/avalon-framework-4.1.5.jar"/>
<classpathentry kind="lib" path="lib/jacorb.jar"/>
<classpathentry kind="lib" path="lib/logkit-1.2.jar"/>
<classpathentry kind="lib" path="lib/protobuf-java-2.5.0.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
.project
View file @ 35987fca
......@@ -10,8 +10,14 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
build.xml deleted 100644 → 0
View file @ 40ee5151
<?xml version="1.0"?>
<project name="NomadCommandSystem">
<property name="src" value="src" />
<property name="classes" value="bin" />
<property name="lib64" value="lib64"/>
<property name="lib" value="lib"/>
<property environment="env" />
<property name="idlCommonDir" value="${env.NOMAD_HOME}/src/common/corba/idl/common" />
<property name="idlDataProviderDir" value="${env.NOMAD_HOME}/src/common/corba/idl/dataprovider" />
<property name="idlCoreDir" value="${env.NOMAD_HOME}/src/common/corba/idl/core" />
<property name="idlClientDir" value="${env.NOMAD_HOME}/src/common/corba/idl/client" />
<property name="idlNomadClientLibDir" value="${env.NOMADCLIENT_HOME}/lib/common" />
<property name="idlNomadClientLib64Dir" value="${env.NOMADCLIENT_HOME}/lib64/common" />
<property name="clientSrcDir" value="${env.NOMADCLIENT_HOME}/src" />
<property name="serverSrcDir" value="${env.NOMAD_HOME}/src" />
<property name="serverLibDir" value="${env.NOMAD_HOME}/lib" />
<property name="clientCalculatorLibDir" value="${env.NOMADCLIENT_HOME}/lib/common/calculator" />
<property name="clientCalculatorLib64Dir" value="${env.NOMADCLIENT_HOME}/lib64/common/calculator" />
<property name="idlFlags" value="-d ${src} -sloppy_forward" />
<property name="protoFlags" value="-I${env.NOMAD_HOME}/src/common/protobuf/proto --java_out=${src}"/>
<property name="protoDir" value="${env.NOMAD_HOME}/src/common/protobuf/proto"/>
<target name="init">
<!-- Create the time stamp -->
<tstamp />
<!-- Create directories for project distribution -->
<echo message="Creation classes directory" />
<mkdir dir="${classes}" />
</target>
<target name="idl" depends="init">
<delete dir="${src}/fr/ill/ics/nomadserver" />
<!-- core -->
<echo message="Generating CORBA files" />
<echo message="" />
<echo message="Generating ConnectionToken.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlClientDir}/ConnectionToken.idl" />
</exec>
<echo message="Generating SessionManager.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCoreDir}/SessionManager.idl" />
</exec>
<echo message="Generating SessionGateway.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCoreDir}/SessionGateway.idl" />
</exec>
<echo message="Generating ServantManager.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCoreDir}/ServantManager.idl" />
</exec>
<echo message="Generating DatabaseAccessor.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCoreDir}/DatabaseAccessor.idl" />
</exec>
<echo message="Generating CommandZoneAccessor.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCoreDir}/commandzone/CommandZoneAccessor.idl" />
</exec>
<echo message="Generating CommandBoxAccessor.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCoreDir}/commandzone/CommandBoxAccessor.idl" />
</exec>
<echo message="Generating AtomicCommandBoxAccessor.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCoreDir}/commandzone/AtomicCommandBoxAccessor.idl" />
</exec>
<echo message="Generating ScanCommandBoxAccessor.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCoreDir}/commandzone/ScanCommandBoxAccessor.idl" />
</exec>
<echo message="Generating ForLoopCommandBoxAccessor.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCoreDir}/commandzone/ForLoopCommandBoxAccessor.idl" />
</exec>
<echo message="Generating GenericCommandBoxAccessor.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCoreDir}/commandzone/GenericCommandBoxAccessor.idl" />
</exec>
<echo message="Generating ControlCommandBoxAccessor.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCoreDir}/commandzone/ControlCommandBoxAccessor.idl" />
</exec>
<echo message="Generating CommandBoxDescriptor.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCoreDir}/commandzone/CommandBoxDescriptor.idl" />
</exec>
<echo message="Generating CommandZoneEventPublisher.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCoreDir}/commandzone/CommandZoneEventPublisher.idl" />
</exec>
<echo message="Generating CommandZoneEventSubscriber.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCoreDir}/commandzone/CommandZoneEventSubscriber.idl" />
</exec>
<echo message="Generating ConditionManager.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCoreDir}/ConditionManager.idl" />
</exec>
<!-- common -->
<echo message="Generating ListIterator.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCommonDir}/ListIterator.idl" />
</exec>
<echo message="Generating ListItem.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCommonDir}/ListItem.idl" />
</exec>
<echo message="Generating BaseArrayTransferService.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCommonDir}/BaseArrayTransferService.idl" />
</exec>
<echo message="Generating Int8ArrayTransferService.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCommonDir}/Int8ArrayTransferService.idl" />
</exec>
<echo message="Generating Int16ArrayTransferService.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCommonDir}/Int16ArrayTransferService.idl" />
</exec>
<echo message="Generating Int32ArrayTransferService.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCommonDir}/Int32ArrayTransferService.idl" />
</exec>
<echo message="Generating Int64ArrayTransferService.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCommonDir}/Int64ArrayTransferService.idl" />
</exec>
<echo message="Generating Float32ArrayTransferService.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCommonDir}/Float32ArrayTransferService.idl" />
</exec>
<echo message="Generating Float64ArrayTransferService.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCommonDir}/Float64ArrayTransferService.idl" />
</exec>
<echo message="Generating ArrayCopier.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCommonDir}/ArrayCopier.idl" />
</exec>
<echo message="Generating Sequences.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCommonDir}/Sequences.idl" />
</exec>
<echo message="Generating ReadyIndicator.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCommonDir}/ReadyIndicator.idl" />
</exec>
<echo message="Generating DataChangeSubscriber.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCommonDir}/DataChangeSubscriber.idl" />
</exec>
<echo message="Generating RemoteConsoleProxy.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCommonDir}/RemoteConsoleProxy.idl" />
</exec>
<echo message="Generating RemoteConsoleListener.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCommonDir}/RemoteConsoleListener.idl" />
</exec>
<echo message="Generating LogSubscriber.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCommonDir}/LogSubscriber.idl" />
</exec>
<echo message="Generating SurveySubscriber.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCommonDir}/SurveySubscriber.idl" />
</exec>
<!-- data provider -->
<echo message="Generating LogPublisher.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlDataProviderDir}/LogPublisher.idl" />
</exec>
<echo message="Generating SurveyPublisher.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlDataProviderDir}/SurveyPublisher.idl" />
</exec>
<!-- command line -->
<echo message="Generating CommandLineProxy.java" />
<exec executable="idl">
<arg line="${idlFlags} ${idlCoreDir}/commandline/CommandLineProxy.idl" />
</exec>
</target>
<target name="proto" depends="init">
<exec executable="protoc">
<arg line="${protoFlags} ${protoDir}/ServantConfiguration.proto" />
</exec>
</target>
<target name="jar" depends="idl,proto">
<echo message="Creating nomadCommandSystem.jar" />
<jar destfile="nomadCommandSystem.jar" basedir="${classes}">
</jar>
<move todir="${idlNomadClientLibDir}">
<filelist dir="." files="nomadCommandSystem.jar" />
</move>
</target>
<target name="jar 64bits" depends="idl,proto">
<echo message="Creating nomadCommandSystem.jar for 64bits system" />
<jar destfile="nomadCommandSystem.jar" basedir="${classes}">
</jar>
<move todir="${idlNomadClientLib64Dir}">
<filelist dir="." files="nomadCommandSystem.jar" />
</move>
</target>
<target name="jni">
<echo message="Copying Client Calculator files" />
<copy todir="${src}/fr/ill/ics/bridge">
<filelist dir="${serverSrcDir}/core/clientcalculator/fr/ill/ics/bridge" files="ClientCalculator.java" />
</copy>
<copy todir="${clientCalculatorLibDir}">
<filelist dir="${serverLibDir}" files="libclientcalculator.so" />
</copy>
</target>
<target name="jni 64bits">
<echo message="Copying Client Calculator files for 64 bits system" />
<copy todir="${src}/fr/ill/ics/bridge">
<filelist dir="${serverSrcDir}/core/clientcalculator/fr/ill/ics/bridge" files="ClientCalculator.java" />
</copy>
<copy todir="${clientCalculatorLib64Dir}">
<filelist dir="${serverLibDir}" files="libclientcalculator.so" />
</copy>
</target>
<target name="compile" depends="idl,proto">
<echo message="Compilation" />
<javac srcdir="${src}/fr/ill/ics" destdir="${classes}">
<classpath>
<pathelement path="${lib}/avalon-framework-4.1.5.jar:${lib}/jacorb.jar:${lib}/logkit-1.2.jar:${lib}/protobuf-java-2.5.0.jar"/>
</classpath>
</javac>
</target>
<target name="compile 64bits" depends="idl,proto">
<echo message="compilation for 64 bits system" />
<javac srcdir="${src}/fr/ill/ics" destdir="${classes}">
<classpath>
<pathelement path="${lib64}/avalon-framework-4.2.0.jar:${lib64}/jacorb.jar:${lib64}/logkit-2.0.jar:${lib64}/protobuf-2.5.0.jar"/>
</classpath>
</javac>
</target>
<target name="all" depends="compile"/>
<target name="all 64bits" depends="compile 64bits"/>
</project>
jacorb.properties deleted 100644 → 0
View file @ 40ee5151
##
## JacORB configuration options
##
########################################
# #
# Initial references configuration #
# #
########################################
#
# URLs where IORs are stored (used in orb.resolve_initial_service())
# DO EDIT these! (Only those that you are planning to use,
# of course ;-).
#
# The ORBInitRef references are created on ORB startup time. In the
# cases of the services themselves, this may lead to exceptions being
# displayed (because the services aren't up yet). These exceptions
# are handled properly and cause no harm!
#ORBInitRef.NameService=corbaloc::160.45.110.41:38693/StandardNS/NameServer%2DPOA/_root
#ORBInitRef.NameService=file:/c:/NS_Ref
#ORBInitRef.NameService=http://www.x.y.z/~user/NS_Ref
#ORBInitRef.TradingService=http://www.x.y.z/~user/TraderRef
ORBInitRef.NameService=corbaloc::localhost:2809/NameService
#ORBInitRef.NameService=corbaloc::gamma3.ill.fr/NameService
#ORBInitRef.NameService=corbaloc::fin4:61000/NameService
#ORBInitRef.NameService=corbaloc::localhost/NameService
#ORBInitRef.NameService=corbaloc::gamma2/NameService
########################################
# #
# Export of corbaloc IORs #
# #
########################################
# allow for more readable corbaloc URLs by mapping the
# actual object key to an arbitrary string the mapping
# below would permit clients of a name service to
# access it using corbaloc::ipaddress:portnum/NameService
# Note: it is NOT necessary to define this property for
# the name service here because this is done already in the
# code of the ns implementation
# example:
#jacorb.orb.objectKeyMap.NameService=StandardNS/NameServer-POA/_root
##################################
# #
# Appligator support #
# #
##################################
# The appligator acts as a remote proxy for objects behind a firewall.
# The appligator is started on a fixed port corresponding
# to a hole in the firewall via which the proxy can be accessed.
#
# Remote clients can access one or more appligators depending on
# configuration. The 'jacorb.ProxyServer.URL' is the default
# appligator to use. Multiple additional appligators can be
# configured for remote subnets using the subnet form of URL
# configuration. The subnet for a scoped appligator is calculated
# by the logical anding of the network and netmask values.
#
# Clients are redirected to an appligator via the use of a client
# side portable interceptor. This can be installed by configuring
# a portable ORB initializer 'org.jacorb.proxy.ProxyClientInitializer'.
#
# The network and netmask configuration properties can optionally be
# used to configure the network for the local client. If this is done
# the calls to objects within the local subnet will not be redirected.
#
# The 'jacorb.ProxyServer.ID' property can be used to configure the
# object identity for the appligator IOR. If not set this defaults
# to 'Appligator'. For additionaly security it is recommended that
# this be set to some other value.
#
# The 'jacorb.ProxyServer.Name' property is the name by which the
# appligator adds itself to the name service (if available) on
# startup.
#jacorb.ProxyServer.Name=Appligator
#jacorb.ProxyServer.ID=Appligator
#jacorb.ProxyServer.Netmask=255.255.255.0
#jacorb.ProxyServer.Network=160.45.110.0
#jacorb.ProxyServer.URL=<url>
#jacorb.ProxyServer.URL-<network1>-<netmask1>=<url1>
#jacorb.ProxyServer.URL-<network2>-<netmask2>=<url2>
##################################
# #
# ORB version number output #
# #
##################################
# if on, the ORB's version number is printed
# any time the ORB is initialized
jacorb.orb.print_version=off
##################################
# #
# Debug output configuration #
# #
##################################
# use (java) jacorb.util.CAD to generate an apropriate
# verbosity level
# 0 = off
# 1 = important messages and exceptions
# 2 = informational messages and exceptions
# >= 3 = debug-level output (may confuse the unaware user :-)
jacorb.verbosity=0
# where does output go? Terminal is default
#jacorb.logfile=LOGFILEPATH
# hexdump outgoing messages
jacorb.debug.dump_outgoing_messages=off
# hexdump incoming messages
jacorb.debug.dump_incoming_messages=off
##################################################
# #
# WARNING: The following properties should #
# only be edited by the expert user. They #
# can be left untouched in most cases! #
# #
##################################################
################################
# #
# Basic ORB Configuration #
# #
################################
# the GIOP minor version number to use for newly created IORs
jacorb.giop_minor_version=2
# number of retries if connection cannot directly be established
jacorb.retries=5
# how many msecs. do we wait between retries
jacorb.retry_interval=10
# size of network buffers for outgoing messages
jacorb.outbuf_size=2048
# log2 of maximum buffer size managed by the internal
# buffer manager.
#
# This is NOT the maximum buffer size that
# can be used, but just the largest size of buffers that
# will be kept and managed. This value will be added to
# an internal constant of 5, so the real value in bytes
# is 2**(5+maxManagedBufSize-1). You only need to increase this
# value if you are dealing with LOTS of LARGE data structures.
# You may decrease it to make the buffer manager release large
# buffers immediately rather than keeping them for later
# reuse.
jacorb.maxManagedBufSize=18
# Wait the specified number of msecs for a reply to a request. If
# exceeded, a org.omg.CORBA.IMP_LIMIT exception will be thrown
#jacorb.client.pending_reply_timeout=0
# client-side connection idle timeout, set no non-zero to stop
# blocking after so many msecs.
#
# WARNING: This is independent of pending replies, i.e. the connection
# can also close, if the timeout is exceeded, but there are unanswered
# requests.
#jacorb.connection.client_idle_timeout=0
# max time a server keeps a connection open if nothing happens
#
# WARNING: This is independent of the requests currently being
# processed, i.e. the connection can also close, if the timeout is
# exceeded, but there are unanswered requests.
#
#jacorb.connection.server_timeout=10000
#jacorb.reference_caching=off
#
# The following property specifies the class which is used for
# reference caching. WeakHashtable uses WeakReferences, so entries
# get gc'ed if only the Hashtable has a reference to them. This
# is useful if you have many references to short-living non-persistent
# CORBA objects. It is only available for java 1.2 and above.
#
# On the other hand the standard Hashtable keeps the references until
# they are explicitely deleted by calling _release(). This is useful
# for persistent and long-living CORBA objects.
#
#jacorb.hashtable_class=org.jacorb.util.WeakHashtable
#
jacorb.hashtable_class=java.util.Hashtable
# use GIOP 1.2 byte order markers (since CORBA 2.4-5)
jacorb.use_bom=off
# add additional IIOP 1.0 profiles even if we are using IIOP 1.2
jacorb.giop.add_1_0_profiles=off
###########################################
# #
# Socket Factories #
# #
###########################################
# A factory design pattern is used for the creation of sockets and server
# sockets.
# The jacorb.net.socket_factory property can be used to configure
# a socket factory that must implement the operations defined in the
# interface org.jacorb.orb.factory.SocketFactory.
# The jacorb.net.server_socket_factory property can be used to configure a
# server socket factory that must implement the operations defined in the
# interface org.jacorb.orb.factory.ServerSocketFactory.
#
#jacorb.net.socket_factory=org.jacorb.orb.factory.DefaultSocketFactory
#jacorb.net.server_socket_factory=org.jacorb.orb.factory.DefaultServerSocketFactory
#
# An additional socket factory is supported that allows for the configuration
# of maximum and minimum port numbers that can be used. This can be used to
# enable firewall traversal via a fixed port range. To use this socket factory
# configure the following two properties.
#
#jacorb.net.socket_factory.port.min
#jacorb.net.socket_factory.port.max
###########################################
# #
# BiDirectional GIOP #
# #
###########################################
# uncomment this initializer if you want to use BiDirectional GIOP
#org.omg.PortableInterceptor.ORBInitializerClass.bidir_init=org.jacorb.orb.connection.BiDirConnectionInitializer
###########################################
# #
# Proxy address in IOR #
# #
###########################################
#
# with these two properties it is possible to
# tell the ORB what IP/port IORs should contain,
# if the ServerSockets IP/port can't be used
# (e.g. for traffic through a firewall).
#
# WARNING: this is just "dumb" replacing, so you
# have to take care of your configuration!
#
#jacorb.ior_proxy_host=1.2.3.4
#jacorb.ior_proxy_port=4711