Artenum Innovative Solutions - Sources Repository 3.4

Last Ticket	1205
File encoding	ISO-8859-1
Binaries Extensions	pdf ps eps zip class gif jpg mp3 mpg png jar
Synchronizer URI	ls://dev.artenum.com/projects/cassandra/src2
View Patch [from 1105 to 1172]
DelBlock(ignore.so6.ref,21,1)
  -- 


AddBlock(ignore.so6.ref,21,2)
  ++ Packaging$
  ++ config.properties


AddBlock(config.sample,33,2)
  ++ 
  ++ 


DelBlock(config.sample,39,1)
  -- cassandra.core.home=Core


AddBlock(config.sample,39,1)
  ++ cassandra.core.home=${cassandra.root}/Core


DelBlock(config.sample,45,1)
  -- cassandra.pipeline.home=Pipeline


AddBlock(config.sample,45,1)
  ++ cassandra.pipeline.home=${cassandra.root}/Pipeline


AddBlock(config.sample,48,10)
  ++ # Cassandra Rendering                                          #
  ++ ################################################################
  ++ cassandra.renderer.home=${cassandra.root}/Renderer
  ++ 
  ++ ################################################################
  ++ # plugins directory of the binary package                      #
  ++ ################################################################
  ++ cassandra.plugin.binary.dir=${cassandra.root}/Core/plugin
  ++ 
  ++ ################################################################


DelBlock(config.sample,59,1)
  -- #  - The root directories                                      #


AddBlock(config.sample,59,1)
  ++ #  - The directories of the vairous plugins                    #


DelBlock(config.sample,61,7)
  -- cassandra.plugin.1=Plugins/Clipping
  -- cassandra.plugin.2=Plugins/CuttingPlane
  -- cassandra.plugin.3=Plugins/Default
  -- cassandra.plugin.4=Plugins/Info2D
  -- cassandra.plugin.5=Plugins/IsoLevel
  -- cassandra.plugin.6=Plugins/ProbingLine
  -- cassandra.plugin.7=Plugins/Threshold


AddBlock(config.sample,61,13)
  ++ cassandra.plugin.1=${cassandra.root}/Plugins/Clipping
  ++ cassandra.plugin.2=${cassandra.root}/Plugins/CuttingPlane
  ++ cassandra.plugin.3=${cassandra.root}/Plugins/Default
  ++ cassandra.plugin.4=${cassandra.root}/Plugins/Info2D
  ++ cassandra.plugin.5=${cassandra.root}/Plugins/IsoLevel
  ++ cassandra.plugin.6=${cassandra.root}/Plugins/ProbingLine
  ++ cassandra.plugin.7=${cassandra.root}/Plugins/Threshold
  ++ cassandra.plugin.8=${cassandra.root}/Plugins/WarpScalar
  ++ cassandra.plugin.9=${cassandra.root}/Plugins/DynamicDataset
  ++ cassandra.plugin.10=${cassandra.root}/Plugins/GenericCutter
  ++ cassandra.plugin.11=${cassandra.root}/Plugins/CellCenter
  ++ cassandra.plugin.12=${cassandra.root}/Plugins/Glyph
  ++ cassandra.plugin.13=${cassandra.root}/Plugins/X3DExporter


AddBlock(config.sample,75,80)
  ++ ################################################################
  ++ # Interdependant package compilation                           #
  ++ ################################################################
  ++ 
  ++ thirdpart.dir=${cassandra.root}/thirdpart
  ++ #thirdpart.dir=/Users/juju/Boulot/Projects/NewSPIS/DevSince20090906/ThirdPart/Cassandra-2.2/thirdpart
  ++ 
  ++ #tmp.dependance.dir=thirdpart/core-pipeline
  ++ tmp.dependance.dir=${cassandra.root}/tmpCrossDepDir
  ++ 
  ++ tmp.jar-file.corePipeline=${tmp.dependance.dir}/CorePipeline.jar
  ++ 
  ++ ################################################################
  ++ # Jython interpreter                                           #
  ++ ################################################################
  ++ jython.dir=${thirdpart.dir}/Jython/jython2.5.1
  ++ thirdpart.jar-file.jython=${jython.dir}/jython.jar
  ++ 
  ++ thirdpart.jar-file.arttk=${thirdpart.dir}/ArtTk/ArtTk.jar
  ++ 
  ++ thirdpart.jar-file.jyconsole=${thirdpart.dir}/JyConsole/JyConsole.jar
  ++ 
  ++ thirdpart.jar-file.dedalegraph=${thirdpart.dir}/DedaleGraph/DedaleGraph.jar
  ++ 
  ++ thirdpart.jar-file.renderer=${thirdpart.dir}/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable.jar
  ++ 
  ++ thirdpart.jar-file.pipeline=${thirdpart.dir}/CassandraPipelineManager-1.1/ArtenumPipeLineManager-1.1.jar
  ++ 
  ++ thirdpart.jar-file.cassandra=${cassandra.root}/Cassandra-2.4.03/Cassandra.jar
  ++ 
  ++ ################################################################
  ++ #         VTK settings                                         #
  ++ ################################################################
  ++ 
  ++ #vtk.root.dir=${thirdpart.dir}/VTK/MacOSX/vtk-5.3-osx-i686-JVM1.6-64b
  ++ #thirdpart.jar-file.vtk=${vtk.root.dir}/lib/vtk-5.3/java/vtk/vtk.jar
  ++ 
  ++ # for Mac OSX
  ++ #vtk.version=5.6
  ++ #vtk.root.dir=${thirdpart.dir}/VTK/MacOSX/vtk-native-5.6.1-osx-x86_64
  ++ #thirdpart.jar-file.vtk=${thirdpart.dir}/VTK/Java/vtk-5.6.1.jar
  ++ #vtk.library.path=${vtk.root.dir}:${vtk.root.dir}/lib/vtk-${vtk.version}/
  ++ 
  ++ 
  ++ #for Linux
  ++ vtk.version=5.6
  ++ vtk.root.dir=${thirdpart.dir}/VTK/MacOSX/vtk-native-5.6.1-linux-x86_64-glibc2_7-jvm1_6
  ++ thirdpart.jar-file.vtk=${thirdpart.dir}/VTK/Java/vtk-5.6.1.jar
  ++ vtk.library.path=${vtk.root.dir}:${vtk.root.dir}/lib/vtk-${vtk.version}/
  ++ 
  ++ ################################################################
  ++ # Java memory stack                                            #
  ++ ################################################################
  ++ java.xmx=512m
  ++ 
  ++ 
  ++ ################################################################
  ++ # XJ3D properties                                              #
  ++ #  - Set of jar files                                          #
  ++ #  DEPRECATED                                                  #
  ++ ################################################################
  ++ 
  ++ # xj3d.root.dir=${thirdpart.dir}/Xj3D
  ++ # thirdpart.jar-xj3d-1=${xj3d.root.dir}/apps/converter/xj3d_converter.jar
  ++ # thirdpart.jar-xj3d-2=${xj3d.root.dir}/jars/FastInfoset.jar
  ++ # thirdpart.jar-xj3d-3=${xj3d.root.dir}/jars/uri.jar
  ++ # thirdpart.jar-xj3d-4=${xj3d.root.dir}/jars/vlc_uri.jar
  ++ # thirdpart.jar-xj3d-5=${xj3d.root.dir}/jars/xj3d-common.jar
  ++ # thirdpart.jar-xj3d-6=${xj3d.root.dir}/jars/xj3d-jaxp.jar
  ++ # thirdpart.jar-xj3d-7=${xj3d.root.dir}/jars/xj3d-norender.jar
  ++ # thirdpart.jar-xj3d-8=${xj3d.root.dir}/jars/xj3d-render.jar
  ++ # thirdpart.jar-xj3d-9=${xj3d.root.dir}/jars/xj3d-sav.jar
  ++ # thirdpart.jar-xj3d-10=${xj3d.root.dir}/jars/j3d-org.jar
  ++ # thirdpart.jar-xj3d-11=${xj3d.root.dir}/jars/vecmath.jar
  ++ # thirdpart.jar-xj3d-12=${xj3d.root.dir}/jars/xj3d-all.jar
  ++ # thirdpart.jar-xj3d-13=${xj3d.root.dir}/jars/xj3d-core.jar
  ++ # thirdpart.jar-xj3d-14=${xj3d.root.dir}/jars/xj3d-net.jar
  ++ # thirdpart.jar-xj3d-15=${xj3d.root.dir}/jars/xj3d-parser.jar
  ++ # thirdpart.jar-xj3d-16=${xj3d.root.dir}/jars/xj3d-runtime.jar
  ++ # thirdpart.jar-xj3d-17=${xj3d.root.dir}/jars/xj3d_converter.jar


AddBlock(config.properties,113,7)
  ++ #vtk.version=5.6
  ++ #vtk.root.dir=${thirdpart.dir}/VTK/MacOSX/vtk-native-5.6.1-osx-x86_64
  ++ #thirdpart.jar-file.vtk=${thirdpart.dir}/VTK/Java/vtk-5.6.1.jar
  ++ #vtk.library.path=${vtk.root.dir}:${vtk.root.dir}/lib/vtk-${vtk.version}/
  ++ 
  ++ 
  ++ #for Linux


DelBlock(config.properties,121,1)
  -- vtk.root.dir=${thirdpart.dir}/VTK/MacOSX/vtk-native-5.6.1-osx-x86_64


AddBlock(config.properties,121,1)
  ++ vtk.root.dir=${thirdpart.dir}/VTK/MacOSX/vtk-native-5.6.1-linux-x86_64-glibc2_7-jvm1_6


DelBlock(.ignore.so6,21,1)
  -- 


AddBlock(.ignore.so6,21,2)
  ++ Packaging$
  ++ config.properties


DelBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,44,1)
  --  * @author Sebastien Jourdain, Julien Forest, JŽrŽmie Turbet, Benoit ThiŽbault


AddBlock(Pipeline/src/main/java/com/artenum/cassandra/pipeline/SimplePipeLineManager.java,44,1)
  ++  * @author Sebastien Jourdain, Julien Forest, Jeremie Turbet, Benoit Thiebault


DelBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,36,1)
  -- import com.sun.tools.example.debug.gui.GUI;


AddBlock(Plugins/CuttingPlane/src/com/artenum/cassandra/plugin/cutting/CuttingPlanePlugin.java,36,1)
  ++ //import com.sun.tools.example.debug.gui.GUI;


DelBlock(Plugins/IsoLevel/src/com/artenum/cassandra/plugin/isolevel/IsoLevelPlugin.java,37,1)
  -- import sun.management.snmp.util.MibLogger;


UpdateBinaryFile(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable.jar)


DelBlock(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt,10,1)
  -- Hour of build: 0314 


AddBlock(Renderer/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt,10,1)
  ++ Hour of build: 1247 


DelBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,82,1)
  --  * @author Sebastien Jourdain, Julien Forest, Benoit ThiŽbault, JŽrŽmie Turbet


AddBlock(Core/src/com/artenum/cassandra/action/CassandraActionListener.java,82,1)
  ++  * @author Sebastien Jourdain, Julien Forest, Benoit Thiebault, Jeremie Turbet


DelBlock(Core/src/com/artenum/cassandra/ui/popup/ScalarBarPopupMenu.java,62,1)
  --  * @author        Sebastien Jourdain, Julien Forest, Benoit Thiebault, JŽrŽmie Turbet


AddBlock(Core/src/com/artenum/cassandra/ui/popup/ScalarBarPopupMenu.java,62,1)
  ++  * @author        Sebastien Jourdain, Julien Forest, Benoit Thiebault, Jeremie Turbet


DelBlock(Core/src/com/artenum/cassandra/ui/popup/DataSetPopupMenu.java,62,1)
  --  * @author        Sebastien Jourdain, Julien Forest, Benoit Thiebault, JŽrŽmie Turbet


AddBlock(Core/src/com/artenum/cassandra/ui/popup/DataSetPopupMenu.java,62,1)
  ++  * @author        Sebastien Jourdain, Julien Forest, Benoit Thiebault, Jeremie Turbet


Remove(tmpCrossDepDir/tmp/com/artenum/cassandra/util)


Remove(tmpCrossDepDir/tmp/com/artenum/cassandra/ui/popup)


Remove(tmpCrossDepDir/tmp/com/artenum/cassandra/ui/dialog)


Remove(tmpCrossDepDir/tmp/com/artenum/cassandra/ui)


Remove(tmpCrossDepDir/tmp/com/artenum/cassandra/renderer/vtk)


Remove(tmpCrossDepDir/tmp/com/artenum/cassandra/renderer)


Remove(tmpCrossDepDir/tmp/com/artenum/cassandra/plugin)


Remove(tmpCrossDepDir/tmp/com/artenum/cassandra/pipeline/io)


Remove(tmpCrossDepDir/tmp/com/artenum/cassandra/pipeline/graph)


Remove(tmpCrossDepDir/tmp/com/artenum/cassandra/pipeline)


Remove(tmpCrossDepDir/tmp/com/artenum/cassandra/launcher)


Remove(tmpCrossDepDir/tmp/com/artenum/cassandra/action/menu)


Remove(tmpCrossDepDir/tmp/com/artenum/cassandra/action)


Remove(tmpCrossDepDir/tmp/com/artenum/cassandra)


Remove(tmpCrossDepDir/tmp/com/artenum)


Remove(tmpCrossDepDir/tmp/com)


Remove(tmpCrossDepDir/tmp)


Remove(tmpCrossDepDir/CorePipeline.jar)


Remove(tmpCrossDepDir)


Remove(thirdpartSansVtk/DedaleGraph/LICENSE.txt)


Remove(thirdpartSansVtk/DedaleGraph/DedaleGraph.jar)


Remove(thirdpartSansVtk/DedaleGraph)


Remove(thirdpartSansVtk/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/version.txt)


Remove(thirdpartSansVtk/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/README.txt)


Remove(thirdpartSansVtk/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/LICENSE.txt)


Remove(thirdpartSansVtk/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/INSTALL.txt)


Remove(thirdpartSansVtk/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable.jar)


Remove(thirdpartSansVtk/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable/CHANGE.txt)


Remove(thirdpartSansVtk/CassandraRenderer-1.1.0-all-all-none-jvm1_6-stable)


Remove(thirdpartSansVtk/ArtTk/LICENSE.txt)


Remove(thirdpartSansVtk/ArtTk/COPYRIGHT)


Remove(thirdpartSansVtk/ArtTk/ArtTk.jar)


Remove(thirdpartSansVtk/ArtTk)


Remove(thirdpartSansVtk)


Remove(config.properties.bak)


Remove(Cassandra-2.4.03_OK_for_demo.tgz)
Libresource

Navigation

Contextual Menu

Search

Cassandra

Download

Documentation

Getting involved

Groups

Resource Menu

Sources Repository 3.4

View Patch [from 1105 to 1172]
