Mailing-List: contact jetspeed-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "Jetspeed Developers List" <jetspeed-dev@jakarta.apache.org>
Date: 5 May 2004 23:09:29 -0000
Message-ID: <20040505230929.10703.qmail@minotaur.apache.org>
From: taylor@apache.org
To: jakarta-jetspeed-2-cvs@apache.org
Subject: cvs commit: jakarta-jetspeed-2/portal maven.xml

taylor      2004/05/05 16:09:29

  Modified:    portal/src/java/org/apache/jetspeed/services/information
                        DynamicInformationProviderImpl.java
               portal   maven.xml
  Log:
  had to split out the entities creation scripts for MySQL since the syntax was different
  involving some jelly script to copy around the DDL scripts
  
  PR:
  Obtained from:
  Submitted by:	
  Reviewed by:	
  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.6       +9 -2      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/information/DynamicInformationProviderImpl.java
  
  Index: DynamicInformationProviderImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/information/DynamicInformationProviderImpl.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DynamicInformationProviderImpl.java	6 Apr 2004 19:57:38 -0000	1.5
  +++ DynamicInformationProviderImpl.java	5 May 2004 23:09:29 -0000	1.6
  @@ -185,7 +185,14 @@
            return context.getPortalURL().getBaseURL();
       }
   
  -    public Map getAllParameters(PortletWindow portletWindow)
  +    /**
  +     * this method is deprecated but Im going to keep it around for reference
  +     * 
  +     * @param portletWindow
  +     * @deprecated
  +     * @return
  +     */
  +    private Map getAllParameters(PortletWindow portletWindow)
       {
           Enumeration parameters = request.getParameterNames();
   
  
  
  
  1.68      +14 -3     jakarta-jetspeed-2/portal/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/maven.xml,v
  retrieving revision 1.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  --- maven.xml	1 May 2004 17:03:00 -0000	1.67
  +++ maven.xml	5 May 2004 23:09:29 -0000	1.68
  @@ -494,9 +494,20 @@
     </goal>
   
     <goal name="db.entities">
  -      <j:set var="database.arg.script" value="../src/sql/populate-entities-for-default-psml.sql" />
  -      <attainGoal name="db.production.properties"/>
  -      <attainGoal name="db.execute" />
  +    <j:set var="dbase" value="${org.apache.jetspeed.production.database.default.name}"/>
  +    <j:choose>    
  +	    <j:when test="${dbase == 'mysql'}" >
  +            <copy  file="../src/sql/mysql/populate-entities-for-default-psml.sql" 
  +                  tofile="../src/sql/populate-entities-temp.sql"/>  		
  +	    </j:when>
  +	    <j:otherwise>
  +            <copy  file="../src/sql/populate-entities-for-default-psml.sql" 
  +                   tofile="../src/sql/populate-entities-temp.sql"/>  			  		
  +	    </j:otherwise>
  +	</j:choose>	
  +    <j:set var="database.arg.script" value="../src/sql/populate-entities-temp.sql" />
  +    <attainGoal name="db.production.properties"/>
  +    <attainGoal name="db.execute" />	
     </goal>
   
     <goal name="ojb.set.production.database.platform">
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org