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

PAYARA-2455 Rename payaradomain to production #2349

Merged
merged 3 commits into from
Feb 1, 2018
Merged

PAYARA-2455 Rename payaradomain to production #2349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04fe4c0
PAYARA-2455 Rename payaradomain to production
Pandrex247 Feb 1, 2018
2e79b11
PAYARA-2455 Missed a couple of references
Pandrex247 Feb 1, 2018
b61d668
Merge branch 'Payara-5' into PAYARA-2455
arjantijms Feb 1, 2018
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
4 changes: 2 additions & 2 deletions appserver/admin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<module>cli-optional-l10n</module>
<module>gf_template</module>
<module>gf_template_web</module>
<module>payara_template</module>
<module>payara_template_web</module>
<module>production_domain_template</module>
<module>production_domain_template_web</module>
</modules>
</project>
6 changes: 3 additions & 3 deletions appserver/admin/payara_template/pom.xml → .../admin/production_domain_template/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
<version>5.181-SNAPSHOT</version>
</parent>

<artifactId>payara-domain</artifactId>
<name>Payara template</name>
<description>Payara template</description>
<artifactId>production-domain</artifactId>
<name>Production Domain Template</name>
<description>Production Domain Template</description>

<build>
<plugins>
Expand Down
0 ...plate/src/main/assembly/payara-domain.xml → ...e/src/main/assembly/production-domain.xml
View file
Open in desktop
File renamed without changes.
0 ...src/main/resources/config/default-web.xml → ...src/main/resources/config/default-web.xml
View file
Open in desktop
File renamed without changes.
0 ...late/src/main/resources/config/domain.xml → ...late/src/main/resources/config/domain.xml
View file
Open in desktop
File renamed without changes.
0 ...c/main/resources/config/glassfish-acc.xml → ...c/main/resources/config/glassfish-acc.xml
View file
Open in desktop
File renamed without changes.
0 ...esources/config/wss-server-config-1.0.xml → ...esources/config/wss-server-config-1.0.xml
View file
Open in desktop
File renamed without changes.
0 ...esources/config/wss-server-config-2.0.xml → ...esources/config/wss-server-config-2.0.xml
View file
Open in desktop
File renamed without changes.
0 ...emplate/src/main/resources/stringsubs.xml → ...emplate/src/main/resources/stringsubs.xml
View file
Open in desktop
File renamed without changes.
0 ...late/src/main/resources/template-info.xml → ...late/src/main/resources/template-info.xml
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions appserver/admin/payara_template_web/pom.xml → ...in/production_domain_template_web/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
<version>5.181-SNAPSHOT</version>
</parent>

<artifactId>payara-domain-web</artifactId>
<name>Web Payara template</name>
<description>Web Payara template</description>
<artifactId>production-domain-web</artifactId>
<name>Web Production Template</name>
<description>Web Production Template</description>

<build>
<plugins>
Expand Down
0 ...b/src/main/assembly/payara-domain-web.xml → ...c/main/assembly/production-domain-web.xml
View file
Open in desktop
File renamed without changes.
0 ...src/main/resources/config/default-web.xml → ...src/main/resources/config/default-web.xml
View file
Open in desktop
File renamed without changes.
0 ..._web/src/main/resources/config/domain.xml → ..._web/src/main/resources/config/domain.xml
View file
Open in desktop
File renamed without changes.
0 ...c/main/resources/config/glassfish-acc.xml → ...c/main/resources/config/glassfish-acc.xml
View file
Open in desktop
File renamed without changes.
0 ...esources/config/wss-server-config-1.0.xml → ...esources/config/wss-server-config-1.0.xml
View file
Open in desktop
File renamed without changes.
0 ...esources/config/wss-server-config-2.0.xml → ...esources/config/wss-server-config-2.0.xml
View file
Open in desktop
File renamed without changes.
0 ...ate_web/src/main/resources/stringsubs.xml → ...ate_web/src/main/resources/stringsubs.xml
View file
Open in desktop
File renamed without changes.
0 ..._web/src/main/resources/template-info.xml → ..._web/src/main/resources/template-info.xml
View file
Open in desktop
File renamed without changes.
22 changes: 11 additions & 11 deletions appserver/distributions/distributions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
target="${glassfish.image.dir}" />
<create.images type="web" name="Web"/>
<antcall target="create-glassfish-domain" />
<antcall target="create-payara-domain" />
<antcall target="create-production-domain" />
<!--<antcall target="create-domain-ml" />-->
</target>
<target name="create-glassfish-images">
Expand All @@ -111,7 +111,7 @@
target="${glassfish.image.dir}" />
<create.images type="glassfish" name="GlassFish"/>
<antcall target="create-glassfish-domain" />
<antcall target="create-payara-domain" />
<antcall target="create-production-domain" />
<!--<antcall target="create-domain-ml" />-->
</target>

Expand Down Expand Up @@ -390,30 +390,30 @@
</exec>
</target>

<!-- Payara domain creation -->
<!-- Production domain creation -->

<target name="create-payara-domain" depends="init-payara-home, create-payara-domain-on-windows, create-payara-domain-on-unix"/>
<target name="init-payara-home">
<target name="create-production-domain" depends="init-production-home, create-production-domain-on-windows, create-production-domain-on-unix"/>
<target name="init-production-home">
<property name="glassfish.home" value="${basedir}/${glassfish.image.dir}/${install.dir.name}/glassfish" />
</target>

<target name="create-payara-domain-on-windows" if="windows">
<antcall target="_create-payara-domain">
<target name="create-production-domain-on-windows" if="windows">
<antcall target="_create-production-domain">
<param name="exec.dir" value="${glassfish.home}/bin"/>
<param name="exec.executable" value="${glassfish.home}/bin/asadmin.bat"/>
</antcall>
</target>
<target name="create-payara-domain-on-unix" if="unix">
<antcall target="_create-payara-domain">
<target name="create-production-domain-on-unix" if="unix">
<antcall target="_create-production-domain">
<param name="exec.dir" value="${glassfish.home}/bin"/>
<param name="exec.executable" value="${glassfish.home}/bin/asadmin"/>
</antcall>
</target>
<target name="_create-payara-domain">
<target name="_create-production-domain">
<echo message="Directory to run command from: ${exec.dir}"/>
<echo message="Command to run: ${exec.executable}"/>
<exec dir="${exec.dir}" executable="${exec.executable}" failonerror="true" >
<arg line="--user admin create-domain --template=${glassfish.home}/common/templates/gf/payara-domain.jar --nopassword --savelogin=true --checkports=false --adminport 4848 --instanceport 8080 --keytooloptions CN=localhost payaradomain"/>
<arg line="--user admin create-domain --template=${glassfish.home}/common/templates/gf/production-domain.jar --nopassword --savelogin=true --checkports=false --adminport 4848 --instanceport 8080 --keytooloptions CN=localhost production"/>
</exec>
</target>

Expand Down
2 changes: 1 addition & 1 deletion appserver/distributions/minnow/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<artifactId>glassfishbuild-maven-plugin</artifactId>
<executions>
<execution>
<id>create-payara-domain</id>
<id>create-production-domain</id>
<goals>
<goal>exec</goal>
</goals>
Expand Down
2 changes: 1 addition & 1 deletion appserver/distributions/payara-ml/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<artifactId>glassfishbuild-maven-plugin</artifactId>
<executions>
<execution>
<id>create-payara-domain</id>
<id>create-production-domain</id>
<goals>
<goal>exec</goal>
</goals>
Expand Down
4 changes: 2 additions & 2 deletions appserver/distributions/payara-ml/src/main/assembly/payara-ml.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@
<exclude>glassfish/lib/nadmin*</exclude>
<!-- Exclude appserver-domain files except for original -->
<exclude>glassfish/common/templates/gf/*appserver-domain-*.jar</exclude>
<!-- Exclude payara-domain files except for original -->
<exclude>glassfish/common/templates/gf/*payara-domain-*.jar</exclude>
<!-- Exclude production-domain files except for original -->
<exclude>glassfish/common/templates/gf/*production-domain-*.jar</exclude>
</excludes>
<outputDirectory>${install.dir.name}</outputDirectory>
</fileSet>
Expand Down
2 changes: 1 addition & 1 deletion appserver/distributions/payara-web-ml/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<artifactId>glassfishbuild-maven-plugin</artifactId>
<executions>
<execution>
<id>create-payara-domain</id>
<id>create-production-domain</id>
<goals>
<goal>exec</goal>
</goals>
Expand Down
10 changes: 5 additions & 5 deletions appserver/distributions/payara-web-ml/src/main/assembly/payara-web-ml.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@
<exclude>glassfish/lib/nadmin*</exclude>
<!-- Exclude appserver-domain files -->
<exclude>glassfish/common/templates/gf/*appserver-domain*.jar</exclude>
<!-- Exclude payara-domain files -->
<exclude>glassfish/common/templates/gf/*payara-domain*.jar</exclude>
<!-- Exclude production-domain files -->
<exclude>glassfish/common/templates/gf/*production-domain*.jar</exclude>
</excludes>
<outputDirectory>${install.dir.name}</outputDirectory>
</fileSet>
Expand All @@ -85,16 +85,16 @@
</fileSet>
</fileSets>

<!-- Name of appserver-domain and payara-domain replacements -->
<!-- Name of appserver-domain and production-domain replacements -->
<files>
<file>
<source>${temp.dir}/${install.dir.name}/glassfish/common/templates/gf/appserver-domain-web.jar</source>
<destName>appserver-domain.jar</destName>
<outputDirectory>${install.dir.name}/glassfish/common/templates/gf/</outputDirectory>
</file>
<file>
<source>${temp.dir}/${install.dir.name}/glassfish/common/templates/gf/payara-domain-web.jar</source>
<destName>payara-domain.jar</destName>
<source>${temp.dir}/${install.dir.name}/glassfish/common/templates/gf/production-domain-web.jar</source>
<destName>production-domain.jar</destName>
<outputDirectory>${install.dir.name}/glassfish/common/templates/gf/</outputDirectory>
</file>
</files>
Expand Down
2 changes: 1 addition & 1 deletion appserver/distributions/payara-web/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<artifactId>glassfishbuild-maven-plugin</artifactId>
<executions>
<execution>
<id>create-payara-domain</id>
<id>create-production-domain</id>
<goals>
<goal>exec</goal>
</goals>
Expand Down
10 changes: 5 additions & 5 deletions appserver/distributions/payara-web/src/main/assembly/payara-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@
<exclude>glassfish/lib/nadmin*</exclude>
<!-- Exclude appserver-domain files -->
<exclude>glassfish/common/templates/gf/*appserver-domain*.jar</exclude>
<!-- Exclude payara-domain files -->
<exclude>glassfish/common/templates/gf/*payara-domain*.jar</exclude>
<!-- Exclude production-domain files -->
<exclude>glassfish/common/templates/gf/*production-domain*.jar</exclude>
</excludes>
<outputDirectory>${install.dir.name}</outputDirectory>
</fileSet>
Expand All @@ -85,16 +85,16 @@
</fileSet>
</fileSets>

<!-- Name of appserver-domain and payara-domain replacements -->
<!-- Name of appserver-domain and production-domain replacements -->
<files>
<file>
<source>${temp.dir}/${install.dir.name}/glassfish/common/templates/gf/appserver-domain-web.jar</source>
<destName>appserver-domain.jar</destName>
<outputDirectory>${install.dir.name}/glassfish/common/templates/gf/</outputDirectory>
</file>
<file>
<source>${temp.dir}/${install.dir.name}/glassfish/common/templates/gf/payara-domain-web.jar</source>
<destName>payara-domain.jar</destName>
<source>${temp.dir}/${install.dir.name}/glassfish/common/templates/gf/production-domain-web.jar</source>
<destName>production-domain.jar</destName>
<outputDirectory>${install.dir.name}/glassfish/common/templates/gf/</outputDirectory>
</file>
</files>
Expand Down
2 changes: 1 addition & 1 deletion appserver/distributions/payara/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<artifactId>glassfishbuild-maven-plugin</artifactId>
<executions>
<execution>
<id>create-payara-domain</id>
<id>create-production-domain</id>
<goals>
<goal>exec</goal>
</goals>
Expand Down
4 changes: 2 additions & 2 deletions appserver/distributions/payara/src/main/assembly/payara.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@
<exclude>glassfish/lib/nadmin*</exclude>
<!-- Exclude appserver-domain files except for original -->
<exclude>glassfish/common/templates/gf/*appserver-domain-*.jar</exclude>
<!-- Exclude payara-domain files except for original -->
<exclude>glassfish/common/templates/gf/*payara-domain-*.jar</exclude>
<!-- Exclude production-domain files except for original -->
<exclude>glassfish/common/templates/gf/*production-domain-*.jar</exclude>
</excludes>
<outputDirectory>${install.dir.name}</outputDirectory>
</fileSet>
Expand Down
8 changes: 4 additions & 4 deletions appserver/distributions/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@
<temp.dir>${project.build.directory}/dependency</temp.dir>
<include.group.ids>org.glassfish.main.packager,org.glassfish.main.registration</include.group.ids>
<template.jar>${stage.dir}/${install.dir.name}/glassfish/common/templates/gf/appserver-domain.jar</template.jar>
<payara.template.jar>${stage.dir}/${install.dir.name}/glassfish/common/templates/gf/payara-domain.jar</payara.template.jar>
<production-domain.template.jar>${stage.dir}/${install.dir.name}/glassfish/common/templates/gf/production-domain.jar</production-domain.template.jar>
<create-gf-domain.args>--user admin create-domain --template=${template.jar} --nopassword --savelogin=true --checkports=false --adminport 4848 --instanceport 8080 --keytooloptions CN=localhost domain1</create-gf-domain.args>
<create-domain.payara.args>--user admin create-domain --template=${payara.template.jar} --nopassword --savelogin=true --checkports=false --adminport 4848 --instanceport 8080 --keytooloptions CN=localhost payaradomain</create-domain.payara.args>
<create-domain.production.args>--user admin create-domain --template=${production-domain.template.jar} --nopassword --savelogin=true --checkports=false --adminport 4848 --instanceport 8080 --keytooloptions CN=localhost production</create-domain.production.args>
</properties>

<build>
Expand Down Expand Up @@ -153,11 +153,11 @@
</configuration>
</execution>
<execution>
<id>create-payara-domain</id>
<id>create-production-domain</id>
<phase>process-resources</phase>
<configuration>
<executable>${stage.dir}/${install.dir.name}/bin/asadmin</executable>
<commandlineArgs>${create-domain.payara.args}</commandlineArgs>
<commandlineArgs>${create-domain.production.args}</commandlineArgs>
</configuration>
</execution>
</executions>
Expand Down
2 changes: 1 addition & 1 deletion appserver/extras/embedded/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
<!-- skip the domain creation template jar files viz., nucleus-domain.jar, appserver-domain.jar -->
<fileset dir="${gfdir}" includes="**/appserver-domain*.jar"/>
<fileset dir="${gfdir}" includes="**/nucleus-domain.jar"/>
<fileset dir="${gfdir}" includes="**/payara-domain*.jar"/>
<fileset dir="${gfdir}" includes="**/production-domain*.jar"/>
<fileset dir="${gfdir}" includes="**/weld-se-shaded.jar"/>
<fileset dir="${gfdir}" includes="**/weld-environment-common.jar"/>
</delete>
Expand Down
4 changes: 2 additions & 2 deletions appserver/extras/payara-micro/payara-micro-distribution/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
<fileset dir="${runtimedir}" includes="console-**-plugin.jar"/>
<!-- skip the domain creation template jar files viz., nucleus-domain.jar, appserver-domain.jar -->
<fileset dir="${runtimedir}" includes="**/appserver-domain*.jar"/>
<fileset dir="${runtimedir}" includes="**/payara-domain*.jar"/>
<fileset dir="${runtimedir}" includes="**/production-domain*.jar"/>
<fileset dir="${runtimedir}" includes="**/nucleus-domain.jar"/>
<fileset dir="${runtimedir}" includes="**/weld-se-shaded.jar"/>
<fileset dir="${runtimedir}" includes="**/weld-environment-common.jar"/>
Expand Down Expand Up @@ -187,7 +187,7 @@
<target name="addKeystores">
<unzip dest="${tempdir}">
<fileset dir="${runtimedir}/${install.dir.name}/glassfish/common/templates/gf">
<include name="payara-domain.jar"/>
<include name="production-domain.jar"/>
</fileset>
</unzip>
<copy todir="${domaindir}">
Expand Down
4 changes: 2 additions & 2 deletions appserver/packager/glassfish-nucleus/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
</dependency>
<dependency>
<groupId>org.glassfish.main.admin</groupId>
<artifactId>payara-domain</artifactId>
<artifactId>production-domain</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand All @@ -151,7 +151,7 @@
</dependency>
<dependency>
<groupId>org.glassfish.main.admin</groupId>
<artifactId>payara-domain-web</artifactId>
<artifactId>production-domain-web</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion appserver/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@

<admin_client_command_name>asadmin</admin_client_command_name>
<default_domain_template>appserver-domain.jar</default_domain_template>
<payara_domain_template>payara-domain.jar</payara_domain_template>
<production_domain_template>production-domain.jar</production_domain_template>
<version_prefix />

<version_suffix>#badassfish</version_suffix>
Expand Down