From ced7eb1b96172b45f094b35f0f33fe748daadd3f Mon Sep 17 00:00:00 2001
From: aschwinn <al.schwinn@gsi.de>
Date: Mon, 1 Aug 2016 14:22:02 +0200
Subject: [PATCH] fixed validation bug in roled out version
---
silecs-eclipse-plugin/.classpath | 1 +
silecs-eclipse-plugin/META-INF/MANIFEST.MF | 28 ++---------
silecs-eclipse-plugin/build.properties | 7 ++-
silecs-eclipse-plugin/build.xml | 55 ++++++++++++----------
4 files changed, 42 insertions(+), 49 deletions(-)
diff --git a/silecs-eclipse-plugin/.classpath b/silecs-eclipse-plugin/.classpath
index 824394f..2dfef36 100644
--- a/silecs-eclipse-plugin/.classpath
+++ b/silecs-eclipse-plugin/.classpath
@@ -1,5 +1,6 @@
<?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"/>
diff --git a/silecs-eclipse-plugin/META-INF/MANIFEST.MF b/silecs-eclipse-plugin/META-INF/MANIFEST.MF
index 413ca60..c498624 100644
--- a/silecs-eclipse-plugin/META-INF/MANIFEST.MF
+++ b/silecs-eclipse-plugin/META-INF/MANIFEST.MF
@@ -42,31 +42,12 @@ Require-Bundle: org.eclipse.ui,
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .,
ext-jars/xalan-2.7.2.jar,
- ext-jars/jaxen-1.1.6.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: cern.silecs.activator,
- cern.silecs.control.core,
- cern.silecs.control.handlers,
- cern.silecs.control.validation,
- cern.silecs.control.validation.internal;x-internal:=true,
- cern.silecs.model.document,
- cern.silecs.model.exception,
- cern.silecs.utils,
- cern.silecs.view,
- cern.silecs.view.console,
- cern.silecs.view.dialogs,
- cern.silecs.view.editor,
- cern.silecs.view.editor.internal;x-internal:=true,
- cern.silecs.view.explorer,
- cern.silecs.view.job,
- cern.silecs.view.marker,
- cern.silecs.view.preferences,
- cern.silecs.view.wizards,
- cern.silecs.view.wizards.page,
- java_cup.runtime,
- org.apache.bcel,
+Export-Package: org.apache.bcel,
org.apache.bcel.classfile,
org.apache.bcel.generic,
org.apache.bcel.util,
@@ -130,5 +111,4 @@ Export-Package: cern.silecs.activator,
org.jaxen.saxpath.helpers,
org.jaxen.util,
org.jaxen.xom,
- org.w3c.dom,
- trax
+ org.w3c.dom
diff --git a/silecs-eclipse-plugin/build.properties b/silecs-eclipse-plugin/build.properties
index 5591dfb..eafceb4 100644
--- a/silecs-eclipse-plugin/build.properties
+++ b/silecs-eclipse-plugin/build.properties
@@ -7,7 +7,12 @@ bin.includes = plugin.xml,\
icons/,\
JNLP-INF/,\
src/java/,\
- OSGI-INF/
+ 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
diff --git a/silecs-eclipse-plugin/build.xml b/silecs-eclipse-plugin/build.xml
index b4b9060..223e13e 100644
--- a/silecs-eclipse-plugin/build.xml
+++ b/silecs-eclipse-plugin/build.xml
@@ -7,7 +7,7 @@
<property name="basearch" value="${arch}"/>
<property name="basenl" value="${nl}"/>
<property name="bundleId" value="silecs.eclipse.plugin"/>
- <property name="bundleVersion" value="1.1.1.201607291027"/>
+ <property name="bundleVersion" value="1.1.1.201608011414"/>
<property name="p2.publishonerror" value="false"/>
<!-- Compiler settings. -->
@@ -50,7 +50,7 @@
<isset property="buildTempFolder"/>
</condition>
<property name="pluginTemp" value="${basedir}"/>
- <condition property="build.result.folder" value="${pluginTemp}/silecs.eclipse.plugin_1.1.1.201607291027" >
+ <condition property="build.result.folder" value="${pluginTemp}/silecs.eclipse.plugin_1.1.1.201608011414" >
<isset property="buildTempFolder"/>
</condition>
<property name="build.result.folder" value="${basedir}"/>
@@ -80,7 +80,7 @@
<antcall target="gather.bin.parts">
<param name="destination.temp.folder" value="${temp.folder}/"/>
</antcall>
- <jar destfile="${plugin.destination}/silecs.eclipse.plugin_1.1.1.201607291027.jar" basedir="${temp.folder}/silecs.eclipse.plugin_1.1.1.201607291027" filesetmanifest="merge"/>
+ <jar destfile="${plugin.destination}/silecs.eclipse.plugin_1.1.1.201608011414.jar" basedir="${temp.folder}/silecs.eclipse.plugin_1.1.1.201608011414" filesetmanifest="merge"/>
<delete dir="${temp.folder}"/>
</target>
@@ -333,9 +333,11 @@
<pathelement path="../../../../../../../../opt/eclipse/mars/plugins/org.eclipse.equinox.launcher_1.3.100.v20150511-1540.jar"/>
<pathelement path="../../../../../../../../opt/eclipse/mars/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.1.300.v20150602-1417"/>
<pathelement path="ext-jars/xalan-2.7.2.jar"/>
- <pathelement path="${build.result.folder}/../silecs.eclipse.plugin_1.1.1.201607291027/ext-jars/xalan-2.7.2.jar"/>
+ <pathelement path="${build.result.folder}/../silecs.eclipse.plugin_1.1.1.201608011414/ext-jars/xalan-2.7.2.jar"/>
<pathelement path="ext-jars/jaxen-1.1.6.jar"/>
- <pathelement path="${build.result.folder}/../silecs.eclipse.plugin_1.1.1.201607291027/ext-jars/jaxen-1.1.6.jar"/>
+ <pathelement path="${build.result.folder}/../silecs.eclipse.plugin_1.1.1.201608011414/ext-jars/jaxen-1.1.6.jar"/>
+ <pathelement path="ext-jars/xml-apis-1.3.04.jar"/>
+ <pathelement path="${build.result.folder}/../silecs.eclipse.plugin_1.1.1.201608011414/ext-jars/xml-apis-1.3.04.jar"/>
</path>
<!-- compile the source code -->
<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" >
@@ -381,8 +383,8 @@
</target>
<target name="checkCompilationResults" if="compilation.error.occured">
- <echo file="${compilation.problem.marker}" message="silecs.eclipse.plugin_1.1.1.201607291027${line.separator}compilation.error.occured=${compilation.error.occured}"/>
- <eclipse.logCompileError log="${compilation.prereq.log}" bundle="silecs.eclipse.plugin_1.1.1.201607291027">
+ <echo file="${compilation.problem.marker}" message="silecs.eclipse.plugin_1.1.1.201608011414${line.separator}compilation.error.occured=${compilation.error.occured}"/>
+ <eclipse.logCompileError log="${compilation.prereq.log}" bundle="silecs.eclipse.plugin_1.1.1.201608011414">
</eclipse.logCompileError>
</target>
@@ -392,7 +394,7 @@
</target>
<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
- <mkdir dir="${build.result.folder}/silecs.eclipse.plugin_1.1.1.201607291027"/>
+ <mkdir dir="${build.result.folder}/silecs.eclipse.plugin_1.1.1.201608011414"/>
<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
<fileset dir="${basedir}">
<include name="META-INF/MANIFEST.MF"/>
@@ -400,10 +402,10 @@
<include name="fragment.xml"/>
</fileset>
</copy>
- <eclipse.versionReplacer path="${build.result.folder}" version="1.1.1.201607291027"/>
+ <eclipse.versionReplacer path="${build.result.folder}" version="1.1.1.201608011414"/>
<antcall target="apitools.generation">
<param name="projectLocation" value="${basedir}"/>
- <param name="binary.folders" value="${build.result.folder}/@dot:/common/home/bel/schwinn/lnx/git/git/silecs-eclipse-plugin/ext-jars/jaxen-1.1.6.jar:/common/home/bel/schwinn/lnx/git/git/silecs-eclipse-plugin/ext-jars/xalan-2.7.2.jar"/>
+ <param name="binary.folders" value="${build.result.folder}/@dot:/common/home/bel/schwinn/lnx/git/git/silecs-eclipse-plugin/ext-jars/xml-apis-1.3.04.jar:/common/home/bel/schwinn/lnx/git/git/silecs-eclipse-plugin/ext-jars/jaxen-1.1.6.jar:/common/home/bel/schwinn/lnx/git/git/silecs-eclipse-plugin/ext-jars/xalan-2.7.2.jar"/>
<param name="projectName" value="${bundleId}_${bundleVersion}"/>
<param name="target.folder" value="${build.result.folder}"/>
</antcall>
@@ -417,13 +419,13 @@
</target>
<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
- <mkdir dir="${destination.temp.folder}/silecs.eclipse.plugin_1.1.1.201607291027"/>
- <copy todir="${destination.temp.folder}/silecs.eclipse.plugin_1.1.1.201607291027" failonerror="true" overwrite="false">
+ <mkdir dir="${destination.temp.folder}/silecs.eclipse.plugin_1.1.1.201608011414"/>
+ <copy todir="${destination.temp.folder}/silecs.eclipse.plugin_1.1.1.201608011414" failonerror="true" overwrite="false">
<fileset dir="${build.result.folder}/@dot">
<include name="**"/>
</fileset>
</copy>
- <copy todir="${destination.temp.folder}/silecs.eclipse.plugin_1.1.1.201607291027" failonerror="true" overwrite="true">
+ <copy todir="${destination.temp.folder}/silecs.eclipse.plugin_1.1.1.201608011414" failonerror="true" overwrite="true">
<fileset dir="${basedir}">
<include name="plugin.xml"/>
<include name="META-INF/"/>
@@ -431,14 +433,19 @@
<include name="JNLP-INF/"/>
<include name="src/java/"/>
<include name="OSGI-INF/"/>
+ <include name="ext-jars/xml-apis-1.3.04.jar"/>
+ <include name="ext-jars/xalan-2.7.2.jar"/>
+ <include name="ext-jars/serializer-2.7.2.jar"/>
+ <include name="jaxen-1.1.6.jar"/>
+ <include name="xalan-2.7.2.jar"/>
</fileset>
</copy>
- <eclipse.versionReplacer path="${destination.temp.folder}/silecs.eclipse.plugin_1.1.1.201607291027" version="1.1.1.201607291027"/>
+ <eclipse.versionReplacer path="${destination.temp.folder}/silecs.eclipse.plugin_1.1.1.201608011414" version="1.1.1.201608011414"/>
<antcall target="apitools.generation">
<param name="projectLocation" value="${basedir}"/>
- <param name="binary.folders" value="${build.result.folder}/@dot:/common/home/bel/schwinn/lnx/git/git/silecs-eclipse-plugin/ext-jars/jaxen-1.1.6.jar:/common/home/bel/schwinn/lnx/git/git/silecs-eclipse-plugin/ext-jars/xalan-2.7.2.jar"/>
+ <param name="binary.folders" value="${build.result.folder}/@dot:/common/home/bel/schwinn/lnx/git/git/silecs-eclipse-plugin/ext-jars/xml-apis-1.3.04.jar:/common/home/bel/schwinn/lnx/git/git/silecs-eclipse-plugin/ext-jars/jaxen-1.1.6.jar:/common/home/bel/schwinn/lnx/git/git/silecs-eclipse-plugin/ext-jars/xalan-2.7.2.jar"/>
<param name="projectName" value="${bundleId}_${bundleVersion}"/>
- <param name="target.folder" value="${destination.temp.folder}/silecs.eclipse.plugin_1.1.1.201607291027"/>
+ <param name="target.folder" value="${destination.temp.folder}/silecs.eclipse.plugin_1.1.1.201608011414"/>
</antcall>
</target>
@@ -446,10 +453,10 @@
</target>
<target name="gather.sources" depends="init" if="destination.temp.folder">
- <mkdir dir="${destination.temp.folder}/silecs.eclipse.plugin_1.1.1.201607291027"/>
- <copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/silecs.eclipse.plugin_1.1.1.201607291027" failonerror="false" overwrite="false"/>
+ <mkdir dir="${destination.temp.folder}/silecs.eclipse.plugin_1.1.1.201608011414"/>
+ <copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/silecs.eclipse.plugin_1.1.1.201608011414" failonerror="false" overwrite="false"/>
<antcall target="copy.src.includes">
- <param name="source.destination.folder" value="${destination.temp.folder}/silecs.eclipse.plugin_1.1.1.201607291027"/>
+ <param name="source.destination.folder" value="${destination.temp.folder}/silecs.eclipse.plugin_1.1.1.201608011414"/>
</antcall>
</target>
@@ -471,8 +478,8 @@
</target>
<target name="gather.logs" depends="init" if="destination.temp.folder">
- <mkdir dir="${destination.temp.folder}/silecs.eclipse.plugin_1.1.1.201607291027"/>
- <copy todir="${destination.temp.folder}/silecs.eclipse.plugin_1.1.1.201607291027" failonerror="false" overwrite="false">
+ <mkdir dir="${destination.temp.folder}/silecs.eclipse.plugin_1.1.1.201608011414"/>
+ <copy todir="${destination.temp.folder}/silecs.eclipse.plugin_1.1.1.201608011414" failonerror="false" overwrite="false">
<fileset dir="${build.result.folder}">
<include name="@dot${logExtension}"/>
</fileset>
@@ -482,8 +489,8 @@
<target name="clean" depends="init" description="Clean the plug-in: silecs.eclipse.plugin of all the zips, jars and logs created.">
<delete dir="${build.result.folder}/@dot"/>
<delete file="${build.result.folder}/src.zip"/>
- <delete file="${plugin.destination}/silecs.eclipse.plugin_1.1.1.201607291027.jar"/>
- <delete file="${plugin.destination}/silecs.eclipse.plugin_1.1.1.201607291027.zip"/>
+ <delete file="${plugin.destination}/silecs.eclipse.plugin_1.1.1.201608011414.jar"/>
+ <delete file="${plugin.destination}/silecs.eclipse.plugin_1.1.1.201608011414.zip"/>
<delete dir="${temp.folder}"/>
<delete file="${compilation.problem.marker}" quiet="true"/>
</target>
@@ -509,7 +516,7 @@
<include name="**/*.bin${logExtension}"/>
</fileset>
</delete>
- <zip destfile="${plugin.destination}/silecs.eclipse.plugin_1.1.1.201607291027.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
+ <zip destfile="${plugin.destination}/silecs.eclipse.plugin_1.1.1.201608011414.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
<delete dir="${temp.folder}"/>
</target>
--
GitLab