AF-1987: Fixing webapps to use the correct preference implementation

kiegroup · Jul 4, 2019 · 9cbb40a · 9cbb40a
1 parent 76c8a0d
commit 9cbb40a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/dashbuilder/dashbuilder-webapp/pom.xml b/dashbuilder/dashbuilder-webapp/pom.xml
@@ -364,6 +364,11 @@
       <artifactId>uberfire-preferences-ui-client</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.uberfire</groupId>
+      <artifactId>uberfire-preferences-client</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.uberfire</groupId>
       <artifactId>uberfire-preferences-client-backend</artifactId>
@@ -742,6 +747,7 @@
             <compileSourcesArtifact>org.uberfire:uberfire-widgets-properties-editor-client</compileSourcesArtifact>
             <compileSourcesArtifact>org.uberfire:uberfire-simple-docks-client</compileSourcesArtifact>
             <compileSourcesArtifact>org.uberfire:uberfire-preferences-api</compileSourcesArtifact>
+            <compileSourcesArtifact>org.uberfire:uberfire-preferences-client-backend</compileSourcesArtifact>
             <compileSourcesArtifact>org.uberfire:uberfire-preferences-client</compileSourcesArtifact>
             <compileSourcesArtifact>org.uberfire:uberfire-preferences-ui-client</compileSourcesArtifact>
 

diff --git a/...ces-ui-client/src/main/resources/org/uberfire/ext/preferences/UberfirePreferences.gwt.xml b/...ces-ui-client/src/main/resources/org/uberfire/ext/preferences/UberfirePreferences.gwt.xml
@@ -31,7 +31,7 @@
   <!---->
   <!--<inherits name="org.uberfire.UberfireClientAPI"/>-->
   <!---->
-  <inherits name="org.uberfire.preferences.UberfirePreferencesClient"/>
+  <inherits name="org.uberfire.preferences.UberfirePreferencesClientBackend"/>
 
   <!--<inherits name="org.uberfire.ext.preferences.UberfirePreferencesAPI"/>-->
 

diff --git a/uberfire-showcase/uberfire-webapp/pom.xml b/uberfire-showcase/uberfire-webapp/pom.xml
@@ -278,6 +278,11 @@
       <artifactId>uberfire-preferences-client</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.uberfire</groupId>
+      <artifactId>uberfire-preferences-client-backend</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.uberfire</groupId>
       <artifactId>uberfire-preferences-processors</artifactId>
@@ -442,7 +447,6 @@
     <dependency>
       <groupId>com.google.inject</groupId>
       <artifactId>guice</artifactId>
-      <scope>provided</scope>
     </dependency>
 
     <!-- missing deps to avoid illegal transitive type dependencies -->
@@ -507,8 +511,6 @@
             <compileSourcesArtifact>org.uberfire:uberfire-nio2-model</compileSourcesArtifact>
             <compileSourcesArtifact>org.uberfire:uberfire-io</compileSourcesArtifact>
             <compileSourcesArtifact>org.uberfire:uberfire-api</compileSourcesArtifact>
-            <compileSourcesArtifact>org.uberfire:uberfire-preferences-api</compileSourcesArtifact>
-            <compileSourcesArtifact>org.uberfire:uberfire-preferences-client</compileSourcesArtifact>
             <compileSourcesArtifact>org.uberfire:uberfire-js</compileSourcesArtifact>
             <compileSourcesArtifact>org.uberfire:appformer-js-bridge</compileSourcesArtifact>
             <compileSourcesArtifact>org.uberfire:uberfire-security-api</compileSourcesArtifact>
@@ -524,6 +526,7 @@
             <!-- UF-ext -->
             <compileSourcesArtifact>org.uberfire:uberfire-preferences-api</compileSourcesArtifact>
             <compileSourcesArtifact>org.uberfire:uberfire-preferences-client-backend</compileSourcesArtifact>
+            <compileSourcesArtifact>org.uberfire:uberfire-preferences-client</compileSourcesArtifact>
             <compileSourcesArtifact>org.uberfire:uberfire-preferences-ui-client</compileSourcesArtifact>
             <compileSourcesArtifact>org.uberfire:uberfire-runtime-plugins-api</compileSourcesArtifact>
             <compileSourcesArtifact>org.uberfire:uberfire-runtime-plugins-client</compileSourcesArtifact>

diff --git a/uberfire-showcase/uberfire-webapp/src/main/resources/META-INF/ErraiApp.properties b/uberfire-showcase/uberfire-webapp/src/main/resources/META-INF/ErraiApp.properties
@@ -33,5 +33,3 @@
 errai.security.user_on_hostpage_enabled=true
 
 errai.marshalling.serializableTypes=org.uberfire.shared.experimental.ExperimentalAssetRemoved
-
-errai.ioc.enabled.alternatives=org.uberfire.preferences.client.store.PreferenceBeanStoreClientImpl