Return-Path: Delivered-To: apmail-jakarta-jetspeed-dev-archive@www.apache.org Received: (qmail 38891 invoked from network); 9 Aug 2004 22:44:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 9 Aug 2004 22:44:31 -0000 Received: (qmail 48122 invoked by uid 500); 9 Aug 2004 22:44:28 -0000 Delivered-To: apmail-jakarta-jetspeed-dev-archive@jakarta.apache.org Received: (qmail 48018 invoked by uid 500); 9 Aug 2004 22:44:27 -0000 Mailing-List: contact jetspeed-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Jetspeed Developers List" Reply-To: "Jetspeed Developers List" Delivered-To: mailing list jetspeed-dev@jakarta.apache.org Received: (qmail 47999 invoked by uid 500); 9 Aug 2004 22:44:27 -0000 Received: (qmail 47996 invoked by uid 99); 9 Aug 2004 22:44:27 -0000 X-ASF-Spam-Status: No, hits=-2.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.27.1) with SMTP; Mon, 09 Aug 2004 15:44:26 -0700 Received: (qmail 38842 invoked by uid 1265); 9 Aug 2004 22:44:25 -0000 Date: 9 Aug 2004 22:44:25 -0000 Message-ID: <20040809224425.38841.qmail@minotaur.apache.org> From: taylor@apache.org To: jakarta-jetspeed-cvs@apache.org Subject: cvs commit: jakarta-jetspeed/webapp/WEB-INF/conf/assembly jetspeed-spring.xml X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N taylor 2004/08/09 15:44:25 Modified: webapp/WEB-INF/conf fusion.properties webapp/WEB-INF/conf/assembly jetspeed-spring.xml Log: Hey fusion boy! yas sir, here i am, i keep fusion up to date while you studly code slingers do ya thing 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.11 +11 -5 jakarta-jetspeed/webapp/WEB-INF/conf/fusion.properties Index: fusion.properties =================================================================== RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/fusion.properties,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- fusion.properties 2 Aug 2004 20:54:03 -0000 1.10 +++ fusion.properties 9 Aug 2004 22:44:25 -0000 1.11 @@ -3,9 +3,9 @@ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -96,14 +96,20 @@ #------------------------------------------------------------------------- -# C A P A B I L I T Y, C O N T E N T E N C O D I N G +# C A P A B I L I T Y, C O N T E N T E N C O D I N G #------------------------------------------------------------------------- content.defaultencoding=iso-8859-1 #--------------------------------------------------------------------------------- # Run Auto-Deployment set up -#--------------------------------------------------------------------------------- +#----'----------------------------------------------------------------------------- +# THE NEXT PROPERTY DEFINITION MAY NOT BE MODIFIED (NOT EVEN BE PADDED WITH WHITESPACE) +# BECAUSE ITS FILTERED BY ANT DURING DEPLOYMENT. +# ITS CONCREET VALUE WILL BE SET FROM BUILD PROPERTY org.apache.jetspeed.catalina.version.major +autodeployment.catalina.version.major=4 +autodeployment.catalina.base=${applicationRoot}/../../ +autodeployment.catalina.engine=Catalina autodeployment.server=localhost autodeployment.port=8080 autodeployment.user=@AUTODEPLOYMENT_USER@ 1.4 +233 -221 jakarta-jetspeed/webapp/WEB-INF/conf/assembly/jetspeed-spring.xml Index: jetspeed-spring.xml =================================================================== RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/assembly/jetspeed-spring.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jetspeed-spring.xml 1 Aug 2004 15:54:19 -0000 1.3 +++ jetspeed-spring.xml 9 Aug 2004 22:44:25 -0000 1.4 @@ -16,322 +16,334 @@ limitations under the License. --> - - + + ${applicationRoot}/WEB-INF/conf/fusion.properties - - + + + /> + - - - - - - - - - - - - + + + + + + + + + + + - + - - - 65536 - - P- - - + + + 65536 + + P- + + - + - - - 120 - - 100 - + + + 120 + + 100 + - - - jetspeed + + + jetspeed - + - + - persistenceStoreTarget + persistenceStoreTarget + > org.apache.jetspeed.components.persistence.store.PersistenceStore - + - - + + - + - - - + + + - + - - + + - + - - + + - + - - - org.apache.jetspeed.prefs.impl.PreferencesFactoryImpl - false + + + org.apache.jetspeed.prefs.impl.PreferencesFactoryImpl + false - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - login.conf - - + + login.conf + + - + - - + - + - - org.apache.jetspeed.container.session.impl.SessionNavigationalState - org.apache.jetspeed.container.url.impl.SessionPortalURL - _,a,m,s,r,i,pm,ps,: + + org.apache.jetspeed.container.session.impl.SessionNavigationalState + org.apache.jetspeed.container.url.impl.SessionPortalURL + _,a,m,s,r,i,pm,ps,: - + - - - org.apache.jetspeed.request.JetspeedRequestContext - + + + org.apache.jetspeed.request.JetspeedRequestContext + - + - - + + - + - - + + - - + + - + - - - + + + - + - + - + - - + + - + - - + + - + - - - - 0 + + + + 0 + + + portlet/{mediaType}/jetspeed + portlet/{mediaType} + layout/{mediaType} + generic/{mediaType} + {mediaType} + + - + - - - - - - - ${autodeployment.server} - ${autodeployment.port} - ${autodeployment.user} - ${autodeployment.password} - - - - - ${autodeployment.target.dir} - - - - - + + + + + + + ${autodeployment.catalina.base} + ${autodeployment.catalina.engine} + ${autodeployment.catalina.version.major} + ${autodeployment.server} + ${autodeployment.port} + ${autodeployment.user} + ${autodeployment.password} - + + + + ${autodeployment.target.dir} + + + + + + + - + ${autodeployment.staging.dir} - - - + + + - + - - ${autodeployment.staging.dir} + + ${autodeployment.staging.dir} ${autodeployment.delay} - + - - + + file:///${applicationRoot}/WEB-INF/conf/fusion.properties - - + + --------------------------------------------------------------------- To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org