5:01 p.m.
Author: thomas.heute(a)jboss.com
Date: 2008-07-31 11:01:35 -0400 (Thu, 31 Jul 2008)
New Revision: 11663
Added:
branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/Main.java
branches/JBoss_Portal_Branch_2_6/server/src/resources/etc/
branches/JBoss_Portal_Branch_2_6/server/src/resources/etc/MANIFEST.MF
Modified:
branches/JBoss_Portal_Branch_2_6/server/.classpath
branches/JBoss_Portal_Branch_2_6/server/build.xml
branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/PortalConstants.java
Log:
java -jar portal-server-lib.jar will display the portal version (portal-common-lib.jar
must live in the same folder)
Modified: branches/JBoss_Portal_Branch_2_6/server/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_6/server/.classpath 2008-07-31 12:43:55 UTC (rev
11662)
+++ branches/JBoss_Portal_Branch_2_6/server/.classpath 2008-07-31 15:01:35 UTC (rev
11663)
@@ -12,7 +12,7 @@
<classpathentry kind="lib"
path="/thirdparty/junit/lib/junit.jar"/>
<classpathentry combineaccessrules="false" kind="src"
path="/jems"/>
<classpathentry kind="lib"
path="/thirdparty/jboss/backport-concurrent/lib/jboss-backport-concurrent.jar"/>
- <classpathentry kind="lib"
path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
+ <classpathentry kind="lib"
path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"
sourcepath="/module-common"/>
<classpathentry kind="lib"
path="/thirdparty/jboss-portal/modules/web/lib/portal-web-lib.jar"/>
<classpathentry kind="lib"
path="/thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar"/>
<classpathentry kind="lib"
path="/thirdparty/jboss-portal/modules/test/lib/portal-test-jboss-lib.jar"/>
Modified: branches/JBoss_Portal_Branch_2_6/server/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/server/build.xml 2008-07-31 12:43:55 UTC (rev 11662)
+++ branches/JBoss_Portal_Branch_2_6/server/build.xml 2008-07-31 15:01:35 UTC (rev 11663)
@@ -168,9 +168,9 @@
<mkdir dir="${build.lib}"/>
<!-- -->
- <jar jarfile="${build.lib}/portal-server-lib.jar">
+ <jar jarfile="${build.lib}/portal-server-lib.jar"
manifest="${build.resources}/etc/MANIFEST.MF">
<fileset dir="${build.classes}"
excludes="org/jboss/portal/test/**"/>
- </jar>
+ </jar>
<copy todir="${build.resources}/portal-server-sar">
<fileset dir="${jboss.portal/modules/common.lib}"
includes="portal-common-lib.jar"/>
Added: branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/Main.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/Main.java
(rev 0)
+++
branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/Main.java 2008-07-31
15:01:35 UTC (rev 11663)
@@ -0,0 +1,44 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.server;
+
+import org.jboss.portal.common.util.Version.Format;
+
+/**
+ * @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
+ * @version $Revision$
+ */
+public class Main
+{
+
+ /** FIXME Comment this
+ *
+ * @param args
+ */
+ public static void main(String[] args)
+ {
+
System.out.println(PortalConstants.VERSION.toString(Format.JBOSS_PRODUCT_CONVENTION));
+ }
+
+}
+
Modified:
branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/PortalConstants.java
===================================================================
---
branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/PortalConstants.java 2008-07-31
12:43:55 UTC (rev 11662)
+++
branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/PortalConstants.java 2008-07-31
15:01:35 UTC (rev 11663)
@@ -36,7 +36,7 @@
{
/** Current version. */
- public static final Version VERSION = new Version("JBoss Portal", 2, 6, 5,
new Version.Qualifier(Version.Qualifier.Prefix.GA), "Ninja");
+ public static final Version VERSION = new Version("JBoss Portal", 2, 6, 7,
new Version.Qualifier(Version.Qualifier.Prefix.SNAPSHOT), "Ninja");
/** The default portal name. */
public static final String DEFAULT_PORTAL_NAME = "default";
Added: branches/JBoss_Portal_Branch_2_6/server/src/resources/etc/MANIFEST.MF
===================================================================
--- branches/JBoss_Portal_Branch_2_6/server/src/resources/etc/MANIFEST.MF
(rev 0)
+++ branches/JBoss_Portal_Branch_2_6/server/src/resources/etc/MANIFEST.MF 2008-07-31
15:01:35 UTC (rev 11663)
@@ -0,0 +1,2 @@
+Main-Class: org.jboss.portal.server.Main
+Class-Path: portal-common-lib.jar
\ No newline at end of file