Ant script is improved so to sign the launcher jar automatically. Check-out icon...

diff --git a/Workspace/Siman/.externalToolBuilders/Ant_Siman_War_Builder.launch b/Workspace/Siman/.externalToolBuilders/Ant_Siman_War_Builder.launch
index 0846a985850cb5001c71ae694d9cd46af6ebab2e..00f4d15fda6ab01be06cae7365cf4d44dc884a46 100644 (file)
--- a/Workspace/Siman/.externalToolBuilders/Ant_Siman_War_Builder.launch
+++ b/Workspace/Siman/.externalToolBuilders/Ant_Siman_War_Builder.launch
@@ -2,8 +2,8 @@
 <launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
 <stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_CLEAN_TARGETS" value="clean,"/>
 <booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;launchConfigurationWorkingSet editPageId=&quot;org.eclipse.ui.resourceWorkingSetPage&quot; factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; label=&quot;working set&quot; name=&quot;working set&quot;&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/Siman/dist&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/Siman/build/classes/hibernate.cfg.xml&quot; type=&quot;1&quot;/&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/Siman/build/classes/log4j.xml&quot; type=&quot;1&quot;/&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/Siman/build/classes/siman.properties&quot; type=&quot;1&quot;/&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/Siman/conf/generated&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/Siman/build/classes/labels.properties&quot; type=&quot;1&quot;/&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/Siman/build/classes/Test.class&quot; type=&quot;1&quot;/&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/Siman/build/classes/struts.xml&quot; type=&quot;1&quot;/&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/Siman/build/classes/som_en.properties&quot; type=&quot;1&quot;/&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/Siman/build/classes/spring&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/Siman/build/classes/som.properties&quot; type=&quot;1&quot;/&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/Siman-Common/dist&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/SPlat/dist&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/Siman/build/classes/jndi.properties&quot; type=&quot;1&quot;/&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/Siman/build/classes/labels_en.properties&quot; type=&quot;1&quot;/&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/Siman/build/classes/simer.properties&quot; type=&quot;1&quot;/&gt;&#13;&#10;&lt;/launchConfigurationWorkingSet&gt;}"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;launchConfigurationWorkingSet editPageId=&quot;org.eclipse.ui.resourceWorkingSetPage&quot; factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; label=&quot;working set&quot; name=&quot;working set&quot;&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/SPlat/dist&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/Siman/WebContent/jap&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/Siman/build/classes/jndi.properties&quot; type=&quot;1&quot;/&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/Siman/build/classes/labels.properties&quot; type=&quot;1&quot;/&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/Siman/build/classes/labels_en.properties&quot; type=&quot;1&quot;/&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/Siman/build/classes/log4j.xml&quot; type=&quot;1&quot;/&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/Siman/build/classes/siman.properties&quot; type=&quot;1&quot;/&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/Siman/build/classes/som.properties&quot; type=&quot;1&quot;/&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/Siman/build/classes/som_en.properties&quot; type=&quot;1&quot;/&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/Siman/build/classes/spring&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/Siman/build/classes/struts.xml&quot; type=&quot;1&quot;/&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/Siman/conf/generated&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/Siman/dist&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/Siman-Common/dist&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;/launchConfigurationWorkingSet&gt;}"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/Siman/build.xml"/>
 </listAttribute>
@@ -14,9 +14,12 @@
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_20"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Siman"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/Siman/build.xml}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,clean"/>
 <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/Siman}"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
 </launchConfiguration>

diff --git a/Workspace/Siman/WebContent/error.jsp b/Workspace/Siman/WebContent/error.jsp
index 2b048c18c95f2eaa3ad7c5247e98bb6cf201ad80..92f160fb7cc66338455700c144b0461bac29ea42 100644 (file)
--- a/Workspace/Siman/WebContent/error.jsp
+++ b/Workspace/Siman/WebContent/error.jsp
@@ -1,22 +1,14 @@
 <%@ page language="java" contentType="text/html; charset=ISO-8859-1"
     pageEncoding="ISO-8859-1"
-%><%@
-    taglib prefix="s" uri="/struts-tags"
 %>
+<%@taglib prefix="s" uri="/struts-tags"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<%  String  reason = request.getParameter("error");   
-%>
-<s:set var="reason"><%=reason%></s:set>
-
 <html>
-
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
     <title>SIMAN</title>
   </head>
-
   <body>
-    <s:text name="message.error.%{#reason}"/>
+    <s:text name="%{#parameters.error}"/>
   </body>
-
 </html>
\ No newline at end of file

diff --git a/Workspace/Siman/WebContent/jap/splat-launcher.jar b/Workspace/Siman/WebContent/jap/splat-launcher.jar
index cf88bdd6c612cddc9e62f01155678c1207007d6d..617fe5d8a0ec7cffeddae3e0193c812de323b6e8 100644 (file)
Binary files a/Workspace/Siman/WebContent/jap/splat-launcher.jar and b/Workspace/Siman/WebContent/jap/splat-launcher.jar differ

diff --git a/Workspace/Siman/WebContent/jap/splat-signedlauncher.jar b/Workspace/Siman/WebContent/jap/splat-signedlauncher.jar
index 34958b2382b72648cd9fbcbac15e7b46dc217c30..c2ca943647595b6b654b64c49b1ecc372c2a97ee 100644 (file)
Binary files a/Workspace/Siman/WebContent/jap/splat-signedlauncher.jar and b/Workspace/Siman/WebContent/jap/splat-signedlauncher.jar differ

diff --git a/Workspace/Siman/WebContent/jsp/toolbar.jsp b/Workspace/Siman/WebContent/jsp/toolbar.jsp
index aa9972ed827f7e7e56abbab44e17b4d03f8b5cb1..477281a62e7155d0302b5c71ca88e35ffd54244e 100644 (file)
--- a/Workspace/Siman/WebContent/jsp/toolbar.jsp
+++ b/Workspace/Siman/WebContent/jsp/toolbar.jsp
@@ -48,7 +48,7 @@
 
       if (study.getSelectedStepRights().canCreateDocument() && mbar != null) {
 %>
-      <applet name="perform" id="perform" code="org.splat.launcher.ToolbarApplet.class" archive="../jap/splat-signedlauncher.jar"
+      <applet name="perform" id="perform" code="org.splat.launcher.ToolbarApplet" archive="../jap/splat-signedlauncher.jar"
             width=<%=mbar.getWidth()%> height=<%=mbar.getHeight()%>>
 <%      Iterator<ToolButton> item = mbar.asList().iterator();
         for (int i=0; item.hasNext(); i++) {

diff --git a/Workspace/Siman/WebContent/skin/tool.any.old.png b/Workspace/Siman/WebContent/skin/tool.any.old.png
new file mode 100644 (file)
index 0000000..8b079df
Binary files /dev/null and b/Workspace/Siman/WebContent/skin/tool.any.old.png differ

diff --git a/Workspace/Siman/WebContent/skin/tool.any.png b/Workspace/Siman/WebContent/skin/tool.any.png
index 8b079dff6d4d76eb110316bcc8f77fdefdb15e1a..45a8346286c693a483f11f2016d319c349eb6565 100644 (file)
Binary files a/Workspace/Siman/WebContent/skin/tool.any.png and b/Workspace/Siman/WebContent/skin/tool.any.png differ

diff --git a/Workspace/Siman/build.xml b/Workspace/Siman/build.xml
index 0cb3a8c7415e6012b3b1cf7e60997091164b7922..4c2fa02038fe7e6bb388426c3ac0d7e2e9592a86 100644 (file)
--- a/Workspace/Siman/build.xml
+++ b/Workspace/Siman/build.xml
@@ -17,29 +17,38 @@
                <format property="time" pattern="${time.pattern}" />
        </tstamp>
 
-    <!-- ================================================= -->
-    <!--    launcher: Build launcher jar                   -->
-    <!-- ================================================= -->
-    <target name="launcher" description="Builds launcher jar">
-       <delete file="${siman.content.dir}/jap/splat-launcher.jar"/>
-        <jar destfile="${siman.content.dir}/jap/splat-launcher.jar">
-            <zipfileset dir="${siman.bin.dir}/classes">
-                <include name="org/splat/launcher/**" />
-            </zipfileset>
-            <manifest>
+       <!-- ================================================= -->
+       <!--    launcher: Build launcher jar                   -->
+       <!-- ================================================= -->
+       <target name="launcher" depends="compile-java" description="Builds launcher jar">
+               <delete file="${siman.content.dir}/jap/splat-launcher.jar" />
+               <jar destfile="${siman.content.dir}/jap/splat-launcher.jar">
+                       <zipfileset dir="${siman.bin.dir}/classes">
+                               <include name="org/splat/launcher/**" />
+                       </zipfileset>
+                       <manifest>
                 <attribute name="Built-By" value="${app.author}" />
                 <attribute name="Version" value="${app.version}" />
-                <attribute name="Built-Date" value="${timesimple}" />
-            </manifest>
-        </jar>
-    </target>
+                               <attribute name="Built-Date" value="${datesimple}" />
+                       </manifest>
+               </jar>
+       </target>
+       
+       <!-- ================================================= -->
+       <!--    launcher: Sign launcher jar                    -->
+       <!-- ================================================= -->
+       <target name="sign-launcher" depends="launcher" description="Signs launcher jar">
+               <!-- jarsigner -verbose -keystore launcherkeystore -signedjar splat-signedlauncher.jar splat-launcher.jar launcheralias-->
+               <delete file="${siman.content.dir}/jap/splat-signedlauncher.jar" />
+               <signjar verbose="on" keystore="${siman.content.dir}/jap/launcherkeystore" signedjar="${siman.content.dir}/jap/splat-signedlauncher.jar" jar="${siman.content.dir}/jap/splat-launcher.jar" alias="launcheralias" storepass="launcher" />
+       </target>
 
-    <!-- ================================================= -->
-    <!--    siman-common: Build Siman-Common project       -->
-    <!-- ================================================= -->
-    <target name="siman-common" description="Builds Siman-Common project">
-        <ant dir="../${siman-common.project.name}" />
-    </target>
+       <!-- ================================================= -->
+       <!--    siman-common: Build Siman-Common project       -->
+       <!-- ================================================= -->
+       <target name="siman-common" description="Builds Siman-Common project">
+               <ant dir="../${siman-common.project.name}" />
+       </target>
 
        <!-- ================================================= -->
        <!--    copy-config: Copy parametrized config files        -->
@@ -80,32 +89,30 @@
                <copy-config mode="release" />
        </target>
 
-    <!-- ===================================================================== -->
-    <!-- compile-java : compile the java classes                               -->
-    <!-- ===================================================================== -->
-    <target name="compile-java" depends="clean, siman-common" description="Builds the java classes">
-        <echo message="Compile Siman java classes" />
-<!--           <delete dir="${siman.bin.dir}/temp" quiet="true"/>-->
-        <mkdir dir="temp"/>
-        <javac target="1.6" srcdir="${siman.src.dir}"  destdir="temp" debug="${compiler.debug}" 
-               nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" 
-               optimize="${compiler.optimize}" deprecation="${compiler.deprecation}">
-            <classpath>
-                <fileset dir="${basedir}/../${siman-common.project.name}/${siman-common.ext.dir}" includes="**/*" />
-                <fileset dir="${basedir}/../${splat.project.name}/${splat.dist.dir}" includes="**/*" />
-                <fileset dir="${basedir}/../${splat.project.name}/${splat.lib.dir}" includes="**/*" />
-                <fileset dir="${basedir}/../${siman-common.project.name}/${siman-common.dist.dir}" includes="**/*" />
-                <fileset dir="${basedir}/../${siman-common.project.name}/${siman-common.lib.dir}" includes="**/*" />
-                <fileset dir="${siman.content.dir}/WEB-INF/lib" includes="**/*" />
-             </classpath>
-            <exclude name="test/**" />
-        </javac>
-    </target>
+       <!-- ===================================================================== -->
+       <!-- compile-java : compile the java classes                               -->
+       <!-- ===================================================================== -->
+       <target name="compile-java" depends="clean, siman-common" description="Builds the java classes">
+               <echo message="Compile Siman java classes" />
+               <!--            <delete dir="${siman.bin.dir}/temp" quiet="true"/>-->
+               <mkdir dir="temp" />
+               <javac target="1.6" srcdir="${siman.src.dir}" destdir="temp" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memoryMaximumSize="${compiler.max.memory}" optimize="${compiler.optimize}" deprecation="${compiler.deprecation}">
+                       <classpath>
+                               <fileset dir="${basedir}/../${siman-common.project.name}/${siman-common.ext.dir}" includes="**/*" />
+                               <fileset dir="${basedir}/../${splat.project.name}/${splat.dist.dir}" includes="**/*" />
+                               <fileset dir="${basedir}/../${splat.project.name}/${splat.lib.dir}" includes="**/*" />
+                               <fileset dir="${basedir}/../${siman-common.project.name}/${siman-common.dist.dir}" includes="**/*" />
+                               <fileset dir="${basedir}/../${siman-common.project.name}/${siman-common.lib.dir}" includes="**/*" />
+                               <fileset dir="${siman.content.dir}/WEB-INF/lib" includes="**/*" />
+                       </classpath>
+                       <exclude name="test/**" />
+               </javac>
+       </target>
 
        <!-- ===================================================================== -->
        <!-- build-dist : Create the war file                                                      -->
        <!-- ===================================================================== -->
-       <target name="build-war" depends="clean, siman-common, compile-java, release-config" description="Builds the WAR distribution">
+       <target name="build-war" depends="clean, sign-launcher, launcher, siman-common, compile-java, release-config" description="Builds the WAR distribution">
                <echo message="build ${webapp.name}.war" />
 
                <mkdir dir="${siman.dist.dir}" />