tapestry-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hls...@apache.org
Subject cvs commit: jakarta-tapestry/web new.html
Date Sun, 22 Jun 2003 02:56:14 GMT
hlship      2003/06/21 19:56:14

  Modified:    examples/Workbench/context/WEB-INF web.xml
               .        project.xml maven.xml
               framework project.xml build.xml
               contrib  project.xml
               web      new.html
  Added:       framework/META-INF taglib.tld
               framework maven.xml
  Removed:     examples/Workbench/context/WEB-INF tapestry_1_0.tld
  Log:
  Build out the Workbench.war as a standalone WAR (packaging all the libraries together).
  Move the Tapestry taglib tld to the framework proper.
  
  Revision  Changes    Path
  1.1                  jakarta-tapestry/framework/META-INF/taglib.tld
  
  Index: taglib.tld
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <!-- $Id: taglib.tld,v 1.1 2003/06/22 02:56:14 hlship Exp $ -->
  <!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
  	"http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_2.dtd">
  <taglib>
  	<tlib-version>1.0</tlib-version>
  	<jsp-version>1.2</jsp-version>
  	<short-name>tapestry</short-name>
  	<uri>http://jakarta.apache.org/tapestry/tld/tapestry_1_0.tld</uri>
  	<display-name>Tapestry</display-name>
  	<description>Tapestry JSP taglibrary for providing rudimentary access to a Tapestry
application.</description>
  	<tag>
  		<name>page</name>
  		<tag-class>org.apache.tapestry.jsp.PageTag</tag-class>
  		<body-content>JSP</body-content>
  		<display-name>Page</display-name>
  		<description>Creates a link to a named page within a Tapestry
  			application.</description>
  		<attribute>
  			<name>servlet</name>
  			<required>no</required>
  			<rtexprvalue>yes</rtexprvalue>
  			<type>java.lang.String</type>
  			<description>The relative path to the servlet for the application.  The default
value is "/app".</description>
  		</attribute>
  		<attribute>
  			<name>page</name>
  			<required>yes</required>
  			<rtexprvalue>yes</rtexprvalue>
  			<type>java.lang.String</type>
  			<description>The name of the page within the application.</description>
  		</attribute>
  		<attribute>
  			<name>styleClass</name>
  			<required>no</required>
  			<rtexprvalue>yes</rtexprvalue>
  			<type>java.lang.String</type>
  			<description>The CSS style class for the rendered tag.</description>
  		</attribute>
  	</tag>
  	<tag>
  		<name>page-url</name>
  		<tag-class>org.apache.tapestry.jsp.PageURLTag</tag-class>
  		<body-content>empty</body-content>
  		<display-name>Page URL</display-name>
  		<description>Inserts a URL to a named page within a Tapestry
  			application.</description>
  		<attribute>
  			<name>servlet</name>
  			<required>no</required>
  			<rtexprvalue>yes</rtexprvalue>
  			<type>java.lang.String</type>
  			<description>The relative path to the servlet for the application.  The default
value is "/app".</description>
  		</attribute>
  		<attribute>
  			<name>page</name>
  			<required>yes</required>
  			<rtexprvalue>yes</rtexprvalue>
  			<type>java.lang.String</type>
  			<description>The name of the page within the application.</description>
  		</attribute>
  	</tag>
  	<tag>
  		<name>external</name>
  		<tag-class>org.apache.tapestry.jsp.ExternalTag</tag-class>
  		<body-content>JSP</body-content>
  		<display-name>External</display-name>
  		<description>Creates a link, with parameters, to an external page within a Tapestry
application.</description>
  		<attribute>
  			<name>servlet</name>
  			<required>no</required>
  			<rtexprvalue>yes</rtexprvalue>
  			<type>java.lang.String</type>
  			<description>The relative path to the servlet for the application.  The default
value is "/app".</description>
  		</attribute>
  		<attribute>
  			<name>page</name>
  			<required>yes</required>
  			<rtexprvalue>yes</rtexprvalue>
  			<type>java.lang.String</type>
  			<description>The name of the page within the application, which must be an external
page.</description>
  		</attribute>
  		<attribute>
  			<name>styleClass</name>
  			<required>no</required>
  			<rtexprvalue>yes</rtexprvalue>
  			<type>java.lang.String</type>
  			<description>The CSS style class for the rendered tag.</description>
  		</attribute>
  		<attribute>
  			<name>parameters</name>
  			<required>no</required>
  			<rtexprvalue>yes</rtexprvalue>
  			<type>java.lang.String</type>
  			<description>Either a single string to pass as a parameter, or (if prefixed with
"ognl:") an OGNL expression evaluated against the pageContext.</description>
  		</attribute>
  	</tag>
  	<tag>
  		<name>external-url</name>
  		<tag-class>org.apache.tapestry.jsp.ExternalURLTag</tag-class>
  		<body-content>empty</body-content>
  		<display-name>External URL</display-name>
  		<description>Inserts a URL to an external page within a Tapestry application, including
service parameters.</description>
  		<attribute>
  			<name>servlet</name>
  			<required>no</required>
  			<rtexprvalue>yes</rtexprvalue>
  			<type>java.lang.String</type>
  			<description>The relative path to the servlet for the application.  The default
value is "/app".</description>
  		</attribute>
  		<attribute>
  			<name>page</name>
  			<required>yes</required>
  			<rtexprvalue>yes</rtexprvalue>
  			<type>java.lang.String</type>
  			<description>The name of the page within the application, which must be an external
page.</description>
  		</attribute>
  		<attribute>
  			<name>parameters</name>
  			<required>no</required>
  			<rtexprvalue>yes</rtexprvalue>
  			<type>java.lang.String</type>
  			<description>Either a single string to pass as a parameter, or (if prefixed with
"ognl:") an OGNL expression evaluated against the pageContext.</description>
  		</attribute>
  	</tag>
  </taglib>
  
  
  
  1.5       +2 -2      jakarta-tapestry/examples/Workbench/context/WEB-INF/web.xml
  
  Index: web.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/examples/Workbench/context/WEB-INF/web.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- web.xml	4 May 2003 20:36:17 -0000	1.4
  +++ web.xml	22 Jun 2003 02:56:14 -0000	1.5
  @@ -32,6 +32,6 @@
     
     <taglib>
     	<taglib-uri>http://jakarta.apache.org/tapestry/tld/tapestry_1_0.tld</taglib-uri>
  -  	<taglib-location>tapestry_1_0.tld</taglib-location>
  +  	<taglib-location>/WEB-INF/lib/tapestry-3.0-beta-2.jar</taglib-location>
     </taglib>
   </web-app>
  
  
  
  1.5       +9 -61     jakarta-tapestry/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	19 Jun 2003 10:58:52 -0000	1.4
  +++ project.xml	22 Jun 2003 02:56:14 -0000	1.5
  @@ -4,7 +4,7 @@
     <name>Tapestry Web Application Framework</name>
     <id>tapestry</id>
     <groupId>jakarta-tapestry</groupId>
  -  <currentVersion>3.0-beta-1a</currentVersion>
  +  <currentVersion>3.0-beta-1b</currentVersion>
     <organization>
       <name>Apache Software Foundation</name>
       <url>http://jakarta.apache.org/</url>
  @@ -178,64 +178,12 @@
       
     </dependencies>
   
  -  <build>
  -
  -    <nagEmailAddress>
  -      tapestry-dev@jakarta.apache.org
  -    </nagEmailAddress>
  -
  -    <sourceDirectory>src</sourceDirectory>
  -
  -    <unitTestSourceDirectory>test/src</unitTestSourceDirectory>
  -    
  -    <!-- Unit test cases -->
  -    <unitTest>
  -      <includes>
  -        <include>**/Test*</include>
  -      </includes>
  -      <excludes>
  -        <exclude>**/Testing*</exclude>
  -      </excludes>
  -      <resources>
  -        <resource>
  -          <directory>src</directory>
  -          <includes>
  -            <include>**/*.properties</include>
  -            <include>**/*.script</include>
  -          </includes>
  -        </resource>
  -        <resource>
  -          <directory>test/src</directory>
  -          <includes>
  -            <include>**/*.script</include>
  -            <include>**/*.properties</include>
  -            <include>**/*.html</include>
  -            <include>**/*.png</include>
  -          </includes>
  -        </resource>
  -        <resource>
  -          <directory>test</directory>
  -          <includes>
  -            <include>context**/*</include>
  -            <include>mock-scripts/*</include>
  -          </includes>
  -        </resource>
  -      </resources>
  -    </unitTest>
  -              
  -    <!-- J A R  R E S O U R C E S -->
  -    <!-- Resources that are packaged up inside the JAR file -->
  -    <resources>
  -      <includes>
  -        <include>*.xsd</include>
  -        <include>**/config/log4j.properties</include>
  -      </includes>
  -    </resources>
  -
  -    <!-- Integration unit test cases -->
  -    <integrationUnitTest/>
  -
  -    <jars>
  -    </jars>
  -  </build>
  +  <reports>
  +    <report>maven-changelog-plugin</report>
  +    <report>maven-tasklist-plugin</report>
  +		<report>maven-license-plugin</report>
  +		<report>maven-developer-activity-plugin</report>
  +		<report>maven-file-activity-plugin</report>
  +   </reports>
  +   
   </project>
  
  
  
  1.2       +30 -55    jakarta-tapestry/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/maven.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- maven.xml	30 May 2003 19:43:21 -0000	1.1
  +++ maven.xml	22 Jun 2003 02:56:14 -0000	1.2
  @@ -1,56 +1,31 @@
  -<project
  -  default="build-all"
  -  xmlns:maven="jelly:maven">
  -
  -  <goal name="build">
  -    <maven:reactor basedir="${basedir}"
  -               includes="*/project.xml"
  -	       excludes="examples/*"
  -               goals="jar:install"
  -               banner="Building"
  -               ignoreFailures="true"/>
  -  </goal>
  -
  -  <goal name="build-examples">
  -    <maven:reactor basedir="${basedir}/examples"
  -               includes="*/project.xml"
  -               goals="jar:install"
  -               banner="Building Examples"
  -               ignoreFailures="false"/>
  -  </goal>
  -
  -  <goal name="build-all">
  -    <attainGoal name="build"/>
  -    <attainGoal name="build-examples"/>
  -  </goal>
  -
  -  <goal name="docs">
  -    <maven:reactor basedir="${basedir}"
  -               includes="*/project.xml"
  -               goals="site:generate"
  -               banner="Generating Site"
  -               ignoreFailures="false"/>
  -  </goal>
  -
  -  <goal name="clean">
  -    <maven:reactor basedir="${basedir}"
  -               includes="*/project.xml"
  -               goals="clean:clean"
  -               banner="Cleaning"
  -               ignoreFailures="false"/>
  -  </goal>
  -
  -  <goal name="clean-examples">
  -    <maven:reactor basedir="${basedir}/examples"
  -               includes="*/project.xml"
  -               goals="clean:clean"
  -               banner="Cleaning"
  -               ignoreFailures="false"/>
  -  </goal>
  -
  -  <goal name="clean-all">
  -    <attainGoal name="clean"/>
  -    <attainGoal name="clean-examples"/>
  -  </goal>
  -
  +<project default="build-all" xmlns:maven="jelly:maven">
  +	<goal name="build">
  +		<maven:reactor basedir="${basedir}" includes="*/project.xml"
  +			excludes="examples/*" goals="jar:install" banner="Building"
  +			ignoreFailures="true"/>
  +	</goal>
  +	<goal name="build-examples">
  +		<maven:reactor basedir="${basedir}/examples" includes="*/project.xml"
  +			goals="jar:install" banner="Building Examples" ignoreFailures="false"/>
  +	</goal>
  +	<goal name="build-all">
  +		<attainGoal name="build"/>
  +		<attainGoal name="build-examples"/>
  +	</goal>
  +	<preGoal name="site:generate">
  +		<maven:reactor basedir="${basedir}" includes="*/project.xml"
  +			goals="site:generate" banner="Generating Site" ignoreFailures="false"/>
  +	</preGoal>
  +	<goal name="clean">
  +		<maven:reactor basedir="${basedir}" includes="*/project.xml"
  +			goals="clean:clean" banner="Cleaning" ignoreFailures="false"/>
  +	</goal>
  +	<goal name="clean-examples">
  +		<maven:reactor basedir="${basedir}/examples" includes="*/project.xml"
  +			goals="clean:clean" banner="Cleaning" ignoreFailures="false"/>
  +	</goal>
  +	<goal name="clean-all">
  +		<attainGoal name="clean"/>
  +		<attainGoal name="clean-examples"/>
  +	</goal>
   </project>
  
  
  
  1.3       +35 -4     jakarta-tapestry/framework/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/framework/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	19 Jun 2003 10:58:51 -0000	1.2
  +++ project.xml	22 Jun 2003 02:56:14 -0000	1.3
  @@ -1,7 +1,38 @@
   <?xml version="1.0" encoding="ISO-8859-1"?>
  -
  +<!-- $Id$ -->
   <project>
  -  <extend>${basedir}/../project.xml</extend>
  -  <artifactId>tapestry</artifactId>
  -  <name>Tapestry Framework</name>
  +	<extend>${basedir}/../project.xml</extend>
  +	<id>tapestry</id>
  +	<name>Tapestry Framework</name>
  +	<build>
  +		<sourceDirectory>src</sourceDirectory>
  +		<!-- J A R  R E S O U R C E S -->
  +		<!-- Resources that are packaged up inside the JAR file -->
  +		<resources>
  +			<resource>
  +				
  +				<!-- Note: THIS ISN'T WORKING! -->
  +				
  +				<directory>${basedir}/src/java</directory>
  +
  +					<include>**/*.html</include>
  +					<include>**/*.dtd</include>
  +					<include>**/*.script</include>
  +					<include>**/*.jwc</include>
  +					<include>**/*.library</include>
  +					<include>**/*.page</include>
  +					<include>**/*.gif</include>
  +					<include>**/*.css</include>
  +
  +			</resource>
  +		</resources>
  +	</build>
  +	
  +  <reports>
  +    <report>maven-javadoc-plugin</report>
  +    <report>maven-jxr-plugin</report>
  +    <report>maven-junit-report-plugin</report>  
  +    <report>maven-clover-plugin</report>  
  +   </reports>
  +   	
   </project>
  
  
  
  1.25      +3 -9      jakarta-tapestry/framework/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/framework/build.xml,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- build.xml	21 May 2003 23:39:39 -0000	1.24
  +++ build.xml	22 Jun 2003 02:56:14 -0000	1.25
  @@ -39,16 +39,10 @@
   				<exclude name="**/package.html"/>
   			</fileset>
   			
  -			<!-- Yes, this is odd.  Until I figure out how to get the framework TLD visible
  -				 to Jetty while debugging, the best place for the TLD is in the
  -				 Workbench's WEB-INF.  Don't want to duplicate it, so we just
  -				 reach out and grab it, to include in the Tapestry framework.  -->
  -				 
  -			<metainf dir="../examples/Workbench/context/WEB-INF">
  -				<include name="*.tld"/>
  +			<metainf dir="META-INF">
  +				<include name="*"/>
   			</metainf>
   		</jar>
  -
   
   	</target>
   </project>
  
  
  
  1.1                  jakarta-tapestry/framework/maven.xml
  
  Index: maven.xml
  ===================================================================
  <?xml version="1.0"?>
  <!-- $Id: maven.xml,v 1.1 2003/06/22 02:56:14 hlship Exp $ -->
  <project xmlns:j="jelly:core" xmlns:u="jelly:util">
  
  
  </project>
  
  
  
  1.2       +31 -1     jakarta-tapestry/contrib/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/contrib/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	30 May 2003 19:43:22 -0000	1.1
  +++ project.xml	22 Jun 2003 02:56:14 -0000	1.2
  @@ -1,5 +1,5 @@
   <?xml version="1.0" encoding="ISO-8859-1"?>
  -
  +<!-- $Id$ -->
   <project>
     <extend>${basedir}/../project.xml</extend>
     <id>tapestry-contrib</id>
  @@ -19,4 +19,34 @@
       </dependency>
     </dependencies>
   
  +	<build>
  +		<sourceDirectory>src</sourceDirectory>
  +		<!-- J A R  R E S O U R C E S -->
  +		<!-- Resources that are packaged up inside the JAR file -->
  +		<resources>
  +			<resource>
  +				
  +				<!-- Note: THIS ISN'T WORKING! -->
  +				
  +				<directory>${basedir}/src/java</directory>
  +
  +					<include>**/*.html</include>
  +					<include>**/*.dtd</include>
  +					<include>**/*.script</include>
  +					<include>**/*.jwc</include>
  +					<include>**/*.library</include>
  +					<include>**/*.page</include>
  +					<include>**/*.gif</include>
  +					<include>**/*.css</include>
  +
  +			</resource>
  +		</resources>
  +	</build>
  +	
  +  <reports>
  +    <report>maven-javadoc-plugin</report>
  +    <report>maven-jxr-plugin</report>
  +   </reports>
  +   	
   </project>
  +
  
  
  
  1.181     +3 -2      jakarta-tapestry/web/new.html
  
  Index: new.html
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/web/new.html,v
  retrieving revision 1.180
  retrieving revision 1.181
  diff -u -r1.180 -r1.181
  --- new.html	20 Jun 2003 18:00:05 -0000	1.180
  +++ new.html	22 Jun 2003 02:56:14 -0000	1.181
  @@ -14,7 +14,8 @@
   <h3>Release 3.0-beta-2</h3>
   
   <ul>
  -<li>Package the workbench.war standalone (such that it includes all necessary libraries).</li>

  +<li>Package the workbench.war standalone (such that it includes all necessary libraries).</li>
  +<li>Fix a case where the taglib would generate the wrong URL (under Tomcat).</li>

   </ul>
   
   <h4>Non-backwards compatible changes:</h4>
  
  
  

Mime
View raw message