You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2004/02/05 06:50:54 UTC
cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager PortletApplicationManager.java
taylor 2004/02/04 21:50:54
Modified: portal maven.xml
portal/src/java/org/apache/jetspeed/tools/pamanager
PortletApplicationManager.java
Log:
modified PAM to allow for 3 parameters to be set in system properties:
property default
-----------------------------------------------------------
pam.jetspeed.properties - /WEB-INF/conf/jetspeed.properties
pam.apps.directory - /WEB-INF/apps/
pam.properties - /WEB-INF/conf/pam.properties
Revision Changes Path
1.36 +1 -0 jakarta-jetspeed-2/portal/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/maven.xml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- maven.xml 5 Feb 2004 02:59:20 -0000 1.35
+++ maven.xml 5 Feb 2004 05:50:54 -0000 1.36
@@ -79,6 +79,7 @@
<pathelement path="${maven.build.dest}"/>
</classpath>
<sysproperty key="services.HSQLDBServer.db.path" value="${hsql.deployment.db.path}"/>
+ <sysproperty key="pam.jetspeed.properties" value="/WEB-INF/conf/jetspeed.properties"/>
<arg value="-action" />
<arg value="deploy" />
<arg value="-PortletAppName" />
1.7 +10 -6 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java
Index: PortletApplicationManager.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PortletApplicationManager.java 15 Jan 2004 20:38:58 -0000 1.6
+++ PortletApplicationManager.java 5 Feb 2004 05:50:54 -0000 1.7
@@ -109,7 +109,7 @@
{
String arg;
Engine engine = null;
- int i = 0;
+ int i = 0;
// Read the command line
String strWebAppDir = "";
@@ -123,7 +123,9 @@
String strPassword = "";
String strServer = "localhost";
int intServerPort = 8080;
-
+ String jetspeedPropertiesFile = System.getProperty("pam.jetspeed.properties", "/WEB-INF/conf/jetspeed.properties");
+ String appsDirectory = System.getProperty("pam.apps.directory", "/WEB-INF/apps/");
+
while (i < args.length && args[i].startsWith("-"))
{
arg = args[i++];
@@ -215,7 +217,7 @@
{
// Start the registry service -- it's needed by many actions
Configuration properties =
- (Configuration) new PropertiesConfiguration(strAppRoot + "/WEB-INF/conf/jetspeed.properties");
+ (Configuration) new PropertiesConfiguration(strAppRoot + jetspeedPropertiesFile);
properties.setProperty(APPLICATION_ROOT_KEY, strAppRoot);
@@ -246,7 +248,7 @@
{
if (applicationType.equals("local"))
{
- String portletAppRoot = strAppRoot + "/WEB-INF/apps/";
+ String portletAppRoot = strAppRoot + appsDirectory;
deploy(portletAppRoot, strWarFileName, strPortletAppName);
}
else
@@ -602,7 +604,9 @@
*/
public static void overrideProperties(String strApplicationRoot, Configuration properties) throws IOException
{
- String testPropsPath = strApplicationRoot + "/WEB-INF/conf/pam.properties";
+ String pamPropertiesFile = System.getProperty("pam.properties", "/WEB-INF/conf/pam.properties");
+
+ String testPropsPath = strApplicationRoot + pamPropertiesFile;
File testFile = new File(testPropsPath);
if (testFile.exists())
{
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org