2 commits - comps-f21.xml.in

[Dennis Gilmore]

 comps-f21.xml.in |   54 ++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 42 insertions(+), 12 deletions(-)

New commits:
commit f39af741c71acb5f55b8830efecd22582a32f823
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Tue Jul 8 13:10:08 2014 -0400

    Rename JBoss
    
    The JBoss upstream has become WildFly.
    
    This patch switches the package requirement to the new package and
    changes the language to be implementation-agnostic ("Java EE
    Application Server" instead of "WildFly Application Server")

diff --git a/comps-f21.xml.in b/comps-f21.xml.in
index f8dffac..246c125 100644
--- a/comps-f21.xml.in
+++ b/comps-f21.xml.in
@@ -801,8 +801,8 @@
     </packagelist>
   </group>
   <group>
-    <id>jbossas</id>
-    <_name>JBoss Application Server</_name>
+    <id>javaenterprise</id>
+    <_name>Java Application Server</_name>
     <_description>Java application server.</_description>
     <default>false</default>
     <uservisible>false</uservisible>
@@ -810,7 +810,7 @@
       <packagereq>abrt-java-connector</packagereq>
       <packagereq>java-1.8.0-openjdk</packagereq>
       <packagereq>java-1.8.0-openjdk-devel</packagereq>
-      <packagereq>jboss-as</packagereq>
+      <packagereq>wildfly</packagereq>
       <packagereq>jboss-modules</packagereq>
       <packagereq>maven</packagereq>
     </packagelist>
@@ -6533,7 +6533,7 @@
     </grouplist>
     <optionlist>
       <groupid>java-development</groupid>
-      <groupid>jbossas</groupid>
+      <groupid>javaenterprise</groupid>
       <groupid>mongodb</groupid>
       <groupid>perl-web</groupid>
       <groupid>php</groupid>
@@ -6566,7 +6566,7 @@
     </grouplist>
     <optionlist>
       <groupid>haproxy</groupid>
-      <groupid>jbossas</groupid>
+      <groupid>javaenterprise</groupid>
       <groupid>mongodb</groupid>
       <groupid>perl-web</groupid>
       <groupid>python-web</groupid>
@@ -6779,7 +6779,7 @@
       <groupid>gnome-software-development</groupid>
       <groupid>haskell</groupid>
       <groupid>java-development</groupid>
-      <groupid>jbossas</groupid>
+      <groupid>javaenterprise</groupid>
       <groupid>kde-software-development</groupid>
       <groupid>kf5-software-development</groupid>
       <groupid>legacy-software-development</groupid>
@@ -6818,7 +6818,7 @@
       <groupid>ftp-server</groupid>
       <groupid>ha</groupid>
       <groupid>haproxy</groupid>
-      <groupid>jbossas</groupid>
+      <groupid>javaenterprise</groupid>
       <groupid>load-balancer</groupid>
       <groupid>legacy-network-server</groupid>
       <groupid>mail-server</groupid>


commit 714805ed6d41a74bc0b1a202712d1bee4b9620dd
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Tue Jul 8 12:50:10 2014 -0400

    Fedora Server changes
    
    Adds two new groups: headless-management and container management
    
    These two groups are added to the default set of packages installed
    by the Infrastructure Server environment.
    
    Also reorders the optional list for Infrastructure Server
    alphabetically.

diff --git a/comps-f21.xml.in b/comps-f21.xml.in
index 0a10a0f..f8dffac 100644
--- a/comps-f21.xml.in
+++ b/comps-f21.xml.in
@@ -1412,6 +1412,18 @@
     </packagelist>
   </group>
   <group>
+    <id>container-management</id>
+    <_name>Container Management</_name>
+    <_description>Tools for managing Linux containers</_description>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">docker-io</packagereq>
+      <packagereq type="optional">fedora-dockerfiles</packagereq>
+      <packagereq type="optional">docker-registry</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>core</id>
     <_name>Core</_name>
     <_description>Smallest possible installation</_description>
@@ -3674,6 +3686,21 @@
     </packagelist>
   </group>
   <group>
+    <id>headless-management</id>
+    <_name>Headless Management</_name>
+    <_description>
+      Tools for managing the system without an attached graphical console
+    </_description>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">cockpit</packagereq>
+      <packagereq type="mandatory">openssh-server</packagereq>
+      <packagereq type="default">openlmi</packagereq>
+      <packagereq type="default">tog-pegasus</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>hebrew-support</id>
     <_name>Hebrew Support</_name>
     <_description/>
@@ -6560,23 +6587,26 @@
       <groupid>standard</groupid>
       <groupid>core</groupid>
       <groupid>hardware-support</groupid>
+      <groupid>headless-management</groupid>
+      <groupid>container-management</groupid>
     </grouplist>
     <optionlist>
       <groupid>dogtag</groupid>
+      <groupid>directory-server</groupid>
       <groupid>dns-server</groupid>
       <groupid>freeipa-server</groupid>
       <groupid>ftp-server</groupid>
+      <groupid>guest-agents</groupid>
+      <groupid>ha</groupid>
+      <groupid>load-balancer</groupid>
       <groupid>mail-server</groupid>
+      <groupid>mysql</groupid>
       <groupid>network-server</groupid>
+      <groupid>printing</groupid>
       <groupid>smb-server</groupid>
-      <groupid>web-server</groupid>
-      <groupid>mysql</groupid>
       <groupid>sql-server</groupid>
       <groupid>virtualization</groupid>
       <groupid>web-server</groupid>
-      <groupid>load-balancer</groupid>
-      <groupid>ha</groupid>
-      <groupid>guest-agents</groupid>
     </optionlist>
   </environment>
   <environment>