Updated the various distros to use the new @angular/cli based UI.

Signed-off-by: Eric Wittmann <[email protected]>
Apicurio · Feb 20, 2018 · c4c6f1b · c4c6f1b
1 parent 31b58dd
commit c4c6f1b
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 27 deletions.
diff --git a/front-end/servlet/pom.xml b/front-end/servlet/pom.xml
@@ -59,7 +59,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>apicurio-studio-fe-app</artifactId>
+            <artifactId>apicurio-studio-fe-studio</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>

diff --git a/front-end/studio/.editorconfig b/front-end/studio/.editorconfig
diff --git a/front-end/studio/.gitignore b/front-end/studio/.gitignore
@@ -1,7 +1,8 @@
 # See http://help.github.com/ignore-files/ for more about ignoring files.
 
-deploy-prod.sh
-serve.sh
+/deploy-prod.sh
+/serve.sh
+/node
 
 # compiled output
 /dist

diff --git a/front-end/studio/pom.xml b/front-end/studio/pom.xml
@@ -42,11 +42,11 @@
                     <execution>
                         <id>ng build</id>
                         <goals>
-                            <goal>npm</goal>
+                            <goal>yarn</goal>
                         </goals>
                         <phase>generate-resources</phase>
                         <configuration>
-                            <arguments>run-script build</arguments>
+                            <arguments>build</arguments>
                         </configuration>
                     </execution>
                 </executions>
@@ -67,6 +67,12 @@
                                 <resource>
                                     <directory>${basedir}/dist</directory>
                                     <filtering>false</filtering>
+                                    <excludes>
+                                        <exclude>config.js</exclude>
+                                        <exclude>keycloak.js</exclude>
+                                        <exclude>keycloak.json</exclude>
+                                        <exclude>version.js</exclude>
+                                    </excludes>
                                 </resource>
                             </resources>
                         </configuration>

diff --git a/front-end/studio/src/app/components/nav-header.component.html b/front-end/studio/src/app/components/nav-header.component.html
@@ -40,6 +40,10 @@ <h1 class="about-title">Apicurio Studio</h1>
                             <td><strong>Built On</strong></td>
                             <td>{{ builtOn | date }}</td>
                         </tr>
+                        <tr>
+                            <td><strong>Edition</strong></td>
+                            <td>CLI</td>
+                        </tr>
                         <tr>
                             <td><strong>Project URL</strong></td>
                             <td><a href="{{ projectUrl }}" target="_blank">{{ projectUrl }} <span class="fa fa-external-link"></span></a></td>
@@ -54,4 +58,4 @@ <h1 class="about-title">Apicurio Studio</h1>
             </div>
         </div>
     </div>
-</div>
+</div>
diff --git a/platforms/swarm/ui/pom.xml b/platforms/swarm/ui/pom.xml
@@ -27,7 +27,7 @@
         <!-- Static Angular Files -->
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>apicurio-studio-fe-app</artifactId>
+            <artifactId>apicurio-studio-fe-studio</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
@@ -64,13 +64,13 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>${project.groupId}</groupId>
-                                    <artifactId>apicurio-studio-fe-app</artifactId>
+                                    <artifactId>apicurio-studio-fe-studio</artifactId>
                                     <version>${project.version}</version>
                                     <type>jar</type>
                                     <overWrite>true</overWrite>
                                 </artifactItem>
                             </artifactItems>
-                            <outputDirectory>${project.build.directory}/fe-app</outputDirectory>
+                            <outputDirectory>${project.build.directory}/fe-studio</outputDirectory>
                             <overWriteReleases>false</overWriteReleases>
                             <overWriteSnapshots>true</overWriteSnapshots>
                         </configuration>
@@ -83,7 +83,7 @@
                 <configuration>
                     <webResources>
                         <resource>
-                            <directory>target/fe-app</directory>
+                            <directory>target/fe-studio</directory>
                         </resource>
                         <resource>
                             <directory>src/main/filtered-resources</directory>

diff --git a/platforms/wildfly/ui/pom.xml b/platforms/wildfly/ui/pom.xml
@@ -25,7 +25,7 @@
 
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>apicurio-studio-fe-app</artifactId>
+            <artifactId>apicurio-studio-fe-studio</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
@@ -48,13 +48,13 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>${project.groupId}</groupId>
-                                    <artifactId>apicurio-studio-fe-app</artifactId>
+                                    <artifactId>apicurio-studio-fe-studio</artifactId>
                                     <version>${project.version}</version>
                                     <type>jar</type>
                                     <overWrite>true</overWrite>
                                 </artifactItem>
                             </artifactItems>
-                            <outputDirectory>${project.build.directory}/fe-app</outputDirectory>
+                            <outputDirectory>${project.build.directory}/fe-studio</outputDirectory>
                             <overWriteReleases>false</overWriteReleases>
                             <overWriteSnapshots>true</overWriteSnapshots>
                         </configuration>
@@ -67,7 +67,7 @@
                 <configuration>
                     <webResources>
                         <resource>
-                            <directory>target/fe-app</directory>
+                            <directory>target/fe-studio</directory>
                         </resource>
                         <resource>
                             <directory>src/main/filtered-resources</directory>