gs-reactor: Rename packages to make compilation with maven work

This is a workaround for a bug in javac, where compilation fails or succeeds depending on the order of imports.
genericsystem · Oct 5, 2016 · 7005918 · 7005918
1 parent 5fe7664
commit 7005918
Show file tree

Hide file tree

Showing 92 changed files with 398 additions and 397 deletions.
diff --git a/gs-carcolor/src/main/java/org/genericsystem/carcolor/CarColorApp.java b/gs-carcolor/src/main/java/org/genericsystem/carcolor/CarColorApp.java
@@ -7,20 +7,20 @@
 import org.genericsystem.carcolor.model.Power;
 import org.genericsystem.common.Generic;
 import org.genericsystem.common.Root;
+import org.genericsystem.reactor.aa_modelproperties.SelectionDefaults;
 import org.genericsystem.reactor.annotations.DependsOnModel;
 import org.genericsystem.reactor.annotations.RunScript;
 import org.genericsystem.reactor.appserver.ApplicationServer;
 import org.genericsystem.reactor.appserver.Script;
-import org.genericsystem.reactor.az.FlexDirection;
-import org.genericsystem.reactor.az.GSApp;
-import org.genericsystem.reactor.az.GSEditor;
-import org.genericsystem.reactor.az.GSHeader;
-import org.genericsystem.reactor.az.GSLogo;
-import org.genericsystem.reactor.az.GSModal;
-import org.genericsystem.reactor.az.GSMonitor;
-import org.genericsystem.reactor.az.GSResponsive;
-import org.genericsystem.reactor.az.GSTable;
-import org.genericsystem.reactor.modelproperties.SelectionDefaults;
+import org.genericsystem.reactor.ca_gscomponents.FlexDirection;
+import org.genericsystem.reactor.ca_gscomponents.GSApp;
+import org.genericsystem.reactor.ca_gscomponents.GSEditor;
+import org.genericsystem.reactor.ca_gscomponents.GSHeader;
+import org.genericsystem.reactor.ca_gscomponents.GSLogo;
+import org.genericsystem.reactor.ca_gscomponents.GSModal;
+import org.genericsystem.reactor.ca_gscomponents.GSMonitor;
+import org.genericsystem.reactor.ca_gscomponents.GSResponsive;
+import org.genericsystem.reactor.ca_gscomponents.GSTable;
 
 /**
  * @author Nicolas Feybesse

diff --git a/gs-carcolor/src/main/java/org/genericsystem/carcolor/GSUserGuide.java b/gs-carcolor/src/main/java/org/genericsystem/carcolor/GSUserGuide.java
@@ -1,12 +1,12 @@
 package org.genericsystem.carcolor;
 
 import org.genericsystem.reactor.Tag;
-import org.genericsystem.reactor.az.FlexDirection;
-import org.genericsystem.reactor.az.GSDiv;
-import org.genericsystem.reactor.az.GSModalButton;
-import org.genericsystem.reactor.gstag.HtmlHyperLink;
-import org.genericsystem.reactor.gstag.HtmlLi;
-import org.genericsystem.reactor.gstag.HtmlUl;
+import org.genericsystem.reactor.ba_htmltag.HtmlHyperLink;
+import org.genericsystem.reactor.ba_htmltag.HtmlLi;
+import org.genericsystem.reactor.ba_htmltag.HtmlUl;
+import org.genericsystem.reactor.ca_gscomponents.FlexDirection;
+import org.genericsystem.reactor.ca_gscomponents.GSDiv;
+import org.genericsystem.reactor.ca_gscomponents.GSModalButton;
 
 public class GSUserGuide extends GSDiv {
 

diff --git a/gs-example-reactor/src/main/java/org/genericsystem/reactor/example/AppHtml.java b/gs-example-reactor/src/main/java/org/genericsystem/reactor/example/AppHtml.java
@@ -10,21 +10,21 @@
 import org.genericsystem.common.Generic;
 import org.genericsystem.common.Root;
 import org.genericsystem.kernel.Engine;
+import org.genericsystem.reactor.aa_modelproperties.SelectionDefaults;
 import org.genericsystem.reactor.annotations.DependsOnModel;
 import org.genericsystem.reactor.annotations.RunScript;
 import org.genericsystem.reactor.appserver.ApplicationServer;
 import org.genericsystem.reactor.appserver.Script;
-import org.genericsystem.reactor.az.FlexDirection;
-import org.genericsystem.reactor.az.GSApp;
-import org.genericsystem.reactor.az.GSEditor;
-import org.genericsystem.reactor.az.GSMonitorExtended;
-import org.genericsystem.reactor.az.GSStepEditor;
-import org.genericsystem.reactor.az.GSTable;
-import org.genericsystem.reactor.az.GSComposite.ColorCompositeRadio;
-import org.genericsystem.reactor.az.GSComposite.ColorTitleCompositeFlexElement;
+import org.genericsystem.reactor.ca_gscomponents.FlexDirection;
+import org.genericsystem.reactor.ca_gscomponents.GSApp;
+import org.genericsystem.reactor.ca_gscomponents.GSEditor;
+import org.genericsystem.reactor.ca_gscomponents.GSMonitorExtended;
+import org.genericsystem.reactor.ca_gscomponents.GSStepEditor;
+import org.genericsystem.reactor.ca_gscomponents.GSTable;
+import org.genericsystem.reactor.ca_gscomponents.GSComposite.ColorCompositeRadio;
+import org.genericsystem.reactor.ca_gscomponents.GSComposite.ColorTitleCompositeFlexElement;
 import org.genericsystem.reactor.example.AppHtml.ExampleReactorScript;
 import org.genericsystem.reactor.model.ObservableListExtractor;
-import org.genericsystem.reactor.modelproperties.SelectionDefaults;
 
 @DependsOnModel({ Car.class, Power.class, UsedCar.class, Color.class, CarColor.class, CarColor2.class })
 @RunScript(ExampleReactorScript.class)

diff --git a/gs-example-reactor/src/main/java/org/genericsystem/reactor/example/AppHtml3.java b/gs-example-reactor/src/main/java/org/genericsystem/reactor/example/AppHtml3.java
@@ -6,16 +6,16 @@
 import org.genericsystem.carcolor.model.Color;
 import org.genericsystem.carcolor.model.Power;
 import org.genericsystem.carcolor.model.UsedCar;
+import org.genericsystem.reactor.aa_modelproperties.SelectionDefaults;
 import org.genericsystem.reactor.annotations.DependsOnModel;
 import org.genericsystem.reactor.annotations.RunScript;
 import org.genericsystem.reactor.appserver.ApplicationServer;
-import org.genericsystem.reactor.az.GSApp;
-import org.genericsystem.reactor.az3.GSEditor;
-import org.genericsystem.reactor.az3.GSTable;
-import org.genericsystem.reactor.az3.GSEditor.HorizontalGSEditor;
-import org.genericsystem.reactor.az3.GSTable.HorizontalTable;
+import org.genericsystem.reactor.ca_gscomponents.GSApp;
+import org.genericsystem.reactor.ca_gscomponents2.GSEditor;
+import org.genericsystem.reactor.ca_gscomponents2.GSTable;
+import org.genericsystem.reactor.ca_gscomponents2.GSEditor.HorizontalGSEditor;
+import org.genericsystem.reactor.ca_gscomponents2.GSTable.HorizontalTable;
 import org.genericsystem.reactor.example.AppHtml.ExampleReactorScript;
-import org.genericsystem.reactor.modelproperties.SelectionDefaults;
 
 @DependsOnModel({ Car.class, Power.class, UsedCar.class, Color.class, CarColor.class, CarColor2.class })
 @RunScript(ExampleReactorScript.class)

diff --git a/gs-example-reactor/src/main/java/org/genericsystem/reactor/example/AppHtml4.java b/gs-example-reactor/src/main/java/org/genericsystem/reactor/example/AppHtml4.java
@@ -8,6 +8,7 @@
 import org.genericsystem.carcolor.model.UsedCar;
 import org.genericsystem.reactor.annotations.ForEach;
 import org.genericsystem.reactor.annotations.ReactorDependencies;
+import org.genericsystem.reactor.aa_modelproperties.SelectionDefaults;
 import org.genericsystem.reactor.annotations.DependsOnModel;
 import org.genericsystem.reactor.annotations.DirectSelect;
 import org.genericsystem.reactor.annotations.RunScript;
@@ -18,9 +19,10 @@
 import org.genericsystem.reactor.annotations.Styles.FlexWrap;
 import org.genericsystem.reactor.annotations.Styles.Overflow;
 import org.genericsystem.reactor.appserver.ApplicationServer;
-import org.genericsystem.reactor.az.FlexDirection;
-import org.genericsystem.reactor.az.GSApp;
-import org.genericsystem.reactor.az.GSDiv;
+import org.genericsystem.reactor.ba_htmltag.HtmlLabel.GSLabelDisplayer;
+import org.genericsystem.reactor.ca_gscomponents.FlexDirection;
+import org.genericsystem.reactor.ca_gscomponents.GSApp;
+import org.genericsystem.reactor.ca_gscomponents.GSDiv;
 import org.genericsystem.reactor.example.AppHtml.ExampleReactorScript;
 import org.genericsystem.reactor.example.AppHtml4.GSAttributesComposite;
 import org.genericsystem.reactor.example.AppHtml4.GSAttributesComposite.GSAttributesContentComponent;
@@ -41,10 +43,8 @@
 import org.genericsystem.reactor.example.AppHtml4.GSTypeRowLabeledTypeAttributesComposite;
 import org.genericsystem.reactor.example.AppHtml4.GSTypeRowLabeledTypeAttributesComposite.GSHeaderComponent;
 import org.genericsystem.reactor.example.AppHtml4.GSTypeRowLabeledTypeAttributesComposite.GSHeaderComponent.GSHeaderComponentLabel;
-import org.genericsystem.reactor.gstag.HtmlLabel.GSLabelDisplayer;
 import org.genericsystem.reactor.model.ObservableListExtractor;
 import org.genericsystem.reactor.model.ObservableListExtractor.ATTRIBUTES_OF_INSTANCES;
-import org.genericsystem.reactor.modelproperties.SelectionDefaults;
 
 @DependsOnModel({ Car.class, Power.class, UsedCar.class, Color.class, CarColor.class, CarColor2.class })
 @RunScript(ExampleReactorScript.class)

diff --git a/gs-example-reactor/src/main/java/org/genericsystem/reactor/example/AppHtml5.java b/gs-example-reactor/src/main/java/org/genericsystem/reactor/example/AppHtml5.java
@@ -6,6 +6,7 @@
 import org.genericsystem.carcolor.model.Color;
 import org.genericsystem.carcolor.model.Power;
 import org.genericsystem.carcolor.model.UsedCar;
+import org.genericsystem.reactor.aa_modelproperties.SelectionDefaults;
 import org.genericsystem.reactor.annotations.DependsOnModel;
 import org.genericsystem.reactor.annotations.DirectSelect;
 import org.genericsystem.reactor.annotations.ReactorDependencies;
@@ -15,18 +16,17 @@
 import org.genericsystem.reactor.annotations.Styles.FlexDirectionStyle;
 import org.genericsystem.reactor.annotations.Styles.FlexWrap;
 import org.genericsystem.reactor.appserver.ApplicationServer;
-import org.genericsystem.reactor.az.FlexDirection;
-import org.genericsystem.reactor.az.GSApp;
-import org.genericsystem.reactor.az3.InstanceEditor;
-import org.genericsystem.reactor.az3.TitledDiv.TitledInstanceEditor;
-import org.genericsystem.reactor.az3.TitledDiv.TitledInstancesTable;
+import org.genericsystem.reactor.ca_gscomponents.FlexDirection;
+import org.genericsystem.reactor.ca_gscomponents.GSApp;
+import org.genericsystem.reactor.ca_gscomponents2.InstanceEditor;
+import org.genericsystem.reactor.ca_gscomponents2.DivWithTitle.TitledInstanceEditor;
+import org.genericsystem.reactor.ca_gscomponents2.DivWithTitle.TitledInstancesTable;
 import org.genericsystem.reactor.example.AppHtml.ExampleReactorScript;
 import org.genericsystem.reactor.example.AppHtml5.CarInstancesTable;
 import org.genericsystem.reactor.example.AppHtml5.ColorInstancesTable;
 import org.genericsystem.reactor.example.AppHtml5.ColumnSelectedInstanceEditor;
 import org.genericsystem.reactor.example.AppHtml5.SelectedInstanceEditor;
 import org.genericsystem.reactor.model.ObservableModelSelector;
-import org.genericsystem.reactor.modelproperties.SelectionDefaults;
 
 @DependsOnModel({ Car.class, Power.class, UsedCar.class, Color.class, CarColor.class, CarColor2.class })
 @RunScript(ExampleReactorScript.class)

diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/Tag.java b/gs-reactor/src/main/java/org/genericsystem/reactor/Tag.java
@@ -17,6 +17,13 @@
 import org.genericsystem.common.Generic;
 import org.genericsystem.defaults.tools.BindingsTools;
 import org.genericsystem.reactor.HtmlDomNode.RootHtmlDomNode;
+import org.genericsystem.reactor.aa_modelproperties.AttributesDefaults;
+import org.genericsystem.reactor.aa_modelproperties.DisplayDefaults;
+import org.genericsystem.reactor.aa_modelproperties.GenericStringDefaults;
+import org.genericsystem.reactor.aa_modelproperties.SelectionDefaults;
+import org.genericsystem.reactor.aa_modelproperties.StyleClassesDefaults;
+import org.genericsystem.reactor.aa_modelproperties.StylesDefaults;
+import org.genericsystem.reactor.aa_modelproperties.TextPropertyDefaults;
 import org.genericsystem.reactor.annotations.BindSelection;
 import org.genericsystem.reactor.annotations.DirectSelect;
 import org.genericsystem.reactor.annotations.ForEach;
@@ -41,18 +48,11 @@
 import org.genericsystem.reactor.annotations.Styles.ReverseFlexDirection;
 import org.genericsystem.reactor.annotations.Styles.Style;
 import org.genericsystem.reactor.annotations.Styles.Width;
-import org.genericsystem.reactor.az.GSDiv;
-import org.genericsystem.reactor.az.GSTagImpl;
+import org.genericsystem.reactor.ca_gscomponents.GSDiv;
+import org.genericsystem.reactor.ca_gscomponents.GSTagImpl;
 import org.genericsystem.reactor.model.ObservableListExtractor;
 import org.genericsystem.reactor.model.ObservableListExtractor.NO_FOR_EACH;
 import org.genericsystem.reactor.model.StringExtractor;
-import org.genericsystem.reactor.modelproperties.AttributesDefaults;
-import org.genericsystem.reactor.modelproperties.DisplayDefaults;
-import org.genericsystem.reactor.modelproperties.GenericStringDefaults;
-import org.genericsystem.reactor.modelproperties.SelectionDefaults;
-import org.genericsystem.reactor.modelproperties.StyleClassesDefaults;
-import org.genericsystem.reactor.modelproperties.StylesDefaults;
-import org.genericsystem.reactor.modelproperties.TextPropertyDefaults;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...actor/modelproperties/ActionDefaults.java → ...or/aa_modelproperties/ActionDefaults.java b/...actor/modelproperties/ActionDefaults.java → ...or/aa_modelproperties/ActionDefaults.java
@@ -1,4 +1,4 @@
-package org.genericsystem.reactor.modelproperties;
+package org.genericsystem.reactor.aa_modelproperties;
 
 import java.util.function.Consumer;
 

diff --git a/...r/modelproperties/AttributesDefaults.java → ...a_modelproperties/AttributesDefaults.java b/...r/modelproperties/AttributesDefaults.java → ...a_modelproperties/AttributesDefaults.java
@@ -1,4 +1,4 @@
-package org.genericsystem.reactor.modelproperties;
+package org.genericsystem.reactor.aa_modelproperties;
 
 import javafx.collections.ObservableMap;
 

diff --git a/...r/modelproperties/ComponentsDefaults.java → ...a_modelproperties/ComponentsDefaults.java b/...r/modelproperties/ComponentsDefaults.java → ...a_modelproperties/ComponentsDefaults.java
@@ -1,4 +1,4 @@
-package org.genericsystem.reactor.modelproperties;
+package org.genericsystem.reactor.aa_modelproperties;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...ctor/modelproperties/ContextProperty.java → ...r/aa_modelproperties/ContextProperty.java b/...ctor/modelproperties/ContextProperty.java → ...r/aa_modelproperties/ContextProperty.java
@@ -1,4 +1,4 @@
-package org.genericsystem.reactor.modelproperties;
+package org.genericsystem.reactor.aa_modelproperties;
 
 import java.io.Serializable;
 import java.util.function.BiConsumer;

diff --git a/...delproperties/ConvertedValueDefaults.java → ...delproperties/ConvertedValueDefaults.java b/...delproperties/ConvertedValueDefaults.java → ...delproperties/ConvertedValueDefaults.java
@@ -1,4 +1,4 @@
-package org.genericsystem.reactor.modelproperties;
+package org.genericsystem.reactor.aa_modelproperties;
 
 import java.io.Serializable;
 import java.util.function.BiConsumer;

diff --git a/...ctor/modelproperties/DisplayDefaults.java → ...r/aa_modelproperties/DisplayDefaults.java b/...ctor/modelproperties/DisplayDefaults.java → ...r/aa_modelproperties/DisplayDefaults.java
@@ -1,4 +1,4 @@
-package org.genericsystem.reactor.modelproperties;
+package org.genericsystem.reactor.aa_modelproperties;
 
 import org.genericsystem.reactor.Context;
 

diff --git a/...or/modelproperties/GSBuilderDefaults.java → ...aa_modelproperties/GSBuilderDefaults.java b/...or/modelproperties/GSBuilderDefaults.java → ...aa_modelproperties/GSBuilderDefaults.java
@@ -1,4 +1,4 @@
-package org.genericsystem.reactor.modelproperties;
+package org.genericsystem.reactor.aa_modelproperties;
 
 import java.io.Serializable;
 import java.util.ArrayList;

diff --git a/...odelproperties/GenericStringDefaults.java → ...odelproperties/GenericStringDefaults.java b/...odelproperties/GenericStringDefaults.java → ...odelproperties/GenericStringDefaults.java
@@ -1,4 +1,4 @@
-package org.genericsystem.reactor.modelproperties;
+package org.genericsystem.reactor.aa_modelproperties;
 
 import javafx.beans.property.Property;
 import javafx.beans.property.ReadOnlyObjectWrapper;

diff --git a/...or/modelproperties/MapStringDefaults.java → ...aa_modelproperties/MapStringDefaults.java b/...or/modelproperties/MapStringDefaults.java → ...aa_modelproperties/MapStringDefaults.java
@@ -1,4 +1,4 @@
-package org.genericsystem.reactor.modelproperties;
+package org.genericsystem.reactor.aa_modelproperties;
 
 import java.util.function.Function;
 

diff --git a/...or/modelproperties/SelectionDefaults.java → ...aa_modelproperties/SelectionDefaults.java b/...or/modelproperties/SelectionDefaults.java → ...aa_modelproperties/SelectionDefaults.java
@@ -1,4 +1,4 @@
-package org.genericsystem.reactor.modelproperties;
+package org.genericsystem.reactor.aa_modelproperties;
 
 import java.util.Optional;
 import java.util.stream.Collectors;

diff --git a/...modelproperties/StyleClassesDefaults.java → ...modelproperties/StyleClassesDefaults.java b/...modelproperties/StyleClassesDefaults.java → ...modelproperties/StyleClassesDefaults.java
@@ -1,4 +1,4 @@
-package org.genericsystem.reactor.modelproperties;
+package org.genericsystem.reactor.aa_modelproperties;
 
 import org.genericsystem.reactor.Context;
 import org.genericsystem.reactor.Tag;

diff --git a/...actor/modelproperties/StylesDefaults.java → ...or/aa_modelproperties/StylesDefaults.java b/...actor/modelproperties/StylesDefaults.java → ...or/aa_modelproperties/StylesDefaults.java
@@ -1,4 +1,4 @@
-package org.genericsystem.reactor.modelproperties;
+package org.genericsystem.reactor.aa_modelproperties;
 
 import javafx.beans.property.Property;
 import javafx.collections.ObservableMap;

diff --git a/...actor/modelproperties/SwitchDefaults.java → ...or/aa_modelproperties/SwitchDefaults.java b/...actor/modelproperties/SwitchDefaults.java → ...or/aa_modelproperties/SwitchDefaults.java
@@ -1,4 +1,4 @@
-package org.genericsystem.reactor.modelproperties;
+package org.genericsystem.reactor.aa_modelproperties;
 
 import org.genericsystem.reactor.Context;
 import org.genericsystem.reactor.Tag;

diff --git a/...modelproperties/TextPropertyDefaults.java → ...modelproperties/TextPropertyDefaults.java b/...modelproperties/TextPropertyDefaults.java → ...modelproperties/TextPropertyDefaults.java
@@ -1,4 +1,4 @@
-package org.genericsystem.reactor.modelproperties;
+package org.genericsystem.reactor.aa_modelproperties;
 
 import java.util.function.Function;
 

diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/BindSelection.java b/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/BindSelection.java
@@ -5,7 +5,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.genericsystem.reactor.az.GSTagImpl;
+import org.genericsystem.reactor.ca_gscomponents.GSTagImpl;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.TYPE })

diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/DirectSelect.java b/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/DirectSelect.java
@@ -7,7 +7,7 @@
 import java.lang.annotation.Target;
 
 import org.genericsystem.reactor.annotations.DirectSelect.DirectSelects;
-import org.genericsystem.reactor.az.GSTagImpl;
+import org.genericsystem.reactor.ca_gscomponents.GSTagImpl;
 
 /**
  * @author Nicolas Feybesse

diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/ForEach.java b/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/ForEach.java
@@ -7,7 +7,7 @@
 import java.lang.annotation.Target;
 
 import org.genericsystem.reactor.annotations.ForEach.ForEachs;
-import org.genericsystem.reactor.az.GSTagImpl;
+import org.genericsystem.reactor.ca_gscomponents.GSTagImpl;
 import org.genericsystem.reactor.model.ObservableListExtractor;
 
 /**

diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/Parent.java b/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/Parent.java
@@ -6,7 +6,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.genericsystem.reactor.az.GSTagImpl;
+import org.genericsystem.reactor.ca_gscomponents.GSTagImpl;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.TYPE })

diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/ReactorDependencies.java b/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/ReactorDependencies.java
@@ -7,7 +7,7 @@
 import java.lang.annotation.Target;
 
 import org.genericsystem.reactor.annotations.ReactorDependencies.ReactorDependenciesMult;
-import org.genericsystem.reactor.az.GSTagImpl;
+import org.genericsystem.reactor.ca_gscomponents.GSTagImpl;
 
 /**
  * @author Nicolas Feybesse

diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/Select.java b/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/Select.java
@@ -7,7 +7,7 @@
 import java.lang.annotation.Target;
 
 import org.genericsystem.reactor.annotations.Select.Selects;
-import org.genericsystem.reactor.az.GSTagImpl;
+import org.genericsystem.reactor.ca_gscomponents.GSTagImpl;
 import org.genericsystem.reactor.model.ObservableModelSelector;
 import org.genericsystem.reactor.model.ObservableValueSelector;
 

diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/SetStringExtractor.java b/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/SetStringExtractor.java
@@ -7,7 +7,7 @@
 import java.lang.annotation.Target;
 
 import org.genericsystem.reactor.annotations.SetStringExtractor.SetStringExtractors;
-import org.genericsystem.reactor.az.GSTagImpl;
+import org.genericsystem.reactor.ca_gscomponents.GSTagImpl;
 import org.genericsystem.reactor.model.StringExtractor;
 
 @Retention(RetentionPolicy.RUNTIME)

diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/StyleClasses.java b/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/StyleClasses.java
@@ -6,7 +6,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.genericsystem.reactor.az.GSTagImpl;
+import org.genericsystem.reactor.ca_gscomponents.GSTagImpl;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.TYPE })

diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/Styles.java b/gs-reactor/src/main/java/org/genericsystem/reactor/annotations/Styles.java
@@ -6,8 +6,8 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.genericsystem.reactor.az.FlexDirection;
-import org.genericsystem.reactor.az.GSTagImpl;
+import org.genericsystem.reactor.ca_gscomponents.FlexDirection;
+import org.genericsystem.reactor.ca_gscomponents.GSTagImpl;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.TYPE })

diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/appserver/ApplicationServer.java b/gs-reactor/src/main/java/org/genericsystem/reactor/appserver/ApplicationServer.java
@@ -21,7 +21,7 @@
 import org.genericsystem.reactor.HtmlDomNode;
 import org.genericsystem.reactor.HtmlDomNode.RootHtmlDomNode;
 import org.genericsystem.reactor.appserver.WebAppsConfig.SimpleWebAppConfig;
-import org.genericsystem.reactor.az.GSApp;
+import org.genericsystem.reactor.ca_gscomponents.GSApp;
 
 import io.vertx.core.Context;
 import io.vertx.core.Handler;

diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/appserver/WebAppsConfig.java b/gs-reactor/src/main/java/org/genericsystem/reactor/appserver/WebAppsConfig.java
@@ -15,7 +15,7 @@
 import org.genericsystem.reactor.Tag;
 import org.genericsystem.reactor.Tag.RootTag;
 import org.genericsystem.reactor.annotations.DependsOnModel;
-import org.genericsystem.reactor.az.GSApp;
+import org.genericsystem.reactor.ca_gscomponents.GSApp;
 import org.genericsystem.reactor.model.RootModel;
 
 /**