[portal-commits] JBoss Portal SVN: r8412 - in modules/common/tags/1_0_0: build and 7 other directories.

Author: thomas.heute(a)jboss.com Date: 2007-09-21 10:33:07 -0400 (Fri, 21 Sep 2007) New Revision: 8412 Added: modules/common/tags/1_0_0/mc/src/etc/ modules/common/tags/1_0_0/mc/src/etc/portal-common-mc-lib-jar.mf modules/common/tags/1_0_0/portal/src/etc/ modules/common/tags/1_0_0/portal/src/etc/portal-common-portal-lib-jar.mf Removed: modules/common/tags/1_0_0/mc/src/etc/portal-common-mc-lib-jar.mf modules/common/tags/1_0_0/portal/src/etc/portal-common-portal-lib-jar.mf Modified: modules/common/tags/1_0_0/.classpath modules/common/tags/1_0_0/build/build.xml modules/common/tags/1_0_0/mc/build.xml modules/common/tags/1_0_0/portal/build.xml modules/common/tags/1_0_0/tools/etc/buildfragments/defaults.ent Log: Merge on the tag Modified: modules/common/tags/1_0_0/.classpath =================================================================== --- modules/common/tags/1_0_0/.classpath 2007-09-21 14:31:04 UTC (rev 8411) +++ modules/common/tags/1_0_0/.classpath 2007-09-21 14:33:07 UTC (rev 8412) @@ -2,9 +2,18 @@ <classpath> <classpathentry kind="src" path="mc/src/main/java"/> <classpathentry kind="src" path="portal/src/main/java"/> + <classpathentry kind="src" path="common/src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar"/> <classpathentry kind="lib" path="thirdparty/sun-servlet/lib/servlet-api.jar"/> <classpathentry kind="lib" path="thirdparty/apache-log4j/lib/log4j.jar"/> + <classpathentry kind="lib" path="thirdparty/apache-ant/lib/ant.jar"/> + <classpathentry kind="lib" path="tools/lib/cargo-core-uberjar-0.8.jar"/> + <classpathentry kind="lib" path="thirdparty/oswego-concurrent/lib/concurrent.jar"/> + <classpathentry kind="lib" path="thirdparty/junit/lib/junit.jar"/> + <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-j2ee.jar"/> + <classpathentry kind="lib" path="tools/lib/ant-junit.jar"/> + <classpathentry kind="lib" path="thirdparty/apache-httpclient/lib/commons-httpclient.jar"/> + <classpathentry kind="lib" path="thirdparty/sun-jaf/lib/activation.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: modules/common/tags/1_0_0/build/build.xml =================================================================== --- modules/common/tags/1_0_0/build/build.xml 2007-09-21 14:31:04 UTC (rev 8411) +++ modules/common/tags/1_0_0/build/build.xml 2007-09-21 14:33:07 UTC (rev 8412) @@ -66,7 +66,7 @@ <property name="version.name" value=""/> <!-- This must be set to the CVS tag for any release --> - <property name="version.cvstag" value="HEAD"/> + <property name="version.cvstag" value=""/> <!-- Module name(s) & version --> <property name="module.version" Modified: modules/common/tags/1_0_0/mc/build.xml =================================================================== --- modules/common/tags/1_0_0/mc/build.xml 2007-09-21 14:31:04 UTC (rev 8411) +++ modules/common/tags/1_0_0/mc/build.xml 2007-09-21 14:33:07 UTC (rev 8412) @@ -146,7 +146,7 @@ <mkdir dir="${build.lib}"/> - <jar jarfile="${build.lib}/portal-common-mc-lib.jar"> + <jar jarfile="${build.lib}/portal-common-mc-lib.jar" manifest="${build.etc}/portal-common-mc-lib-jar.mf"> <fileset dir="${build.classes}"/> </jar> Copied: modules/common/tags/1_0_0/mc/src/etc (from rev 8410, modules/common/trunk/mc/src/etc) Deleted: modules/common/tags/1_0_0/mc/src/etc/portal-common-mc-lib-jar.mf =================================================================== --- modules/common/trunk/mc/src/etc/portal-common-mc-lib-jar.mf 2007-09-21 14:26:14 UTC (rev 8410) +++ modules/common/tags/1_0_0/mc/src/etc/portal-common-mc-lib-jar.mf 2007-09-21 14:33:07 UTC (rev 8412) @@ -1,10 +0,0 @@ -Manifest-Version: 1.0 -Created-By: @java.vm.version@ (@java.vm.vendor@) -Specification-Title: @specification.title@ -Specification-Version: @specification.version@ -Specification-Vendor: @specification.vendor@ -Implementation-Title: @implementation.title@ -Implementation-URL: @implementation.url@ -Implementation-Version: @implementation.version@ -Implementation-Vendor: @implementation.vendor@ -Implementation-Vendor-Id: @implementation.vendor.id@ Copied: modules/common/tags/1_0_0/mc/src/etc/portal-common-mc-lib-jar.mf (from rev 8410, modules/common/trunk/mc/src/etc/portal-common-mc-lib-jar.mf) =================================================================== --- modules/common/tags/1_0_0/mc/src/etc/portal-common-mc-lib-jar.mf (rev 0) +++ modules/common/tags/1_0_0/mc/src/etc/portal-common-mc-lib-jar.mf 2007-09-21 14:33:07 UTC (rev 8412) @@ -0,0 +1,10 @@ +Manifest-Version: 1.0 +Created-By: @java.vm.version@ (@java.vm.vendor@) +Specification-Title: @specification.title@ +Specification-Version: @specification.version@ +Specification-Vendor: @specification.vendor@ +Implementation-Title: @implementation.title@ +Implementation-URL: @implementation.url@ +Implementation-Version: @implementation.version@ +Implementation-Vendor: @implementation.vendor@ +Implementation-Vendor-Id: @implementation.vendor.id@ Modified: modules/common/tags/1_0_0/portal/build.xml =================================================================== --- modules/common/tags/1_0_0/portal/build.xml 2007-09-21 14:31:04 UTC (rev 8411) +++ modules/common/tags/1_0_0/portal/build.xml 2007-09-21 14:33:07 UTC (rev 8412) @@ -142,7 +142,7 @@ <mkdir dir="${build.lib}"/> - <jar jarfile="${build.lib}/portal-common-portal-lib.jar"> + <jar jarfile="${build.lib}/portal-common-portal-lib.jar" manifest="${build.etc}/portal-common-portal-lib-jar.mf"> <fileset dir="${build.classes}"/> </jar> Copied: modules/common/tags/1_0_0/portal/src/etc (from rev 8410, modules/common/trunk/portal/src/etc) Deleted: modules/common/tags/1_0_0/portal/src/etc/portal-common-portal-lib-jar.mf =================================================================== --- modules/common/trunk/portal/src/etc/portal-common-portal-lib-jar.mf 2007-09-21 14:26:14 UTC (rev 8410) +++ modules/common/tags/1_0_0/portal/src/etc/portal-common-portal-lib-jar.mf 2007-09-21 14:33:07 UTC (rev 8412) @@ -1,10 +0,0 @@ -Manifest-Version: 1.0 -Created-By: @java.vm.version@ (@java.vm.vendor@) -Specification-Title: @specification.title@ -Specification-Version: @specification.version@ -Specification-Vendor: @specification.vendor@ -Implementation-Title: @implementation.title@ -Implementation-URL: @implementation.url@ -Implementation-Version: @implementation.version@ -Implementation-Vendor: @implementation.vendor@ -Implementation-Vendor-Id: @implementation.vendor.id@ Copied: modules/common/tags/1_0_0/portal/src/etc/portal-common-portal-lib-jar.mf (from rev 8410, modules/common/trunk/portal/src/etc/portal-common-portal-lib-jar.mf) =================================================================== --- modules/common/tags/1_0_0/portal/src/etc/portal-common-portal-lib-jar.mf (rev 0) +++ modules/common/tags/1_0_0/portal/src/etc/portal-common-portal-lib-jar.mf 2007-09-21 14:33:07 UTC (rev 8412) @@ -0,0 +1,10 @@ +Manifest-Version: 1.0 +Created-By: @java.vm.version@ (@java.vm.vendor@) +Specification-Title: @specification.title@ +Specification-Version: @specification.version@ +Specification-Vendor: @specification.vendor@ +Implementation-Title: @implementation.title@ +Implementation-URL: @implementation.url@ +Implementation-Version: @implementation.version@ +Implementation-Vendor: @implementation.vendor@ +Implementation-Vendor-Id: @implementation.vendor.id@ Modified: modules/common/tags/1_0_0/tools/etc/buildfragments/defaults.ent =================================================================== --- modules/common/tags/1_0_0/tools/etc/buildfragments/defaults.ent 2007-09-21 14:31:04 UTC (rev 8411) +++ modules/common/tags/1_0_0/tools/etc/buildfragments/defaults.ent 2007-09-21 14:33:07 UTC (rev 8412) @@ -20,15 +20,15 @@ <property name="version.cvstag" value="JBoss_4_0_0_DR3"/> <!-- Manifest version info --> - <property name="specification.title" value="JBoss"/> - <property name="specification.version" value="${version.major}.${version.minor}"/> - <property name="specification.vendor" value="JBoss Group, LLC (http://jboss.org)"/> + <property name="specification.title" value="JBoss Portal"/> + <property name="specification.version" value="${version.major}.${version.minor}.${version.revision}"/> + <property name="specification.vendor" value="Red Hat, Inc. (http://www.redhat.com)"/> - <property name="implementation.title" value="JBoss [${version.name}]"/> - <property name="implementation.url" value="http://jboss.org"/> + <property name="implementation.title" value="JBoss Portal ${version.name}"/> + <property name="implementation.url" value="http://labs.jboss.com/portal/jbossportal"/> <property name="implementation.version" - value="${version.major}.${version.minor}.${version.revision}${version.tag} (build: CVSTag=${version.cvstag} date=${build.id})"/> - <property name="implementation.vendor" value="JBoss Group, LLC"/> + value="${version.major}.${version.minor}.${version.revision}.${version.tag} (date=${build.id})"/> + <property name="implementation.vendor" value="Red Hat, Inc."/> <property name="implementation.vendor.id" value="${implementation.url}"/>