mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-14 16:20:57 +00:00
Merge remote-tracking branch 'origin/ribdashboard' into ribdashboard
This commit is contained in:
commit
102b037401
16 files changed
+48
-40
No files matched your search
@@ -528,9 +528,10 @@ if [[ "$@" == "build" ]] || [[ "$@" == "all" ]]; then
|
||||
if [ $gwtcompile -eq 1 ]; then
|
||||
echo "INFO: Compiling GWT (rm -rf com.sap.$PROJECT_TYPE.gwt.ui/com.sap.$PROJECT_TYPE.*)"
|
||||
rm -rf com.sap.$PROJECT_TYPE.gwt.ui/com.sap.$PROJECT_TYPE.*
|
||||
GWT_XML_FILES=`find com.sap.$PROJECT_TYPE.gwt.ui/src/main/resources -name '*.gwt.xml'`
|
||||
if [ $onegwtpermutationonly -eq 1 ]; then
|
||||
echo "INFO: Patching .gwt.xml files such that only one GWT permutation needs to be compiled"
|
||||
for i in com.sap.$PROJECT_TYPE.gwt.ui/src/main/resources/com/sap/$PROJECT_TYPE/gwt/ui/*.gwt.xml; do
|
||||
for i in $GWT_XML_FILES; do
|
||||
echo "INFO: Patching $i files such that only one GWT permutation needs to be compiled"
|
||||
cp $i $i.bak
|
||||
cat $i | sed -e 's/^[ ]*<extend-property *name="locale" *values="de" *\/>/<!-- <extend-property name="locale" values="de"\/> --> <set-property name="user.agent" value="gecko1_8" \/>/' >$i.sed
|
||||
@@ -538,7 +539,7 @@ if [[ "$@" == "build" ]] || [[ "$@" == "all" ]]; then
|
||||
done
|
||||
else
|
||||
echo "INFO: Patching .gwt.xml files such that all GWT permutations are compiled"
|
||||
for i in com.sap.$PROJECT_TYPE.gwt.ui/src/main/resources/com/sap/$PROJECT_TYPE/gwt/ui/*.gwt.xml; do
|
||||
for i in $GWT_XML_FILES; do
|
||||
echo "INFO: Patching $i files such that all GWT permutations are compiled"
|
||||
cp $i $i.bak
|
||||
cat $i | sed -e 's/<!-- <extend-property *name="locale" *values="de" *\/> --> <set-property name="user.agent" value="gecko1_8" \/>/<extend-property name="locale" values="de"\/>/' >$i.sed
|
||||
@@ -632,7 +633,7 @@ if [[ "$@" == "build" ]] || [[ "$@" == "all" ]]; then
|
||||
if [ $gwtcompile -eq 1 ]; then
|
||||
# Now move back the backup .gwt.xml files before they were (maybe) patched
|
||||
echo "INFO: restoring backup copies of .gwt.xml files after they has been patched before"
|
||||
for i in com.sap.$PROJECT_TYPE.gwt.ui/src/main/resources/com/sap/$PROJECT_TYPE/gwt/ui/*.gwt.xml; do
|
||||
for i in $GWT_XML_FILES; do
|
||||
mv -v $i.bak $i
|
||||
done
|
||||
fi
|
||||
|
||||
@@ -24,29 +24,22 @@
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<!-- This dependency is required because the GWT Maven Plugin searches
|
||||
other GWT modules only in Maven dependencies -->
|
||||
<groupId>com.github.branflake2267</groupId>
|
||||
<artifactId>gwt-maps-api</artifactId>
|
||||
<version>3.9.0-build-17</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.sap.sailing</groupId>
|
||||
<artifactId>com.sap.sailing.gwt.ui</artifactId>
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
<classifier>sources</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.sap.sailing</groupId>
|
||||
<artifactId>com.sap.sailing.domain.common</artifactId>
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
<classifier>sources</classifier>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<!-- This dependency is required because the GWT Maven Plugin searches
|
||||
other GWT modules only in Maven dependencies -->
|
||||
<groupId>com.github.branflake2267</groupId>
|
||||
<artifactId>gwt-maps-api</artifactId>
|
||||
<version>3.9.0-build-17</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.sap.sailing</groupId>
|
||||
<artifactId>com.sap.sailing.gwt.ui</artifactId>
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
<classifier>sources</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.moxieapps.gwt</groupId>
|
||||
<artifactId>org.moxieapps.gwt.highcharts</artifactId>
|
||||
<version>1.6.0-SNAPSHOT</version>
|
||||
@@ -88,7 +81,7 @@
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
<classifier>sources</classifier>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencies>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
|
||||
@@ -145,6 +145,20 @@
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-source-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>plugin-source</id>
|
||||
<phase>generate-sources</phase>
|
||||
<goals>
|
||||
<goal>plugin-source</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
|
||||
+1
-1
@@ -58,7 +58,7 @@
|
||||
<set-property name="gwt.logging.popupHandler" value="DISABLED" />
|
||||
<set-property name="gwt.logging.systemHandler" value="ENABLED" />
|
||||
|
||||
<extend-property name="locale" values="de"/>
|
||||
<!-- <extend-property name="locale" values="de"/> --> <set-property name="user.agent" value="gecko1_8" />
|
||||
<extend-property name="locale" values="ru"/>
|
||||
|
||||
<!-- Turning CSS obfuscation off -->
|
||||
|
||||
+1
-1
@@ -30,7 +30,7 @@
|
||||
<entry-point class="com.sap.sailing.gwt.ui.datamining.DataMiningEntryPoint" />
|
||||
|
||||
<!-- Specify the paths for translatable code -->
|
||||
<extend-property name="locale" values="de"/>
|
||||
<!-- <extend-property name="locale" values="de"/> --> <set-property name="user.agent" value="gecko1_8" />
|
||||
<extend-property name="locale" values="ru"/>
|
||||
|
||||
<source path='common'/>
|
||||
|
||||
+1
-1
@@ -7,5 +7,5 @@
|
||||
|
||||
<super-source path="jre" />
|
||||
|
||||
<extend-property name="locale" values="de"/>
|
||||
<!-- <extend-property name="locale" values="de"/> --> <set-property name="user.agent" value="gecko1_8" />
|
||||
</module>
|
||||
+1
-1
@@ -41,7 +41,7 @@
|
||||
<entry-point class='com.sap.sailing.gwt.ui.leaderboard.LeaderboardEntryPoint'/>
|
||||
|
||||
<!-- Specify the paths for translatable code -->
|
||||
<extend-property name="locale" values="de"/>
|
||||
<!-- <extend-property name="locale" values="de"/> --> <set-property name="user.agent" value="gecko1_8" />
|
||||
<extend-property name="locale" values="ru"/>
|
||||
|
||||
<source path='common'/>
|
||||
|
||||
+1
-1
@@ -37,7 +37,7 @@
|
||||
<entry-point class='com.sap.sailing.gwt.ui.leaderboardedit.LeaderboardEditPage'/>
|
||||
|
||||
<!-- Specify the paths for translatable code -->
|
||||
<extend-property name="locale" values="de"/>
|
||||
<!-- <extend-property name="locale" values="de"/> --> <set-property name="user.agent" value="gecko1_8" />
|
||||
|
||||
<source path='common'/>
|
||||
<source path='client'/>
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
<set-property name="gwt.logging.systemHandler" value="ENABLED" />
|
||||
|
||||
<!-- Specify the paths for translatable code -->
|
||||
<extend-property name="locale" values="de" />
|
||||
<!-- <extend-property name="locale" values="de"/> --> <set-property name="user.agent" value="gecko1_8" />
|
||||
<extend-property name="locale" values="ru" />
|
||||
|
||||
<source path='client' />
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
<inherits name="com.google.gwt.user.User" />
|
||||
|
||||
<!-- Specify the paths for translatable code -->
|
||||
<extend-property name="locale" values="de"/>
|
||||
<!-- <extend-property name="locale" values="de"/> --> <set-property name="user.agent" value="gecko1_8" />
|
||||
|
||||
<entry-point class="com.sap.sailing.gwt.ui.polarsheets.PolarSheetsEntryPoint">
|
||||
</entry-point>
|
||||
|
||||
+1
-1
@@ -32,7 +32,7 @@
|
||||
<entry-point class='com.sap.sailing.gwt.ui.raceboard.RaceBoardEntryPoint'/>
|
||||
|
||||
<!-- Specify the paths for translatable code -->
|
||||
<extend-property name="locale" values="de"/>
|
||||
<!-- <extend-property name="locale" values="de"/> --> <set-property name="user.agent" value="gecko1_8" />
|
||||
<extend-property name="locale" values="ru"/>
|
||||
|
||||
<!-- Uncomment this to get clear-text CSS style/class names in generated output -->
|
||||
|
||||
+1
-1
@@ -48,7 +48,7 @@
|
||||
<set-property name="gwt.logging.systemHandler" value="ENABLED" />
|
||||
|
||||
<!-- Specify the paths for translatable code -->
|
||||
<extend-property name="locale" values="de"/>
|
||||
<!-- <extend-property name="locale" values="de"/> --> <set-property name="user.agent" value="gecko1_8" />
|
||||
<extend-property name="locale" values="ru"/>
|
||||
|
||||
<source path='common'/>
|
||||
|
||||
+1
-1
@@ -40,7 +40,7 @@
|
||||
<!-- Specify the app entry point class. -->
|
||||
<entry-point class='com.sap.sailing.gwt.ui.simulator.SimulatorEntryPoint' />
|
||||
<!-- Specify the paths for translatable code -->
|
||||
<extend-property name="locale" values="de" />
|
||||
<!-- <extend-property name="locale" values="de"/> --> <set-property name="user.agent" value="gecko1_8" />
|
||||
<extend-property name="locale" values="ru" />
|
||||
|
||||
<source path='common' />
|
||||
|
||||
+1
-1
@@ -39,7 +39,7 @@
|
||||
<entry-point class='com.sap.sailing.gwt.ui.spectator.SpectatorEntryPoint'/>
|
||||
|
||||
<!-- Specify the paths for translatable code -->
|
||||
<extend-property name="locale" values="de"/>
|
||||
<!-- <extend-property name="locale" values="de"/> --> <set-property name="user.agent" value="gecko1_8" />
|
||||
<extend-property name="locale" values="ru"/>
|
||||
|
||||
<source path='common'/>
|
||||
|
||||
+1
-1
@@ -26,7 +26,7 @@
|
||||
|
||||
<entry-point class="com.sap.sailing.gwt.ui.client.media.popup.VideoPopupWindow" />
|
||||
|
||||
<extend-property name="locale" values="de"/>
|
||||
<!-- <extend-property name="locale" values="de"/> --> <set-property name="user.agent" value="gecko1_8" />
|
||||
|
||||
<source path='client' />
|
||||
<source path='actions'/>
|
||||
|
||||
+1
-1
@@ -24,7 +24,7 @@
|
||||
|
||||
<entry-point class="com.sap.sailing.gwt.ui.client.media.popup.YoutubePopupWindow" />
|
||||
|
||||
<extend-property name="locale" values="de"/>
|
||||
<!-- <extend-property name="locale" values="de"/> --> <set-property name="user.agent" value="gecko1_8" />
|
||||
<source path='client'/>
|
||||
<source path='shared'/>
|
||||
<source path='actions'/>
|
||||
|
||||
Reference in new issue
Block a user