portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject cvs commit: jakarta-jetspeed-2/cps/test/rewriter test-001-output.html
Date Mon, 19 Jan 2004 23:40:25 GMT
taylor      2004/01/19 15:40:25

  Modified:    applications/pam maven.xml
               applications/pam/src/java/org/apache/jetspeed/apps/pam
                        PortletApplicationBrowser.java
               commons/src/java/org/apache/jetspeed/util
                        JetspeedObjectID.java
               cps/test/rewriter test-001-output.html
  Log:
  Changed the PRofiler to use the URL Path to locate the page, not request parameters
  This has enabled me to run the testsuite in a different page
  
  Revision  Changes    Path
  1.2       +2 -2      jakarta-jetspeed-2/applications/pam/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/applications/pam/maven.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- maven.xml	30 Dec 2003 06:21:42 -0000	1.1
  +++ maven.xml	19 Jan 2004 23:40:25 -0000	1.2
  @@ -9,11 +9,11 @@
     <!-- ================================================================ -->
     <goal name="hotdeploy">
       <echo message="Hot Deploying ${portlet.app.name} to ${deploy.war.dir}/jetspeed/WEB-INF/apps/${portlet.app.name}"/>
  -    <copy todir="${deploy.war.dir}/jetspeed/WEB-INF/apps/${portlet.app.name}/WEB-INF/classes">
  +    <copy todir="${deploy.war.dir}/${portlet.app.name}/WEB-INF/classes">
           <fileset dir="${maven.build.dir}/classes">
           </fileset>
       </copy>       
  -    <copy todir="${deploy.war.dir}/jetspeed/WEB-INF/apps/${portlet.app.name}/">
  +    <copy todir="${deploy.war.dir}/${portlet.app.name}/">
         <fileset dir="${webapp.dir}">
         </fileset>
       </copy>
  
  
  
  1.3       +6 -2      jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/apps/pam/PortletApplicationBrowser.java
  
  Index: PortletApplicationBrowser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/apps/pam/PortletApplicationBrowser.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PortletApplicationBrowser.java	14 Jan 2004 03:58:50 -0000	1.2
  +++ PortletApplicationBrowser.java	19 Jan 2004 23:40:25 -0000	1.3
  @@ -113,10 +113,14 @@
           response.setContentType("text/html");
           
           PortletURL url = response.createRenderURL();
  +        PortletURL actionUrl = response.createActionURL();
  +
           // url.addParameter("test", "value");
           
           response.getWriter().println("<br/><b>Init Param 'Template' = " + this.getInitParameter("template")
+  "</b>");
  -        response.getWriter().println("<br/><b>Render URL = " + url +  "</b>");
  +        response.getWriter().println("<br/><b>Render URL = <a href='" +
url +  "'>" + url + "</a></b>");
  +        response.getWriter().println("<br/><b>Action URL = <a href='" +
actionUrl +  "'>" + actionUrl + "</a></b>");
  +        
           response.getWriter().println("<br/><b>Request dispatching now</b>");
           
           PortletRequestDispatcher rd = context.getRequestDispatcher("/hello.jsp");
  
  
  
  1.3       +6 -1      jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/util/JetspeedObjectID.java
  
  Index: JetspeedObjectID.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/util/JetspeedObjectID.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JetspeedObjectID.java	6 Aug 2003 19:47:29 -0000	1.2
  +++ JetspeedObjectID.java	19 Jan 2004 23:40:25 -0000	1.3
  @@ -141,6 +141,11 @@
           return new JetspeedObjectID(_id, idStr);
       }
   
  +    /**
  +     * @param portletDefinition
  +     * @param instanceName
  +     * @return
  +     */
       public static JetspeedObjectID createPortletEntityId(PortletDefinition portletDefinition,
String instanceName)
       {
           return createFromString(portletDefinition.getName() + ":" + portletDefinition.getId().toString()
+ ":" + instanceName);
  
  
  
  1.13      +3 -3      jakarta-jetspeed-2/cps/test/rewriter/test-001-output.html
  
  Index: test-001-output.html
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/cps/test/rewriter/test-001-output.html,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- test-001-output.html	14 Jan 2004 03:58:50 -0000	1.12
  +++ test-001-output.html	19 Jan 2004 23:40:25 -0000	1.13
  @@ -1,8 +1,8 @@
   <p>
   This is a test</p>
  -<a href="http://www.bluesunrise.com/suffix" name="1" target="_BLANK">keep this</a>
  - <a href="http://www.rewriter.com/stuff/junk/stuffedjunk.html/suffix" name="2" target="_BLANK">junk</a>
  - <a href="http://www.rewriter.com/stuff/junk/stuffedjunk.html/suffix" name="3" target="_BLANK">junk2</a>
  +<a target="_BLANK" href="http://www.bluesunrise.com/suffix" name="1">keep this</a>
  + <a target="_BLANK" href="http://www.rewriter.com/stuff/junk/stuffedjunk.html/suffix"
name="2">junk</a>
  + <a target="_BLANK" href="http://www.rewriter.com/stuff/junk/stuffedjunk.html/suffix"
name="3">junk2</a>
    <a href="javascript:whatever()" name="4">script</a>
    <a href="mailto:david@bluesunrise.com" name="5">script</a>
    <a href="#INTERNAL" name="6">internal</a>
  
  
  

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


Mime
View raw message