eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-15 16:51:07 +00:00
Code Activity

moved server-side QR code stuff from sse.common to sse because it's not GWT-compileable

Browse Source 
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/security/SailingPermissionsForRoleProvider.java
	java/com.sap.sse.security.common/src/com/sap/sse/security/shared/PermissionsForRoleProvider.java
	java/com.sap.sse.security/src/com/sap/sse/security/AbstractUserStoreBasedRealm.java
This commit is contained in:
Axel Uhl committed 2015-02-16 15:58:18 +01:00
1 parent 60be227a06
commit eaacd3f4c1
6 files changed
+9 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogTrackingAdapterImpl.java
+1 -1
View File
@@ -78,8 +78,8 @@ import com.sap.sse.common.TimePoint;
import com.sap.sse.common.Util;
import com.sap.sse.common.impl.MillisecondsTimePoint;
import com.sap.sse.common.mail.MailException;
import com.sap.sse.common.qrcode.QRCodeGenerationUtil;
import com.sap.sse.mail.MailService;
import com.sap.sse.qrcode.QRCodeGenerationUtil;
import com.sap.sse.util.impl.NonGwtUrlHelper;
public class RaceLogTrackingAdapterImpl implements RaceLogTrackingAdapter {
java/com.sap.sailing.gwt.ui/.settings/com.google.gwt.eclipse.core.prefs
+1 -1
View File
@@ -1,4 +1,4 @@
eclipse.preferences.version=1
entryPointModules=
filesCopiedToWebInfLib=gwt-servlet.jar
gwtCompileSettings=PGd3dC1jb21waWxlLXNldHRpbmdzPjxsb2ctbGV2ZWw+SU5GTzwvbG9nLWxldmVsPjxvdXRwdXQtc3R5bGU+T0JGVVNDQVRFRDwvb3V0cHV0LXN0eWxlPjxleHRyYS1hcmdzPjwhW0NEQVRBWy13YXIgLiAtbG9jYWxXb3JrZXJzIDQgLXN0cmljdCAtbG9nTGV2ZWwgVFJBQ0VdXT48L2V4dHJhLWFyZ3M+PHZtLWFyZ3M+PCFbQ0RBVEFbLVhteDIwMjRtIC1EZ3d0LnVzZWFyY2hpdmVzPWZhbHNlXV0+PC92bS1hcmdzPjxlbnRyeS1wb2ludC1tb2R1bGU+Y29tLnNhcC5zYWlsaW5nLmd3dC5Ib21lPC9lbnRyeS1wb2ludC1tb2R1bGU+PC9nd3QtY29tcGlsZS1zZXR0aW5ncz4\=
gwtCompileSettings=PGd3dC1jb21waWxlLXNldHRpbmdzPjxsb2ctbGV2ZWw+SU5GTzwvbG9nLWxldmVsPjxvdXRwdXQtc3R5bGU+T0JGVVNDQVRFRDwvb3V0cHV0LXN0eWxlPjxleHRyYS1hcmdzPjwhW0NEQVRBWy13YXIgLiAtbG9jYWxXb3JrZXJzIDQgLXN0cmljdCAtbG9nTGV2ZWwgVFJBQ0VdXT48L2V4dHJhLWFyZ3M+PHZtLWFyZ3M+PCFbQ0RBVEFbLVhteDIwMjRtIC1EZ3d0LnVzZWFyY2hpdmVzPWZhbHNlXV0+PC92bS1hcmdzPjxlbnRyeS1wb2ludC1tb2R1bGU+Y29tLnNhcC5zYWlsaW5nLmd3dC5BdXRvUGxheTwvZW50cnktcG9pbnQtbW9kdWxlPjwvZ3d0LWNvbXBpbGUtc2V0dGluZ3M+
java/com.sap.sse.common/META-INF/MANIFEST.MF
+1 -3
View File
@@ -9,10 +9,8 @@ Export-Package: com.sap.sse.common,
com.sap.sse.common.filter,
com.sap.sse.common.impl,
com.sap.sse.common.mail,
com.sap.sse.common.qrcode,
com.sap.sse.common.scalablevalue,
com.sap.sse.common.search,
com.sap.sse.common.util
Require-Bundle: com.sap.sse.datamining.shared;bundle-version="1.0.0",
org.apache.servicemix.bundles.zxing;bundle-version="3.1.0"
Require-Bundle: com.sap.sse.datamining.shared;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
java/com.sap.sse.security/src/com/sap/sse/security/AbstractUserStoreBasedRealm.java
+1
View File
@@ -19,6 +19,7 @@ import org.osgi.util.tracker.ServiceTracker;
import com.sap.sse.common.Util;
import com.sap.sse.security.impl.Activator;
import com.sap.sse.security.shared.PermissionsForRoleProvider;
import com.sap.sse.security.shared.UserManagementException;
public abstract class AbstractUserStoreBasedRealm extends AuthorizingRealm {
java/com.sap.sse/META-INF/MANIFEST.MF
+3 -1
View File
@@ -10,12 +10,14 @@ Export-Package: com.sap.sse,
com.sap.sse.i18n,
com.sap.sse.i18n.impl,
com.sap.sse.osgi,
com.sap.sse.qrcode,
com.sap.sse.util,
com.sap.sse.util.impl,
com.sap.sse.util.kmeans
Bundle-ActivationPolicy: lazy
Require-Bundle: com.sap.sse.common,
com.sap.sse.shared.android
com.sap.sse.shared.android,
org.apache.servicemix.bundles.zxing;bundle-version="3.1.0"
Import-Package: javax.servlet;version="3.1.0",
javax.servlet.http;version="3.1.0",
org.osgi.framework;version="1.8.0",
java/com.sap.sse.common/src/com/sap/sse/common/qrcode/QRCodeGenerationUtil.java → java/com.sap.sse/src/com/sap/sse/qrcode/QRCodeGenerationUtil.java
+2 -1
View File
@@ -1,4 +1,4 @@
package com.sap.sse.common.qrcode;
package com.sap.sse.qrcode;
import java.awt.Color;
import java.awt.Graphics2D;
@@ -22,6 +22,7 @@ import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
* QRCode generator based on the ZXing library.
*
* TODO have a look at repackaging <a href="https://github.com/kenglxn/QRGen">QRGen</a> as OSGi bundle.
*
* @author Fredrik Teschke
*
*/