merged release branch into gsi

silecs-communication-cpp/Makefile

@@ -18,8 +18,8 @@ PRODUCT = communication
 VERSION = 1.0.4
 
 SKIP_MANIFEST = TRUE
-COMMON_MAKE_PATH ?= /common/home/bel/schwinn/lnx/workspace-silecs-neon/generic-makefiles
-#COMMON_MAKE_PATH ?= /opt/cern/buildsystem/generic/2.8.20
+#COMMON_MAKE_PATH ?= /common/home/bel/schwinn/lnx/workspace-silecs-neon/generic-makefiles
+COMMON_MAKE_PATH ?= /opt/cern/buildsystem/generic/2.9.0
 
 # product configuration
 LIB_NAME = comm

silecs-communication-cpp/releaseSilecs.sh

@@ -22,7 +22,7 @@ checkFolderExists()
     if [ ! -d ${FOLDER} ]; then
         echo "Error: The folder '${FOLDER}' is needed in order to finish the installation."
         echo "Installation cancelled."
-        exit 1
+        return 1
     fi
 }
 
@@ -77,6 +77,8 @@ patch()
         INSTALL_DIR=${RELEASE_DIR_BASE}/${PACKAGE}/${NEW_VERSION}
         BASE_DIR=${RELEASE_DIR_BASE}/${PACKAGE}/${BASE_VERSION}
         checkFolderExists ${BASE_DIR}
+        checkFolderExists ${BASE_DIR}
+        checkFolderExists ${INSTALL_DIR}
         if [ "$PACKAGE" == "$PACKAGE_TO_PATCH" ]; then
             if [ -d ${INSTALL_DIR} ]; then
                if [ -L ${INSTALL_DIR} ]; then

silecs-communication-cpp/src/silecs-communication/interface/equipment/SilecsDevice.cpp

@@ -191,23 +191,6 @@ namespace Silecs
 		blockRegisterMap_.insert(std::make_pair(blockName, registerCol));
 	}
 
-	void Device::keepMasterRegisters(std::string blockName)
-	{
-		blockRegisterMapType::iterator iter;
-		iter = blockRegisterMap_.find(blockName);
-		if( iter == blockRegisterMap_.end() )
-		{
-			std::ostringstream errorMessage;
-			errorMessage << "Block not found! The block '" << blockName << "' does not exist on the device '" << label_ <<  "'.";
-			throw SilecsException(__FILE__, __LINE__,errorMessage.str());
-		}
-
-		for (unsigned int i=0; i<iter->second.size(); i++)
-		{	Register* pReg = iter->second[i];
-			if (pReg->getSynchroType() == Master) pReg->copyValue();
-		}
-	}
-
 	Block* Device::getBlock(const std::string blockName, AccessType accessType)
 	{
 		if( ! hasBlock(blockName) )

silecs-communication-cpp/src/silecs-communication/interface/equipment/SilecsDevice.h

@@ -133,14 +133,6 @@ namespace Silecs
 
 		void instantiateRegisters(std::string blockName, AccessType accessType, std::vector< boost::shared_ptr<ElementXML> >& registerNodes);
 
-        /*!
-         * \fn keepMasterRegisters
-         * \brief This method is used for Retentive registers synchronization on each PLC (re)connection.
-         * Update local value of the RW Master registers to maintain the PLC values during
-         * the synchronization of Slave registers.
-         */
-		void keepMasterRegisters(std::string blockName);
-
 		/*!
          * \fn getBlock
          * \brief returns one instance of the requested block checking its access-type

silecs-communication-cpp/src/silecs-communication/interface/equipment/SilecsPLC.cpp

@@ -241,7 +241,10 @@ namespace Silecs
 						if( pDeviceIter->second->hasBlock((*blockIter)->getName()))
 						{
 							LOG(COMM) << "Updating block '" << (*blockIter)->getName() << "' for device '" << pDeviceIter->second->getLabel()<< "'";
+<<<<<<< HEAD
 							//pDeviceIter->second->keepMasterRegisters(pBlock->getName());
+=======
+>>>>>>> refs/heads/gsi-1.0.x_centOS7
 							pDeviceIter->second->recv((*blockIter)->getName());
 						}
 					}

silecs-diagnostic-cpp/Makefile

@@ -19,7 +19,7 @@ VERSION = 1.0.2
 
 SKIP_MANIFEST = TRUE
 #COMMON_MAKE_PATH ?= /common/home/bel/schwinn/lnx/workspace-silecs-neon/generic-makefiles
-COMMON_MAKE_PATH ?= /opt/cern/buildsystem/generic/2.8.20
+COMMON_MAKE_PATH ?= /opt/cern/buildsystem/generic/2.9.0
 
 # product configuration
 BIN_NAME = $(PROJECT)-$(PRODUCT)

silecs-eclipse-plugin-update-site/.gitignore

+/features/*
+/plugins/*
\ No newline at end of file

silecs-eclipse-plugin-update-site/install.sh

+#!/bin/sh
+set -e
+
+INSTALL_DIR=$1
+
+SCRIPT=$(readlink -f "$0")
+SCRIPTPATH=$(dirname "$SCRIPT")     # path where this script is located in
+
+mkdir -p ${INSTALL_DIR}
+cp -ruv ${SCRIPTPATH}/* ${INSTALL_DIR}
\ No newline at end of file

silecs-eclipse-plugin-update-site/site.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <feature url="features/silecsEclipsePluginFeature_1.0.0.201602241715.jar" id="silecsEclipsePluginFeature" version="1.0.0.201602241715">
+      <category name="0.9.0"/>
+   </feature>
+   <feature url="features/silecsEclipsePluginFeature_1.0.0.201604071714.jar" id="silecsEclipsePluginFeature" version="1.0.0.201604071714">
+      <category name="0.10.0"/>
+   </feature>
+   <feature url="features/silecsEclipsePluginFeature_1.0.0.201607291027.jar" id="silecsEclipsePluginFeature" version="1.0.0.201607291027">
+      <category name="1.0.0"/>
+   </feature>
+   <feature url="features/silecsEclipsePluginFeature_1.0.0.201608011414.jar" id="silecsEclipsePluginFeature" version="1.0.0.201608011414">
+      <category name="1.0.0"/>
+   </feature>
+   <category-def name="0.9.0" label="0.9.0"/>
+   <category-def name="0.10.0" label="0.10.0"/>
+   <category-def name="1.0.0" label="1.0.0"/>
+</site>

silecs-eclipse-plugin/.classpath

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry exported="true" kind="lib" path="ext-jars/xml-apis-1.3.04.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/java"/>
+	<classpathentry exported="true" kind="lib" path="jaxen-1.1.6.jar"/>
+	<classpathentry exported="true" kind="lib" path="xalan-2.7.2.jar"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

silecs-eclipse-plugin/.gitignore

+/target/
+/ext-jars/*
+/jaxen-1.1.6.jar
+/xalan-2.7.2.jar

silecs-eclipse-plugin/.project

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>silecs-eclipse-plugin</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<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>
+		<nature>org.springsource.ide.eclipse.gradle.core.nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.python.pydev.pythonNature</nature>
+	</natures>
+</projectDescription>

silecs-eclipse-plugin/.settings/org.eclipse.jdt.core.prefs

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.8

silecs-eclipse-plugin/META-INF/MANIFEST.MF

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: silecs.eclipse.plugin;singleton:=true
+Bundle-Version: 1.1.1.qualifier
+Bundle-Activator: cern.silecs.activator.Activator
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.ui.workbench,
+ org.eclipse.core.resources,
+ org.eclipse.ui.ide,
+ org.eclipse.ui.editors,
+ org.eclipse.wst.xml.core,
+ org.eclipse.wst.xml.ui,
+ org.eclipse.ui.navigator.resources,
+ org.eclipse.core.filesystem,
+ org.eclipse.ui.console,
+ org.eclipse.ui.views,
+ org.eclipse.wst.validation,
+ org.eclipse.wst.validation.infopop,
+ org.eclipse.wst.validation.ui,
+ org.eclipse.jface.text,
+ org.eclipse.wst.sse.ui,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.text,
+ org.eclipse.wst.sse.core,
+ org.eclipse.ui.navigator,
+ org.eclipse.xsd,
+ org.eclipse.wst.xsd.core,
+ org.eclipse.core.expressions,
+ org.eclipse.cdt,
+ org.eclipse.cdt.core,
+ org.eclipse.cdt.ui,
+ org.eclipse.cdt.managedbuilder.ui,
+ org.eclipse.ltk.core.refactoring,
+ org.eclipse.ltk.ui.refactoring,
+ org.eclipse.equinox.launcher,
+ org.eclipse.cdt.make.core;bundle-version="7.3.0",
+ org.eclipse.cdt.make.ui;bundle-version="7.2.0",
+ org.eclipse.cdt.managedbuilder.core;bundle-version="8.3.0"
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .,
+ ext-jars/xalan-2.7.2.jar,
+ ext-jars/jaxen-1.1.6.jar,
+ ext-jars/xml-apis-1.3.04.jar
+Permissions: all-permissions
+Codebase: http://abwww.cern.ch/ap/dist/silecs/1.m.p/configuration/
+Application-Name: Silecs-Eclipse-Plugin
+Export-Package: org.apache.bcel,
+ org.apache.bcel.classfile,
+ org.apache.bcel.generic,
+ org.apache.bcel.util,
+ org.apache.bcel.verifier,
+ org.apache.bcel.verifier.exc,
+ org.apache.bcel.verifier.statics,
+ org.apache.bcel.verifier.structurals,
+ org.apache.regexp,
+ org.apache.xalan,
+ org.apache.xalan.client,
+ org.apache.xalan.extensions,
+ org.apache.xalan.lib,
+ org.apache.xalan.lib.sql,
+ org.apache.xalan.processor,
+ org.apache.xalan.res,
+ org.apache.xalan.serialize,
+ org.apache.xalan.templates,
+ org.apache.xalan.trace,
+ org.apache.xalan.transformer,
+ org.apache.xalan.xslt,
+ org.apache.xalan.xsltc,
+ org.apache.xalan.xsltc.cmdline,
+ org.apache.xalan.xsltc.cmdline.getopt,
+ org.apache.xalan.xsltc.compiler,
+ org.apache.xalan.xsltc.compiler.util,
+ org.apache.xalan.xsltc.dom,
+ org.apache.xalan.xsltc.runtime,
+ org.apache.xalan.xsltc.runtime.output,
+ org.apache.xalan.xsltc.trax,
+ org.apache.xalan.xsltc.util,
+ org.apache.xml.dtm,
+ org.apache.xml.dtm.ref,
+ org.apache.xml.dtm.ref.dom2dtm,
+ org.apache.xml.dtm.ref.sax2dtm,
+ org.apache.xml.res,
+ org.apache.xml.utils,
+ org.apache.xml.utils.res,
+ org.apache.xpath,
+ org.apache.xpath.axes,
+ org.apache.xpath.compiler,
+ org.apache.xpath.domapi,
+ org.apache.xpath.functions,
+ org.apache.xpath.jaxp,
+ org.apache.xpath.objects,
+ org.apache.xpath.operations,
+ org.apache.xpath.patterns,
+ org.apache.xpath.res,
+ org.jaxen,
+ org.jaxen.dom,
+ org.jaxen.dom4j,
+ org.jaxen.expr,
+ org.jaxen.expr.iter,
+ org.jaxen.function,
+ org.jaxen.function.ext,
+ org.jaxen.function.xslt,
+ org.jaxen.javabean,
+ org.jaxen.jdom,
+ org.jaxen.pattern,
+ org.jaxen.saxpath,
+ org.jaxen.saxpath.base,
+ org.jaxen.saxpath.helpers,
+ org.jaxen.util,
+ org.jaxen.xom,
+ org.w3c.dom

silecs-eclipse-plugin/build.properties

+source.. = src/java/
+output.. = bin/java/,\
+           bin/
+bin.includes = plugin.xml,\
+               META-INF/,\
+               .,\
+               icons/,\
+               JNLP-INF/,\
+               src/java/,\
+               OSGI-INF/,\
+               ext-jars/xml-apis-1.3.04.jar,\
+               ext-jars/xalan-2.7.2.jar,\
+               ext-jars/serializer-2.7.2.jar,\
+               jaxen-1.1.6.jar,\
+               xalan-2.7.2.jar
+src.includes = src/
+jars.compile.order = .
+qualifier = context

silecs-eclipse-plugin/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>de.gsi.cs.co</groupId>
+		<artifactId>csco-parent</artifactId>
+		<version>1.0.7</version>
+	</parent>
+	<groupId>de.gsi.cs.co.fe</groupId>
+	<artifactId>silecs.eclipse.plugin</artifactId>
+	<name>silecs-eclipse-plugin</name>
+	<packaging>eclipse-plugin</packaging>
+	<version>1.1.1.qualifier</version>
+	<description>Management of Silecs projects</description>
+	<url>https://www-acc.gsi.de/wiki/Frontend/SILECS</url>
+
+	<properties>
+		<tycho-version>0.21.0</tycho-version>
+		<platform-version-name>mars</platform-version-name>
+		<eclipse-site>http://download.eclipse.org/releases/${platform-version-name}</eclipse-site>
+	</properties>
+	<profiles>
+		<profile>
+			<id>platform-mars</id>
+			<activation>
+				<property>
+					<name>platform-version-name</name>
+					<value>mars</value>
+				</property>
+			</activation>
+			<properties>
+				<eclipse-site>http://download.eclipse.org/releases/mars</eclipse-site>
+				<platform-version>[4.4,4.6)</platform-version>
+				<swtbot-site>http://download.eclipse.org/technology/swtbot/mars/dev-build/update-site</swtbot-site>
+			</properties>
+		</profile>
+	</profiles>
+	<repositories>
+		<repository>
+			<id>default</id>
+			<url>https://artifacts.acc.gsi.de/nexus/content/repositories/default</url>
+		</repository>
+		<repository>
+			<id>mars</id>
+			<layout>p2</layout>
+			<url>${eclipse-site}</url>
+		</repository>
+	</repositories>
+	<dependencies>
+		<dependency>
+			<groupId>xalan</groupId>
+			<artifactId>xalan</artifactId>
+			<version>2.7.2</version>
+		</dependency>
+		<dependency>
+			<groupId>jaxen</groupId>
+			<artifactId>jaxen</artifactId>
+			<version>1.1.6</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-eclipse-plugin</artifactId>
+				<version>2.10</version>
+				<configuration>
+					<pde>true</pde>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+					<compilerVersion>1.8</compilerVersion>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>process-sources</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<artifactItems>
+								<artifactItem>
+									<groupId>xalan</groupId>
+									<artifactId>xalan</artifactId>
+								</artifactItem>
+								<artifactItem>
+									<groupId>jaxen</groupId>
+									<artifactId>jaxen</artifactId>
+								</artifactItem>
+							</artifactItems>
+							<outputDirectory>${basedir}/ext-jars</outputDirectory>
+              				<overWriteReleases>false</overWriteReleases>
+              				<overWriteSnapshots>true</overWriteSnapshots>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-clean-plugin</artifactId>
+				<version>2.3</version>
+				<configuration>
+					<filesets>
+						<fileset>
+							<directory>${basedir}/ext-jars</directory>
+							<includes>
+								<include>*.jar</include>
+							</includes>
+							<followSymlinks>false</followSymlinks>
+						</fileset>
+					</filesets>
+				</configuration>
+			</plugin>
+			<plugin>
+                <groupId>org.eclipse.tycho</groupId>
+                <artifactId>tycho-maven-plugin</artifactId>
+                <version>${tycho-version}</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <pomDependencies>consider</pomDependencies>
+                    <executionEnvironment>JavaSE-1.8</executionEnvironment>
+                </configuration>
+            </plugin>
+		</plugins>
+	</build>
+
+</project>

silecs-eclipse-plugin/src/java/cern/silecs/utils/SilecsConstants.java

+// Copyright 2016 CERN and GSI
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package cern.silecs.utils;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class SilecsConstants {
+
+	public enum ProjectType {
+	    DESIGN_PROJECT,
+	    DEPLOY_PROJECT
+	}
+	
+    public static final String SILECS_NAME = "Silecs-Eclipse-Plugin";
+    
+    //consistency check
+    public static final String DESIGN_CLASS_NODE = "SILECS-Class";
+    
+    public static final String DEPLOY_UNIT_NODE = "Deploy-Unit";
+    
+    public static final String NAME = "name";
+    
+    public static final String HOST_NAME = "host-name";
+    
+    // schema files
+    public static final String DESIGN_SCHEMA_XSD = "DesignSchema.xsd";
+    
+    public static final String DEPLOY_SCHEMA_XSD = "DeploySchema.xsd";
+    
+    //file extensions
+    public static final String IEDESIGN_FILE = "silecsdesign";
+    
+    public static final String IEDEPLOY_FILE = "silecsdeploy";
+    
+    //name patterns
+    public static final String DESIGN_PATTERN = "[A-Z][A-Za-z0-9_]*";
+    
+    public static final String DEPLOY_PATTERN = "[A-Z][A-Za-z0-9_]*";
+    
+    public static final int MAX_DESIGN_LENGTH = 20;
+    
+    public static final int MAX_DEPLOY_LENGTH = 20;
+    
+    // SILECS versions which are supported by this plugin
+    public static final String[] SUPPORTED_SILECS_MAJOR_VERSIONS = { "1","DEV"};
+    public static final List<String> ADDITIONAL_SILECS_TARGET_MIGRATION_VERSIONS = Arrays.asList("0.10.0"); //e.g. in order to allow migration from 0.9.0 to 0.10.0
+    public static final int DEFAULT_SILECS_VERSION_INDEX = 0;
+    
+    // SILECS Versions which are NOT supported by this plugin
+    // All other versions foudn in the silecs-search path are supported
+    public static final String[] SILECS_VERSION_BLACKLIST = { "0.9.0" };
+    
+    //Wizards
+        //New Design Wizard
+    public static final String NEW_DESIGN_WIZARD_TITLE = "New Design Wizard";
+    public static final String NEW_DESIGN_PAGE_TITLE = "New Design Project";
+    
+        //New Deploy Wizard
+    public static final String NEW_DEPLOY_WIZARD_TITLE = "New Deploy Wizard";
+    public static final String NEW_DEPLOY_PAGE_TITLE = "New Deploy Project";
+    
+        //New Class Wizard Page
+    
+    public static final String INVAILD_PROJECT_NAME= "Invaild project name. Project name must follow pattern:";
+    
+    public static final String INITIAL_PROJECT_VERSION = "1.0.0";
+    
+        //Generate Fesa Class Wizard
+    public static final String GENERATE_FESA_CLASS_WIZARD_TITLE = "Generate Fesa Class Wizard";
+    public static final String GENERATE_FESA_CLASS_PAGE_TITLE = "Generate Fesa Class";
+    
+        //Generate Client Resources Wizard
+    public static final String GENERATE_CLIENT_RESOURCES_WIZARD_TITLE = "Generate Client Resources Wizard";
+    public static final String GENERATE_CLIENT_RESOURCES_PAGE_TITLE = "Generate Client Resources";
+    
+        //Deliver Client Resources Wizard
+    public static final String DELIVER_CLIENT_RESOURCES_WIZARD_TITLE = "Deliver Client Resources Wizard";
+    public static final String DELIVER_CLIENT_RESOURCES_PAGE_TITLE = "Deliver Client Resources";
+    
+    //GSI-Hack Use GSI SILECS Wiki
+    //public static final String SILECS_WIKIS_PATH = "https://wikis.cern.ch/display/SIL";
+    public static final String SILECS_WIKIS_PATH = "https://www-acc.gsi.de/wiki/Frontend/SILECS";
+}