Merge remote-tracking branch 'extern/master'

configuration/buildAndUpdateProduct.sh

@@ -379,7 +379,7 @@ if [[ "$@" == "install" ]] || [[ "$@" == "all" ]]; then
     # make sure to save the information from env.sh
     . $ACDIR/env.sh
 
-    echo "$VERSION_INFO-$MONGDB_PORT-$MEMORY-$REPLICATION_CHANNEL" > $ACDIR/configuration/jetty/version.txt
+    echo "$VERSION_INFO-$MONGODB_PORT-$MEMORY-$REPLICATION_CHANNEL" > $ACDIR/configuration/jetty/version.txt
 
     sed -i "s/mongo.port=.*$/mongo.port=$MONGODB_PORT/g" $ACDIR/configuration/config.ini
     sed -i "s/expedition.udp.port=.*$/expedition.udp.port=$EXPEDITION_PORT/g" $ACDIR/configuration/config.ini

java/com.sap.sailing.manage2sail.resultimport/src/com/sap/sailing/manage2sail/resultimport/Activator.java

@@ -18,14 +18,14 @@ import com.sap.sailing.resultimport.ResultUrlRegistry;
 import com.sap.sailing.xrr.resultimport.ParserFactory;
 
 public class Activator implements BundleActivator {
-    private static String MANAGE2SAIL_TEST_URL = "https://orm.manage2sail.com/shadowtest_info/api/public/links/event/58f73e6c-ec07-4655-972c-e5d730f0048e?accesstoken=bDAv8CwsTM94ujZ&mediaType=json";
+    // private static String MANAGE2SAIL_TEST_URL = "https://orm.manage2sail.com/shadowtest_info/api/public/links/event/58f73e6c-ec07-4655-972c-e5d730f0048e?accesstoken=bDAv8CwsTM94ujZ&mediaType=json";
     private static String MANAGE2SAIL_PROD_URL = "http://manage2sail.com/api/public/links/event/da33884e-24fe-44f6-8501-d253587f7cc8?accesstoken=bDAv8CwsTM94ujZ&mediaType=json";
         
     public void start(BundleContext bundleContext) throws Exception {
         final ScoreCorrectionProviderImpl service = new ScoreCorrectionProviderImpl(ParserFactory.INSTANCE, ResultUrlRegistry.INSTANCE);
         bundleContext.registerService(ScoreCorrectionProvider.class, service, /* properties */null);
         
-        ResultUrlRegistry.INSTANCE.registerResultUrl(ScoreCorrectionProviderImpl.NAME, new URL(MANAGE2SAIL_TEST_URL));
+        // ResultUrlRegistry.INSTANCE.registerResultUrl(ScoreCorrectionProviderImpl.NAME, new URL(MANAGE2SAIL_TEST_URL));
         ResultUrlRegistry.INSTANCE.registerResultUrl(ScoreCorrectionProviderImpl.NAME, new URL(MANAGE2SAIL_PROD_URL));
         
         createAnAllCertificatesTrustingManagerforSSL();

java/com.sap.sailing.www/index.html

@@ -1,4 +1,3 @@
-<!DOCTYPE html>
 <html>
   <head>
     <link href='fontface.css' media='screen' rel='stylesheet' title='Default stylesheet' type='text/css' />
@@ -13,6 +12,11 @@
         <a class='sapLogo'>
           <img alt='SAP Website' src='images/sap-logo.png' />
         </a>
+        <ul class="headNavigation">
+            <li>
+                <a href="http://www.sapsailing.com/postrace/post-race-analytics-info.html">Post Race Information</a>
+            </li>
+        </ul>
       </div>
       <div id='contentWrapper'>
         <div id='keyVisual'>
@@ -112,7 +116,7 @@
                 </div>
               </div>
 	    </div>
-          
+
             <h2 class='articleSubheadline'>2012</h2>
             <h4>Championships</h4>
             <div class='timeBar'>
@@ -273,7 +277,7 @@
               </div>
               <div class='raceSection'>
                 <h5 class='date'>
-                  May 25 - 27 
+                  May 25 - 27
                 </h5>
                 <div class='raceTimepoint'></div>
                 <a href='http://yes2012.sapsailing.com' target='_blank'>
@@ -293,7 +297,7 @@
                   <a href='http://www.kyc.de/regatten/yes.html' target='_blank'>Official website</a>
                 </div>
               </div>
-              
+
             </div>
             <h2 class='articleSubheadline'>2011</h2>
             <h4>Championships</h4>

java/com.sap.sailing.www/main.css

@@ -88,6 +88,13 @@ a {
   width: 950px;
   margin: 0 auto;
   min-height: 100%; }
+  #yield_content .headNavigation {
+    float: right;
+    margin: 20px 0 0 0;
+    padding: 0; }
+    #yield_content .headNavigation a {
+      font-family: 'OpenSans-Bold';
+      color: #fff; }
   /* line 47, site.css.sass */
   #yield_content #pageHeadline {
     color: white;