Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Component-ize zlux, zss #43

Merged
merged 5 commits into from
Dec 19, 2019
Merged

Component-ize zlux, zss #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
00eb9bc
Update build to respect new dir structure
1000TurquoisePogs Oct 8, 2019
251b2e4
Move away from the deploy property to instead use instance and site i…
1000TurquoisePogs Dec 2, 2019
f474b7c
Consolidate copy from defaults to instance
1000TurquoisePogs Dec 2, 2019
977c3be
Remove deploy.sh, its actions will be done in initInstance.js
1000TurquoisePogs Dec 3, 2019
d741790
Support both old and new scheme, fix very old bug about pathing
1000TurquoisePogs Dec 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,16 @@
<property name="home" value="${zlux-app-server}"/>
<property name="buildRel" value="zlux-build"/>
<property name="build" value="${capstone}/zlux-build"/>
<property name="deploy" value="${zlux-app-server}/deploy"/>
<condition property="instanceMode">
<isset property="env.INSTANCE_DIR"/>
</condition>
<!-- instanceMode is the new standard, non-instanceMode is for compatibility -->
<property name="instanceDir" value="${zlux-app-server}/deploy/instance" unless:set="instanceMode"/>
<property name="siteDir" value="${zlux-app-server}/deploy/site" unless:set="instanceMode"/>
<property name="instanceDir" value="${env.INSTANCE_DIR}/workspace/app-server" if:set="instanceMode"/>
<property name="siteDir" value="${env.INSTANCE_DIR}/workspace/app-server/site" if:set="instanceMode"/>


<import file="common.xml" unless:set="version.date"/>

<target name="buildAll" depends="deploy, build"/>
Expand Down
8 changes: 4 additions & 4 deletions build_ng2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
</target>

<target name="buildPlugin" depends="antPlugin" unless="build.xmlRan">
<property name="absolutePlugin" location="${pluginDir}/${plugin}"/>
<property name="absolutePlugin" location="${capstone}/zlux-app-server/lib/${plugin}"/>
<if>
<not>
<or>
Expand All @@ -114,18 +114,18 @@
</not>
<then>
<antcall target="npmInstall" unless:set="noInstall">
<param name="packagejson.Location" value="${pluginDir}/${plugin}"/>
<param name="packagejson.Location" value="${capstone}/zlux-app-server/lib/${plugin}"/>
</antcall>
<antcall target="npmBuild">
<param name="packagejson.Location" value="${pluginDir}/${plugin}"/>
<param name="packagejson.Location" value="${capstone}/zlux-app-server/lib/${plugin}"/>
<param name="buildType" value="build"/>
</antcall>
</then>
</if>

<for param="subfolder">
<path>
<dirset dir="${pluginDir}/${plugin}" includes="*"/>
<dirset dir="${capstone}/zlux-app-server/lib/${plugin}" includes="*"/>
</path>
<sequential>
<antcall target="npmInstall" unless:set="noInstall">
Expand Down
2 changes: 1 addition & 1 deletion common.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
plugins=../zlux-app-server/plugins
plugins=../zlux-app-server/defaults/plugins
87 changes: 0 additions & 87 deletions deploy.sh
View file
Open in desktop

This file was deleted.

105 changes: 38 additions & 67 deletions deploy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,66 +28,47 @@
</condition>

<target name="deploy">
<delete quiet="true" dir="${deploy}/product/ZLUX/plugins"/>
<delete quiet="true" dir="${deploy}/instance/ZLUX/plugins"/>
<delete quiet="true" dir="${deploy}/site/ZLUX/plugins"/>
<delete quiet="true" includeEmptyDirs="true">
<fileset dir="${deploy}" includes="instance/users/*/ZLUX, instance/groups/*/ZLUX"/>
</delete>
<mkdir dir="${deploy}/product/ZLUX/plugins"/>
<mkdir dir="${deploy}/product/ZLUX/pluginStorage"/>
<mkdir dir="${deploy}/product/ZLUX/serverConfig"/>
<mkdir dir="${home}/defaults/ZLUX/pluginStorage"/>
<!-- A common storage area for apps to deploy their configs into for desktop behavior -->
<property name="productActions" value="${deploy}/product/ZLUX/pluginStorage/org.zowe.zlux.ng2desktop/actions"/>
<property name="productRecognizers" value="${deploy}/product/ZLUX/pluginStorage/org.zowe.zlux.ng2desktop/recognizers"/>
<property name="productActions" value="${home}/defaults/ZLUX/pluginStorage/org.zowe.zlux.ng2desktop/actions"/>
<property name="productRecognizers" value="${home}/defaults/ZLUX/pluginStorage/org.zowe.zlux.ng2desktop/recognizers"/>
<mkdir dir="${productActions}"/>
<mkdir dir="${productRecognizers}"/>

<mkdir dir="${deploy}/site/ZLUX/plugins"/>
<mkdir dir="${deploy}/site/ZLUX/pluginStorage"/>
<mkdir dir="${deploy}/site/ZLUX/serverConfig"/>
<mkdir dir="${siteDir}/ZLUX/pluginStorage"/>
<!-- A common storage area for apps to deploy their configs into for desktop behavior -->
<property name="siteActions" value="${deploy}/site/ZLUX/pluginStorage/org.zowe.zlux.ng2desktop/actions"/>
<property name="siteRecognizers" value="${deploy}/site/ZLUX/pluginStorage/org.zowe.zlux.ng2desktop/recognizers"/>
<property name="siteActions" value="${siteDir}/ZLUX/pluginStorage/org.zowe.zlux.ng2desktop/actions"/>
<property name="siteRecognizers" value="${siteDir}/ZLUX/pluginStorage/org.zowe.zlux.ng2desktop/recognizers"/>
<mkdir dir="${siteActions}"/>
<mkdir dir="${siteRecognizers}"/>

<mkdir dir="${deploy}/instance/ZLUX/plugins"/>
<mkdir dir="${deploy}/instance/ZLUX/pluginStorage"/>
<mkdir dir="${deploy}/instance/ZLUX/serverConfig"/>
<property name="serverConfig" value="${instanceDir}/ZLUX/serverConfig" unless:set="instanceMode"/>
<property name="serverConfig" value="${instanceDir}/serverConfig" if:set="instanceMode"/>
<property name="instancePlugins" value="${instanceDir}/ZLUX/plugins" unless:set="instanceMode"/>
<property name="instancePlugins" value="${instanceDir}/plugins" if:set="instanceMode"/>

<mkdir dir="${instancePlugins}"/>
<mkdir dir="${serverConfig}"/>
<mkdir dir="${instanceDir}/ZLUX/pluginStorage"/>
<!-- A common storage area for apps to deploy their configs into for desktop behavior -->
<property name="instanceActions" value="${deploy}/instance/ZLUX/pluginStorage/org.zowe.zlux.ng2desktop/actions"/>
<property name="instanceRecognizers" value="${deploy}/instance/ZLUX/pluginStorage/org.zowe.zlux.ng2desktop/recognizers"/>
<property name="instanceActions" value="${instanceDir}/ZLUX/pluginStorage/org.zowe.zlux.ng2desktop/actions"/>
<property name="instanceRecognizers" value="${instanceDir}/ZLUX/pluginStorage/org.zowe.zlux.ng2desktop/recognizers"/>
<mkdir dir="${instanceActions}"/>
<mkdir dir="${instanceRecognizers}"/>

<mkdir dir="${deploy}/instance/users"/>
<mkdir dir="${deploy}/instance/groups"/>
<mkdir dir="${instanceDir}/users"/>
<mkdir dir="${instanceDir}/groups"/>
<!-- # MVD bootstrap -->
<copy unless:set="isZos" todir="${deploy}/product/ZLUX/serverConfig">
<fileset dir="${home}/config"/>
</copy>
<exec if:set="isZos" executable="sh">
<arg line="-c 'cp -pR ${home}/config/ ${deploy}/product/ZLUX/serverConfig'"/>
</exec>

<copy unless:set="isZos" todir="${deploy}/product/ZLUX/plugins">
<fileset dir="${pluginDir}" includes="*.json"/>
</copy>
<exec if:set="isZos" executable="sh">
<arg line="-c 'cp -pR ${pluginDir}/*.json ${deploy}/product/ZLUX/plugins'"/>
</exec>

<copy unless:set="isZos" todir="${deploy}/instance/ZLUX/plugins">
<copy unless:set="isZos" todir="${instancePlugins}">
<fileset dir="${pluginDir}" includes="*.json"/>
</copy>
<exec if:set="isZos" executable="sh">
<arg line="-c 'cp -pR ${pluginDir}/*.json ${deploy}/instance/ZLUX/plugins'"/>
<arg line="-c 'cp -pR ${pluginDir}/*.json ${instancePlugins}'"/>
</exec>

<copy unless:set="isZos" todir="${deploy}/instance/ZLUX/serverConfig">
<fileset dir="${home}/config">
<include name="zluxserver.json"/>
<copy unless:set="isZos" todir="${serverConfig}">
<fileset dir="${home}/defaults/serverConfig">
<include name="server.json"/>
<include name="zlux.keystore.cer"/>
<include name="zlux.keystore.key"/>
<include name="apiml-localca.cer"/>
Expand All @@ -96,23 +77,13 @@
</copy>
<exec if:set="isZos" executable="sh">
<arg line="-c 'cp -pR
${home}/config/zluxserver.json
${home}/config/zlux.keystore.cer
${home}/config/zlux.keystore.key
${home}/config/apiml-localca.cer
${home}/config/tomcat.xml
${deploy}/instance/ZLUX/serverConfig'"/>
</exec>

<copy unless:set="isZos" todir="${deploy}/product/ZLUX/pluginStorage">
<fileset dir="${home}/pluginDefaults">
<include name="**/*"/>
</fileset>
</copy>
<exec if:set="isZos" executable="sh">
<arg line="-c 'cp -pR ${home}/pluginDefaults/ ${deploy}/product/ZLUX/pluginStorage'"/>
${home}/defaults/serverConfig/server.json
${home}/defaults/serverConfig/zlux.keystore.cer
${home}/defaults/serverConfig/zlux.keystore.key
${home}/defaults/serverConfig/apiml-localca.cer
${home}/defaults/serverConfig/tomcat.xml
${serverConfig}'"/>
</exec>

<antcall target="traverse"/>
<if>
<available file="../zss/bin/zssServer"/>
Expand All @@ -128,25 +99,25 @@
</then>
</if>

<chmod unless:set="isWindows" dir="${deploy}/instance/ZLUX/serverConfig" perm="750"/>
<chmod unless:set="isWindows" dir="${serverConfig}" perm="750"/>
<chmod unless:set="isWindows" perm="640">
<fileset dir="${deploy}/instance/ZLUX/serverConfig"/>
<fileset dir="${serverConfig}"/>
</chmod>
</target>

<target name="cleanDeploy">
<delete quiet="true" dir="${deploy}/product/ZLUX"/>
<delete quiet="true" dir="${deploy}/instance/ZLUX"/>
<delete quiet="true" dir="${deploy}/site/ZLUX"/>
<delete quiet="true" dir="${instanceDir}"/>
<delete quiet="true" dir="${siteDir}"/>
<delete quiet="true" includeEmptyDirs="true">
<fileset dir="${deploy}" includes="instance/users/*/ZLUX, instance/groups/*/ZLUX"/>
<fileset dir="${instanceDir}" includes="users/*, groups/*"/>
</delete>
</target>

<target name="devClean">
<delete quiet="true" dir="${deploy}/product"/>
<delete quiet="true" dir="${deploy}/instance/ZLUX/plugins"/>
<delete quiet="true" dir="${deploy}/site/ZLUX/plugins"/>
<delete quiet="true" dir="${instancePlugins}"/>
<delete quiet="true" includeEmptyDirs="true">
<fileset dir="${instanceDir}" includes="users/*, groups/*"/>
</delete>
</target>
</project>

Expand Down