CLDR-14399 move to OpenLiberty, add API server

.github/workflows/maven.yml

@@ -32,11 +32,20 @@ jobs:
           -DskipTests=true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Upload cldr-apps.war
+      - name: Build liberty server
+        run: >
+          mvn -s .github/workflows/mvn-settings.xml -B  -pl cldr-apps liberty:create liberty:deploy liberty:package -Dinclude=usr --file tools/pom.xml
+          -DskipTests=true -Dinclude=usr
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Cleanup liberty server
+        run: >
+          zip tools/cldr-apps/target/cldr-apps.zip  -d  wlp/usr/servers/cldr/apps/expanded/\*
+      - name: Upload cldr-apps.zip
         uses: actions/upload-artifact@v2
         with:
-          name: cldr-apps
-          path: tools/cldr-apps/target/cldr-apps.war
+          name: cldr-apps-server
+          path: tools/cldr-apps/target/cldr-apps.zip
       - name: Upload cldr-code.jar
         uses: actions/upload-artifact@v2
         with:
@@ -86,11 +95,11 @@ jobs:
       - check
     runs-on: ubuntu-latest
     steps:
-    - name: Download cldr-apps.war
+    - name: Download cldr-apps.zip
       uses: actions/download-artifact@v2
       with:
-        name: cldr-apps
-    - name: Deploy to cldr-smoke (experimental)
+        name: cldr-apps-server
+    - name: Deploy to cldr-smoke
       # Deploys only on push to master.
       # Does not deploy for PRs.
       if: ${{ github.event_name == 'push' }}
@@ -107,4 +116,4 @@ jobs:
       run: |
         echo "${RSA_KEY_SURVEYTOOL}" > .key && chmod go= .key
         echo "${SMOKETEST_KNOWNHOSTS}" > .knownhosts && chmod go= .knownhosts
-        ssh -C -o UserKnownHostsFile=.knownhosts -i .key -p ${SMOKETEST_PORT} surveytool@${SMOKETEST_HOST} bash /usr/local/bin/deploy-to-tomcat.sh < cldr-apps.war ${GITHUB_SHA} --override
+        ssh -C -o UserKnownHostsFile=.knownhosts -i .key -p ${SMOKETEST_PORT} surveytool@${SMOKETEST_HOST} bash /usr/local/bin/deploy-to-openliberty.sh < cldr-apps.zip ${GITHUB_SHA} --override

.gitignore

@@ -78,3 +78,8 @@
 /tools/cldr-code/.build.properties.swp
 /tools/cldr-code/doc
 
+# ignore temporary config files here
+/tools/cldr-apps/src/main/liberty/config/server.env
+/tools/cldr-apps/src/main/liberty/config/bootstrap.properties
+
+

tools/cldr-apps/.factorypath

@@ -1,5 +1,4 @@
 <factorypath>
-    <factorypathentry kind="PLUGIN" id="com.ibm.ws.ast.wsfp.annotations.processor" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="PLUGIN" id="com.ibm.etools.webtools.jpa" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="PLUGIN" id="com.ibm.jee.ejb.annotations.processor" enabled="false" runInBatchMode="false"/>
+    <factorypathentry kind="PLUGIN" id="com.ibm.jaxrs.annotations.processor" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="PLUGIN" id="org.eclipse.jst.ws.annotations.core" enabled="false" runInBatchMode="false"/>
 </factorypath>

tools/cldr-apps/.settings/org.eclipse.jdt.apt.core.prefs

@@ -1,4 +1,4 @@
-#Mon May 03 15:03:41 PDT 2010
-org.eclipse.jdt.apt.processorOptions/com.ibm.ws.ast.jws.annotations.processor.validateWSDL=on
-org.eclipse.jdt.apt.aptEnabled=true
 eclipse.preferences.version=1
+org.eclipse.jdt.apt.aptEnabled=true
+org.eclipse.jdt.apt.processorOptions/com.ibm.ws.ast.jws.annotations.processor.validateWSDL=on
+org.eclipse.jdt.apt.reconcileEnabled=true

tools/cldr-apps/.settings/org.eclipse.wst.common.component

@@ -1,67 +1,79 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-
+
+
 
 
 
 
     <wb-module deploy-name="cldr-apps">
-
+
+
 
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-
+
+
 
 
 
 
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-
+
+
 
 
 
 
         <wb-resource deploy-path="/WEB-INF/lib" source-path="/WebContent/WEB-INF/lib"/>
-
+
+
 
 
 
 
         <!-- needed? -->
-
+
+
 
 
 
 
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/.apt_generated"/>
-
+
+
 
 
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+
         <dependent-module archiveName="cldr-code-39.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/cldr-code/cldr-code">
+
             <dependency-type>uses</dependency-type>
+
         </dependent-module>
+
         <dependent-module archiveName="cldr-rdf-39.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/cldr-rdf/cldr-rdf">
+
             <dependency-type>uses</dependency-type>
+
         </dependent-module>
-
-
-
-
+
 
-        <property name="context-root" value="cldr-apps"/>
-
 
 
 
 
         <property name="java-output-path" value="/cldr-apps/build/classes"/>
-
+        <property name="context-root" value="cldr-apps"/>
+
+
 
 
 
 
     </wb-module>
-
+
+
 
 
 

tools/cldr-apps/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml

@@ -0,0 +1,12 @@
+<root>
+  <facet id="jst.jaxrs">
+    <node name="libprov">
+      <attribute name="provider-id" value="jaxrs-no-op-library-provider"/>
+    </node>
+  </facet>
+  <facet id="jst.jsf">
+    <node name="libprov">
+      <attribute name="provider-id" value="jsf-no-op-library-provider"/>
+    </node>
+  </facet>
+</root>

tools/cldr-apps/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -4,5 +4,7 @@
   <fixed facet="jst.web"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
   <installed facet="jst.java" version="1.8"/>
+  <installed facet="jst.jaxrs" version="2.0"/>
+  <installed facet="jst.jsf" version="2.2"/>
   <installed facet="jst.web" version="3.1"/>
 </faceted-project>

tools/cldr-apps/README.md

@@ -10,6 +10,12 @@ for CLDR.
 
 Please use the parent [CLDR/tools/pom.xml](../pom.xml) with maven to build and run.
 
+- Copy `src/main/liberty/config/server.env.sample` to `src/main/liberty/config/server.env`
+- Edit that `server.env` file to contain the MySQL credentials for the ST database
+- Use `mvn --file=tools/pom.xml -pl cldr-apps liberty:dev` to run a development
+web server, listening on port 9080
+- Navigate to http://localhost:9080/cldr-apps to view the app
+
 See <http://cldr.unicode.org/development/running-survey-tool> for further information
 about the Survey Tool.
 
@@ -22,6 +28,6 @@ For more details, see the main [README.md](../../README.md).
 
 ### Copyright
 
-Copyright &copy; 1991-2020 Unicode, Inc.
+Copyright &copy; 1991-2021 Unicode, Inc.
 All rights reserved.
 [Terms of use](http://www.unicode.org/copyright.html)