Merge pull request #4990 from MattGill98/FISH-375

FISH-375 Remove Production Domain From Build
payara · Nov 13, 2020 · 895bab1 · 895bab1
2 parents 160a2e0 + 5375a8e
commit 895bab1
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 46 deletions.
diff --git a/appserver/distributions/payara-ml/pom.xml b/appserver/distributions/payara-ml/pom.xml
@@ -68,12 +68,6 @@
                 <groupId>org.glassfish.build</groupId>
                 <artifactId>glassfishbuild-maven-plugin</artifactId>
                 <executions>
-                    <execution>
-                        <id>create-production-domain</id>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                    </execution>
                     <execution>
                         <id>create-glassfish-domain</id>
                         <goals>

diff --git a/appserver/distributions/payara-web-ml/pom.xml b/appserver/distributions/payara-web-ml/pom.xml
@@ -70,12 +70,6 @@
                 <groupId>org.glassfish.build</groupId>
                 <artifactId>glassfishbuild-maven-plugin</artifactId>
                 <executions>
-                    <execution>
-                        <id>create-production-domain</id>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                    </execution>
                     <execution>
                         <id>create-glassfish-domain</id>
                         <goals>

diff --git a/appserver/distributions/payara-web/pom.xml b/appserver/distributions/payara-web/pom.xml
@@ -71,12 +71,6 @@
                 <groupId>org.glassfish.build</groupId>
                 <artifactId>glassfishbuild-maven-plugin</artifactId>
                 <executions>
-                    <execution>
-                        <id>create-production-domain</id>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                    </execution>
                     <execution>
                         <id>create-glassfish-domain</id>
                         <goals>

diff --git a/appserver/distributions/payara/pom.xml b/appserver/distributions/payara/pom.xml
@@ -71,12 +71,6 @@
                 <groupId>org.glassfish.build</groupId>
                 <artifactId>glassfishbuild-maven-plugin</artifactId>
                 <executions>
-                    <execution>
-                        <id>create-production-domain</id>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                    </execution>
                     <execution>
                         <id>create-glassfish-domain</id>
                         <goals>

diff --git a/appserver/distributions/pom.xml b/appserver/distributions/pom.xml
@@ -83,9 +83,7 @@
         <temp.dir>${project.build.directory}/dependency</temp.dir>
         <include.group.ids>fish.payara.server.internal.packager,fish.payara.server.internal.registration</include.group.ids>
         <template.jar>${stage.dir}/${install.dir.name}/glassfish/common/templates/gf/appserver-domain.jar</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.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>
         <validation.xml.root>${project.build.directory}/stage</validation.xml.root>
     </properties>
 
@@ -157,14 +155,6 @@
                                 <commandlineArgs>${create-gf-domain.args}</commandlineArgs>
                             </configuration>
                         </execution>
-                        <execution>
-                            <id>create-production-domain</id>
-                            <phase>process-resources</phase>
-                            <configuration>
-                                <executable>${stage.dir}/${install.dir.name}/bin/asadmin</executable>
-                                <commandlineArgs>${create-domain.production.args}</commandlineArgs>
-                            </configuration>
-                        </execution>
                     </executions>
                 </plugin>
 

diff --git a/appserver/extras/docker-images/pom.xml b/appserver/extras/docker-images/pom.xml
@@ -27,7 +27,7 @@
         <docker.jdk8.tag>8u262</docker.jdk8.tag>
         <docker.jdk11.tag>11.0.7</docker.jdk11.tag>
 
-        <docker.payara.domainName>production</docker.payara.domainName>
+        <docker.payara.domainName>domain1</docker.payara.domainName>
         <docker.payara.rootDirectoryName>payara5</docker.payara.rootDirectoryName>
 
         <docker.payara.repository>payara/${project.artifactId}</docker.payara.repository>

diff --git a/appserver/extras/docker-images/server-full/src/main/docker/assembly.xml b/appserver/extras/docker-images/server-full/src/main/docker/assembly.xml
@@ -45,11 +45,6 @@
             <outputDirectory>artifacts/</outputDirectory>
             <scope>provided</scope>
             <unpack>true</unpack>
-            <unpackOptions>
-                <excludes>
-                    <exclude>**/glassfish/domains/domain1/**</exclude>
-                </excludes>
-            </unpackOptions>
             <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
         </dependencySet>
     </dependencySets>

diff --git a/appserver/extras/docker-images/server-web/src/main/docker/assembly.xml b/appserver/extras/docker-images/server-web/src/main/docker/assembly.xml
@@ -45,11 +45,6 @@
             <outputDirectory>artifacts/</outputDirectory>
             <scope>provided</scope>
             <unpack>true</unpack>
-            <unpackOptions>
-                <excludes>
-                    <exclude>**/glassfish/domains/domain1/**</exclude>
-                </excludes>
-            </unpackOptions>
             <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
         </dependencySet>
     </dependencySets>
@@ -60,4 +55,4 @@
             <fileMode>0755</fileMode>
         </fileSet>
     </fileSets>
-</assembly>
+</assembly>