GTNPORTAL-3447 Move 7.4.0.Final-redhat-4/* to jboss

packaging/jboss/pkg/package.xml

@@ -2,8 +2,6 @@
 
 <project name="package" xmlns:mvn="http://maven.apache.org/POM/4.0.0">
 
-  <property name="samples.dir" value="${maven.project.basedir}/src/main/resources/${version.jboss.as}/samples"/>
-
   <target name="prepare" depends="prepare-server-dir,package">
   </target>
 
@@ -33,19 +31,6 @@
     <unzip src="${jbossas.zip}" dest="${servers.dir}" overwrite="false"/>
   </target>
 
-  <target name="package-samples-checkdir">
-    <condition property="pkg.samples.hasdir">
-      <available file="${samples.dir}" type="dir"/>
-    </condition>
-  </target>
-
-  <target name="package-samples-copy" depends="package-samples-checkdir" if="pkg.samples.hasdir">
-    <!-- Copy version specific bin, modules, configuration files -->
-    <copy todir="${jbossas.target.dir}" preservelastmodified="true" overwrite="true">
-      <fileset dir="${samples.dir}"/>
-    </copy>
-  </target>
-
   <target name="package-samples" unless="pkg.nosamples">
     <!-- The following is commented out because of GTNPORTAL-2639 -->
     <!--
@@ -87,21 +72,6 @@
        <fileset dir="${maven.project.basedir}/src/main/resources/jboss/samples" />
     </copy>
     -->
-
-    <!-- Package version specific samples configuration if requested -->
-    <antcall target="package-samples-copy" inheritAll="true" inheritRefs="true"/>
-  </target>
-
-  <target name="package-version-checkdir">
-    <condition property="pkg.version.hasdir">
-      <available file="${maven.project.basedir}/src/main/resources/${version.jboss.as}/main" type="dir"/>
-    </condition>
-  </target>
-
-  <target name="package-version-copy" depends="package-version-checkdir" if="pkg.version.hasdir">
-    <copy todir="${jbossas.target.dir}" preservelastmodified="true" overwrite="true">
-      <fileset dir="${maven.project.basedir}/src/main/resources/${version.jboss.as}/main"/>
-    </copy>
   </target>
 
   <target name="package">
@@ -169,9 +139,6 @@
       <fileset dir="${maven.project.basedir}/src/main/resources/jboss/main"/>
     </copy>
 
-    <!-- Copy version specific bin, modules, configuration files -->
-    <antcall target="package-version-copy" inheritAll="true" inheritRefs="true"/>
-
     <!-- Copy modules -->
     <copy todir="${jbossas.modules.target.dir}" preservelastmodified="true" overwrite="true">
       <fileset dir="${maven.project.basedir}/../modules/target/${server.name}/gatein/modules">

packaging/jboss/pkg/pom.xml

@@ -281,8 +281,6 @@
               <target>
                 <ant antfile="${project.basedir}/${package.filename}" inheritRefs="true">
                   <target name="package" />
-                  <!-- without the next line the wrong version.jboss.ass is passed to antrun -->
-                  <property name="version.jboss.as" value="${version.jboss.as}" />
                   <property name="maven.project.basedir" value="${project.basedir}" />
                   <property name="maven.project.build.directory" value="${project.build.directory}" />
                 </ant>

packaging/jboss/pom.xml

@@ -19,9 +19,9 @@
 
     <gatein.working.dir>${project.build.directory}/jboss-eap</gatein.working.dir>
     <jbossas.target.dir>${gatein.working.dir}</jbossas.target.dir>
-    <jbossas.modules.target.dir>${jbossas.target.dir}/modules</jbossas.modules.target.dir>
-    <ws.security.consumer.dir>../../../../../../standalone/configuration/gatein/wsrp/cxf/ws-security/consumer</ws.security.consumer.dir>
-    <ws.security.producer.dir>../../../../../../standalone/configuration/gatein/wsrp/cxf/ws-security/producer</ws.security.producer.dir>
+    <jbossas.modules.target.dir>${jbossas.target.dir}/modules/system/layers/gatein</jbossas.modules.target.dir>
+    <ws.security.consumer.dir>../../../../../../../../../standalone/configuration/gatein/wsrp/cxf/ws-security/consumer</ws.security.consumer.dir>
+    <ws.security.producer.dir>../../../../../../../../../standalone/configuration/gatein/wsrp/cxf/ws-security/producer</ws.security.producer.dir>
   </properties>
   <build>
     <defaultGoal>package</defaultGoal>
@@ -111,23 +111,5 @@
         <package.filename>package.xml</package.filename>
       </properties>
     </profile>
-    <profile>
-      <id>pkg-eap630</id>
-      <activation>
-        <property>
-          <name>gatein.dev</name>
-          <value>eap630</value>
-        </property>
-      </activation>
-
-      <properties>
-        <version.jboss.as>7.4.0.Final-redhat-4</version.jboss.as>
-        <server.name>jboss-eap-6.3</server.name>
-        <package.filename>package.xml</package.filename>
-        <jbossas.modules.target.dir>${jbossas.target.dir}/modules/system/layers/gatein</jbossas.modules.target.dir>
-        <ws.security.consumer.dir>../../../../../../../../../standalone/configuration/gatein/wsrp/cxf/ws-security/consumer</ws.security.consumer.dir>
-        <ws.security.producer.dir>../../../../../../../../../standalone/configuration/gatein/wsrp/cxf/ws-security/producer</ws.security.producer.dir>
-      </properties>
-    </profile>
   </profiles>
 </project>