morciuch 2003/09/30 13:06:30
Modified: . RELEASE-TODO
build build.xml
src/java/org/apache/jetspeed/services/resources
JetspeedResourceService.java JetspeedResources.java
webapp/WEB-INF/conf JetspeedResources.properties
Log:
Version information is now displayed using a property from jr.props (see Bugzilla
bug# 23504).
Revision Changes Path
1.18 +3 -4 jakarta-jetspeed/RELEASE-TODO
Index: RELEASE-TODO
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/RELEASE-TODO,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- RELEASE-TODO 25 Apr 2003 23:48:36 -0000 1.17
+++ RELEASE-TODO 30 Sep 2003 20:06:30 -0000 1.18
@@ -8,9 +8,8 @@
These are misc notes that are used when building a Jetspeed distribution.
1) Update the version number in the following files:
- build/build.xml
- webapp/WEB-INF/templates/jsp/navigation/html/bottom.jsp
- webapp/WEB-INF/templates/vm/navigation/html/bottom.vm
+ project.xml
+ webapp/WEB-INF/conf/JetspeedResources.properties
(Their may be other files, so do a search on the previous version # and "-dev"
2) Update the distribution URL in the following files:
1.201 +2 -1 jakarta-jetspeed/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/build/build.xml,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- build.xml 25 Aug 2003 06:18:39 -0000 1.200
+++ build.xml 30 Sep 2003 20:06:30 -0000 1.201
@@ -49,12 +49,13 @@
<property file="${user.home}/build.properties" />
<property file="${user.home}/.build.properties" />
<property file="build/build.properties" />
+ <property file="webapp/WEB-INF/conf/JetspeedResources.properties"/>
<!-- Generic project properties -->
<property name="project.fullname" value="Jetspeed Portal Implementation"/>
<property name="project.name" value="jetspeed"/>
- <property name="project.version" value="1.4-b5-dev"/>
+ <property name="project.version" value="${jetspeed.version}"/>
<!-- =================================================================== -->
<!-- Set the properties related to the source tree -->
1.7 +13 -3
jakarta-jetspeed/src/java/org/apache/jetspeed/services/resources/JetspeedResourceService.java
Index: JetspeedResourceService.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/resources/JetspeedResourceService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JetspeedResourceService.java 12 Aug 2003 14:48:34 -0000 1.6
+++ JetspeedResourceService.java 30 Sep 2003 20:06:30 -0000 1.7
@@ -70,6 +70,8 @@
// Commons classes
import org.apache.commons.configuration.Configuration;
+import org.apache.jetspeed.services.resources.JetspeedResources;
+
/**
* <p>This service subclasses <code>TurbineResourceService</code> and
* provides functionality for overriding properties in default resource
@@ -324,7 +326,16 @@
String torqueFilename = appName + "_torque.properties";
super.init(config);
- System.out.println("Jetspeed Services: Starting servlet: [" + appName +"]");
+ // Display product information
+ //System.out.println("Jetspeed Services: Starting servlet: [" + appName
+"]");
+ String version = getString(JetspeedResources.JETSPEED_VERSION_KEY);
+ String name = getString(JetspeedResources.JETSPEED_NAME_KEY);
+ if (version != null && name != null)
+ {
+ System.out.println("");
+ System.out.println("Starting " + name + "/" + version);
+ System.out.println("");
+ }
try
{
@@ -376,7 +387,6 @@
System.out.println("Connecting to:
"+tprops.getProperty("database.default.url"));
System.out.println("Database Username:
"+tprops.getProperty("database.default.username"));
}
-
}
catch (IOException e)
{
1.18 +6 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/services/resources/JetspeedResources.java
Index: JetspeedResources.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/resources/JetspeedResources.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- JetspeedResources.java 19 Jun 2003 17:12:19 -0000 1.17
+++ JetspeedResources.java 30 Sep 2003 20:06:30 -0000 1.18
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -158,6 +158,10 @@
public static final String PATH_TEMPLATE_KEY = "template";
public static final String PATH_PORTLET_KEY = "portlet";
public static final String PATH_SUBPANE_SEPARATOR = ",";
+
+ // product information
+ public static final String JETSPEED_NAME_KEY = "jetspeed.name";
+ public static final String JETSPEED_VERSION_KEY = "jetspeed.version";
/**
* Special portlet registry parameter used to override default portlet cache
expiration value
1.109 +6 -2
jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedResources.properties
Index: JetspeedResources.properties
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedResources.properties,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- JetspeedResources.properties 5 Sep 2003 16:41:17 -0000 1.108
+++ JetspeedResources.properties 30 Sep 2003 20:06:30 -0000 1.109
@@ -38,7 +38,11 @@
# THE FOLLOWING ARE "REQUIRED" PROPERTIES IN ORDER TO USE JETSPEED #
################################################################################
-##########################################
+#######################
+# Version Information #
+#######################
+jetspeed.version = 1.4-b5-dev
+jetspeed.name = Apache Jetspeed Portal
#########################################
# Jetspeed Datasbase Service #
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
