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 Tue, 07 Oct 2003 18:54:36 GMT
taylor      2003/10/07 11:54:36

  Modified:    .        .classpath .project maven.xml
               applications/demo project.properties project.xml
               applications/demo/src/webapp/WEB-INF hello.jsp portlet.tld
               cps/test/rewriter test-001-output.html
  Log:
  - updated references to new Pluto jar in demo ap
  - updated latest tld
  - changed portlet:encode tag to portlet:namespace
  
  Revision  Changes    Path
  1.5       +1 -2      jakarta-jetspeed-2/.classpath
  
  Index: .classpath
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/.classpath,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- .classpath	14 Aug 2003 00:17:33 -0000	1.4
  +++ .classpath	7 Oct 2003 18:54:36 -0000	1.5
  @@ -34,9 +34,8 @@
       <classpathentry kind="var" path="MAVEN_REPO/mx4j/jars/mx4j-tools-1.1.1.jar"/>
       <classpathentry kind="var" path="MAVEN_REPO/commons-modeler/jars/commons-modeler-1.1M1.jar"/>
       <classpathentry kind="var" path="MAVEN_REPO/ojb/jars/ojb-1.0.rc3-PATCHED.jar"/>
  -    <classpathentry kind="var" path="MAVEN_REPO/pluto-container/jars/pluto-0.46.jar"/>
       <classpathentry kind="var" path="MAVEN_REPO/xerces/jars/xerces-2.3.0.jar"/>
       <classpathentry kind="var" path="MAVEN_REPO/xml-apis/jars/xml-apis-2.0.2.jar"/>
  -    <classpathentry kind="src" path="/pluto"/>
  +    <classpathentry kind="src" path="/jakarta-pluto"/>
       <classpathentry kind="output" path="bin"/>
   </classpath>
  
  
  
  1.4       +1 -1      jakarta-jetspeed-2/.project
  
  Index: .project
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/.project,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- .project	14 Aug 2003 00:17:33 -0000	1.3
  +++ .project	7 Oct 2003 18:54:36 -0000	1.4
  @@ -3,7 +3,7 @@
   	<name>Jetspeed-2</name>
   	<comment></comment>
   	<projects>
  -		<project>pluto</project>
  +		<project>jakarta-pluto</project>
   	</projects>
   	<buildSpec>
   		<buildCommand>
  
  
  
  1.5       +1 -1      jakarta-jetspeed-2/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/maven.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- maven.xml	7 Oct 2003 04:44:52 -0000	1.4
  +++ maven.xml	7 Oct 2003 18:54:36 -0000	1.5
  @@ -100,7 +100,7 @@
     <goal name="catalina:shared"
           description="Copy all jars necessary for common container">
       <copy file="commons/target/jetspeed-commons-2.0-a1-dev.jar" todir="${catalina.shared.lib}"/>
  -    <copy file="portlet-api/target/portlet-api-0.6.6.jar" todir="${catalina.shared.lib}"/>
  +    <copy file="portlet-api/target/portlet-api-0.1-dev-unreleased.jar" todir="${catalina.shared.lib}"/>
     </goal>
   
     <goal name="catalina:base-shared"
  
  
  
  1.2       +2 -2      jakarta-jetspeed-2/applications/demo/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/applications/demo/project.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.properties	28 Jul 2003 23:46:34 -0000	1.1
  +++ project.properties	7 Oct 2003 18:54:36 -0000	1.2
  @@ -9,7 +9,7 @@
   
   maven.checkstyle.properties = ${basedir}/../../checkstyle.properties
   
  -deploy.war.dir=/apache/catalina/webapps
  +deploy.war.dir=/apache/tomcat5/webapps
   portlet.app.name=HW_App
   webapp.dir=${basedir}/src/webapp
   
  
  
  
  1.3       +2 -2      jakarta-jetspeed-2/applications/demo/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/applications/demo/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	8 Aug 2003 20:57:38 -0000	1.2
  +++ project.xml	7 Oct 2003 18:54:36 -0000	1.3
  @@ -13,7 +13,7 @@
     <dependencies>
   	 <dependency>
         <id>portlet-api</id>
  -      <version>0.6.6</version>
  +      <version>0.1-dev-unreleased</version>
         <properties>
           <war.bundle.jar>false</war.bundle.jar>
         </properties>
  
  
  
  1.3       +1 -1      jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/hello.jsp
  
  Index: hello.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/hello.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- hello.jsp	8 Aug 2003 21:59:53 -0000	1.2
  +++ hello.jsp	7 Oct 2003 18:54:36 -0000	1.3
  @@ -2,6 +2,6 @@
   <%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
   <portlet:defineObjects/>
   <p>This is a test line</P>
  -<b><portlet:encode name="test@pluto.org"/> </b>
  +<b><portlet:namespace/>test@pluto.org</b>
   <p>Goodbye</p>
   
  
  
  
  1.3       +4 -9      jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/portlet.tld
  
  Index: portlet.tld
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/portlet.tld,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- portlet.tld	7 Aug 2003 19:13:55 -0000	1.2
  +++ portlet.tld	7 Oct 2003 18:54:36 -0000	1.3
  @@ -80,13 +80,8 @@
           </attribute>
       </tag>
       <tag>
  -        <name>encode</name>
  -        <tagclass>org.apache.pluto.tags.EncodeTag</tagclass>
  -        <bodycontent>JSP</bodycontent>
  -        <attribute>
  -            <name>name</name>
  -            <required>true</required>
  -            <rtexprvalue>true</rtexprvalue>
  -        </attribute>
  +        <name>namespace</name>
  +        <tagclass>org.apache.pluto.tags.NamespaceTag</tagclass>
  +        <bodycontent>empty</bodycontent>
       </tag>
  -</taglib>
  \ No newline at end of file
  +</taglib>
  
  
  
  1.5       +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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- test-001-output.html	7 Oct 2003 04:44:52 -0000	1.4
  +++ test-001-output.html	7 Oct 2003 18:54:36 -0000	1.5
  @@ -1,8 +1,8 @@
   <p>
   This is a test</p>
  -<a name="1" href="http://www.bluesunrise.com/suffix" target="_BLANK">keep this</a>
  - <a name="2" href="http://www.rewriter.com/stuff/junk/stuffedjunk.html/suffix" target="_BLANK">junk</a>
  - <a name="3" href="http://www.rewriter.com/stuff/junk/stuffedjunk.html/suffix" target="_BLANK">junk2</a>
  +<a target="_BLANK" name="1" href="http://www.bluesunrise.com/suffix">keep this</a>
  + <a target="_BLANK" name="2" href="http://www.rewriter.com/stuff/junk/stuffedjunk.html/suffix">junk</a>
  + <a target="_BLANK" name="3" href="http://www.rewriter.com/stuff/junk/stuffedjunk.html/suffix">junk2</a>
    <a name="4" href="javascript:whatever()">script</a>
    <a name="5" href="mailto:david@bluesunrise.com">script</a>
    <a name="6" href="#INTERNAL">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