Author: hfnukal Date: 2011-09-02 04:53:42 -0400 (Fri, 02 Sep 2011) New Revision: 7290 Added: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/run.jar/ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/run.jar/META-INF/ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/run.jar/META-INF/MANIFEST.MF epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/run.jar/org/ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/run.jar/org/jboss/ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/run.jar/org/jboss/version.properties Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/build.xml Log: JBEPP-1140 EPP startup message Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml 2011-09-02 08:15:22 UTC (rev 7289) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml 2011-09-02 08:53:42 UTC (rev 7290) @@ -61,7 +61,23 @@ <build> <finalName>jboss-epp-${project.version}</finalName> - <plugins> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.5</version> + <configuration> + <propertyPrefix>version</propertyPrefix> + </configuration> + <executions> + <execution> + <id>parse-version</id> + <goals> + <goal>parse-version</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> @@ -139,6 +155,10 @@ <property name="toConfiguration" value="all"/> </ant> + <ant antfile="src/build.xml" inheritRefs="true"> + <target name="modifyStartupMessage"/> + </ant> + </target> </configuration> </execution> @@ -206,6 +226,9 @@ <property name="toConfiguration" value="${servername}"/> </ant> + <ant antfile="src/build.xml" inheritRefs="true"> + <target name="modifyStartupMessage"/> + </ant> </target> </configuration> @@ -295,6 +318,10 @@ <property name="toConfiguration" value="all"/> </ant> + <ant antfile="src/build.xml" inheritRefs="true"> + <target name="modifyStartupMessage"/> + </ant> + </target> </configuration> </execution> Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/build.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/build.xml 2011-09-02 08:15:22 UTC (rev 7289) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/build.xml 2011-09-02 08:53:42 UTC (rev 7290) @@ -77,4 +77,41 @@ <zip destfile="${epp.zip}" basedir="${root.path}" update="true"> </zip> </target> + + <!-- Patching startup message in log when starting portal --> + <target name="modifyStartupMessage"> + + <property name="resource_dir" value="${basedir}/src/main/resources/eap/run.jar/" /> + <tstamp> + <format property="build-day" pattern="MMMM d yyyy" /> + </tstamp> + + <copy todir="${basedir}/target/work/run.jar"> + <fileset dir="${resource_dir}" includes="**/version.properties,META-INF/MANIFEST.MF" /> + <filterset> + <filter token="version.major" value="${version.majorVersion}" /> + <filter token="version.minor" value="${version.minorVersion}" /> + <filter token="version.revision" value="${version.incrementalVersion}" /> + <filter token="version.designation" value="${version.qualifier}" /> + <filter token="build_version" value="${project.version}" /> + <filter token="cvstag" value="${project.version}" /> + <filter token="build-date" value="${DSTAMP}" /> + <filter token="build-time" value="${TSTAMP}" /> + <filter token="build-day" value="${build-day}" /> + <filter token="java.version" value="${java.version}" /> + <filter token="java.vendor" value="${java.vendor}" /> + <filter token="java.vm.specification.version" value="${java.vm.specification.version}" /> + <filter token="java.vm.version" value="${java.vm.version}" /> + <filter token="java.vm.name" value="${java.vm.name}" /> + <filter token="java.vm.info" value="${java.vm.info}" /> + <filter token="java.specification.version" value="${java.specification.version}" /> + <filter token="java.class.version" value="${java.class.version}" /> + <filter token="os.name" value="${os.name}" /> + <filter token="os.arch" value="${os.arch}" /> + <filter token="os.version" value="${os.version}" /> + </filterset> + </copy> + <zip destfile="${epp.path}/jboss-as/bin/run.jar" basedir="${basedir}/target/work/run.jar/" update="true"> + </zip> + </target> </project> \ No newline at end of file Added: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/run.jar/META-INF/MANIFEST.MF =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/run.jar/META-INF/MANIFEST.MF (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/run.jar/META-INF/MANIFEST.MF 2011-09-02 08:53:42 UTC (rev 7290) @@ -0,0 +1,14 @@ +Manifest-Version: 1.0 +Specification-Title: JBoss +Created-By: @java.vm.version@ (@java.vendor@) +Specification-Version: @build_version@ +Implementation-Vendor-Id: http://www.jboss.org/ +Implementation-URL: http://www.jboss.org/ +Class-Path: ../client/getopt.jar +Ant-Version: Apache Ant 1.7.0 +Main-Class: org.jboss.Main +Implementation-Title: JBoss [EPP] +Specification-Vendor: JBoss (http://www.jboss.org/) +Implementation-Version: @cvstag@ (build: SVNTag=@cvstag@ date=@build-date@@build-time@) +Implementation-Vendor: JBoss Inc. + Added: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/run.jar/org/jboss/version.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/run.jar/org/jboss/version.properties (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/run.jar/org/jboss/version.properties 2011-09-02 08:53:42 UTC (rev 7290) @@ -0,0 +1,40 @@ +### ====================================================================== ### +## ## +## Holds version properties for JBoss. ## +## ## +### ====================================================================== ### + +### Based on: version.properties 24677 2004-10-17 21:20:54Z starksm $ ### +### $Id: version.properties 3752 2009-09-23 09:27:47Z rzhang(a)REDHAT.COM $ ### + +# The version of the server + + +version.major=(a)version.major@ +version.minor=(a)version.minor@ +version.revision=(a)version.revision@ +version.tag=(a)version.designation@ +version.name=EPP +version.cvstag=@cvstag@ + +# Build identifiers +build.number=@build-date@@build-time@ +build.id=@build-date@@build-time@ +build.date=@build-date@ +build.time=@build-time@ +build.day=@build-day@ + +# Information about Java version used to compile +java.version=(a)java.version@ +java.vendor=(a)java.vendor@ +java.vm.specification.version=(a)java.vm.specification.version@ +java.vm.version=(a)java.vm.version@ +java.vm.name=(a)java.vm.name@ +java.vm.info=(a)java.vm.info@ +java.specification.version=(a)java.specification.version@ +java.class.version=(a)java.class.version@ + +# Information about the OS the server was compiled on +os.name=(a)os.name@ +os.arch=(a)os.arch@ +os.version=(a)os.version@