taylor 2004/08/06 16:03:02
Modified: portal/src/java/org/apache/jetspeed/tools/pamanager
FileSystemPAM.java
Log:
adding support for missing web.xml -- auto deploy now allows for portlet app war
files deployed without a web.xml
we now create a new web.xml, include it in the deployment, and infuse the jetspeed
container servlet
CVS: ----------------------------------------------------------------------
CVS: PR:
CVS: If this change addresses a PR in the problem report tracking
CVS: database, then enter the PR number(s) here.
CVS: Obtained from:
CVS: If this change has been taken from another system, such as NCSA,
CVS: then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS: If this code has been contributed to Apache by someone else; i.e.,
CVS: they sent us a patch or a new module, then include their name/email
CVS: address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS: If we are doing pre-commit code reviews and someone else has
CVS: reviewed your changes, include their name(s) here.
CVS: If you have not had it reviewed then delete this line.
Revision Changes Path
1.42 +9 -2
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/FileSystemPAM.java
Index: FileSystemPAM.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/FileSystemPAM.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- FileSystemPAM.java 5 Aug 2004 18:27:07 -0000 1.41
+++ FileSystemPAM.java 6 Aug 2004 23:03:02 -0000 1.42
@@ -295,7 +295,14 @@
if (startState <= nState)
{
- registerApplication(paWar);
+ if (targetWar == null)
+ {
+ registerApplication(paWar);
+ }
+ else
+ {
+ registerApplication(targetWar);
+ }
}
nState = UPDATE_REGISTRY;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
