You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ri...@apache.org on 2005/06/06 20:05:28 UTC
svn commit: r180352 - in /incubator/beehive/trunk:
netui/src/compiler-core/org/apache/beehive/netui/compiler/
samples/netui-jsf/ samples/netui-jsf/WEB-INF/src/
samples/netui-jsf/jsf/physiciansFlow/ samples/netui-jsf/resources/template/
samples/netui-samples/ samples/netui-samples/WEB-INF/src/
Author: rich
Date: Mon Jun 6 11:05:27 2005
New Revision: 180352
URL: http://svn.apache.org/viewcvs?rev=180352&view=rev
Log:
Merge of revision 179169 from the v1/m1 branch:
- Added READMEs for netui-samples and netui-jsf.
- Updated the "usage" ant tasks for netui-samples and netui-jsf.
Also:
- Removed an unused error key from the Page Flow annotation processor.
- Removed unused JSTL imports in the JSF sample.
tests: build.dist in trunk (WinXP)
BB, run.tests: self (linux)
Added:
incubator/beehive/trunk/samples/netui-jsf/README.txt (props changed)
- copied unchanged from r179169, incubator/beehive/branches/v1/m1/samples/netui-jsf/README.txt
incubator/beehive/trunk/samples/netui-samples/README.txt (props changed)
- copied unchanged from r179169, incubator/beehive/branches/v1/m1/samples/netui-samples/README.txt
Modified:
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/diagnostics.properties
incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/build.xml
incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/confirmMailSent.jsp
incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/search.jsp
incubator/beehive/trunk/samples/netui-jsf/resources/template/template.jsp
incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/build.xml
Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/diagnostics.properties
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/diagnostics.properties?rev=180352&r1=180351&r2=180352&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/diagnostics.properties (original)
+++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/diagnostics.properties Mon Jun 6 11:05:27 2005
@@ -16,7 +16,6 @@
error.attr-dependency-not-found-1 = Attribute "{0}" may only be present when attribute "{1}" is present.
error.attr-dependency-not-found-2 = Attribute "{0}" may only be present when attribute "{1}" or "{2}" is present.
error.unresolved-exception-handler = No exception handler method named "{0}" could be found.
-error.web-inf-not-found = The web application root directory could not be found for "{0}".
error.invalid-parent-directory = Could not create parent directory "{0}".
error.struts-config-not-writable = Cannot write to "{0}".
error.does-not-extend-base = This class must derive from {0}.
Copied: incubator/beehive/trunk/samples/netui-jsf/README.txt (from r179169, incubator/beehive/branches/v1/m1/samples/netui-jsf/README.txt)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-jsf/README.txt?p2=incubator/beehive/trunk/samples/netui-jsf/README.txt&p1=incubator/beehive/branches/v1/m1/samples/netui-jsf/README.txt&r1=179169&r2=180352&rev=180352&view=diff
==============================================================================
(empty)
Propchange: incubator/beehive/trunk/samples/netui-jsf/README.txt
------------------------------------------------------------------------------
svn:eol-style = CRLF
Propchange: incubator/beehive/trunk/samples/netui-jsf/README.txt
------------------------------------------------------------------------------
svn:eolstyle = dos
Modified: incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/build.xml?rev=180352&r1=180351&r2=180352&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/build.xml (original)
+++ incubator/beehive/trunk/samples/netui-jsf/WEB-INF/src/build.xml Mon Jun 6 11:05:27 2005
@@ -139,10 +139,11 @@
<echo>
Welcome to the Beehive netui-jsf webapp!
- ant deploy-beehive -- this deploys the Beehive webapp runtime
- ant build-myfaces -- this builds the netui-jsf webapp against MyFaces (v1.0.9 or later)
- ant build-jsf-ri -- this builds the netui-jsf webapp against the JSF Reference Implementation (v1.1_01)
+ ant deploy-beehive -- deploys the Beehive webapp runtime
+ ant build-myfaces -- builds the netui-jsf webapp against MyFaces (v1.0.9 or later)
+ ant build-jsf-ri -- builds the netui-jsf webapp against the JSF Reference Implementation (v1.1.01)
ant war -- creates a .war archive to deploy; build-myfaces or build-jsf-ri must be called first
+ ant clean -- cleans the netui-jsf webapp
</echo>
<java fork="no" classname="org.apache.tools.ant.Main">
Modified: incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/confirmMailSent.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/confirmMailSent.jsp?rev=180352&r1=180351&r2=180352&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/confirmMailSent.jsp (original)
+++ incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/confirmMailSent.jsp Mon Jun 6 11:05:27 2005
@@ -18,7 +18,6 @@
<%@ page language="java" contentType="text/html;charset=UTF-8"%>
<%@ taglib prefix="f" uri="http://java.sun.com/jsf/core"%>
<%@ taglib prefix="h" uri="http://java.sun.com/jsf/html"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<netui-data:declarePageInput name="mailMessage" type="String" />
<netui-data:declarePageInput name="firstName" type="String" />
Modified: incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/search.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/search.jsp?rev=180352&r1=180351&r2=180352&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/search.jsp (original)
+++ incubator/beehive/trunk/samples/netui-jsf/jsf/physiciansFlow/search.jsp Mon Jun 6 11:05:27 2005
@@ -18,7 +18,7 @@
<%@ page language="java" contentType="text/html;charset=UTF-8"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+
<html>
<head>
<title>Physician Search</title>
Modified: incubator/beehive/trunk/samples/netui-jsf/resources/template/template.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-jsf/resources/template/template.jsp?rev=180352&r1=180351&r2=180352&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-jsf/resources/template/template.jsp (original)
+++ incubator/beehive/trunk/samples/netui-jsf/resources/template/template.jsp Mon Jun 6 11:05:27 2005
@@ -19,8 +19,6 @@
<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
-<%@ taglib prefix="beehive-petstore" tagdir="/WEB-INF/tags/beehive/petstore" %>
<netui-data:declareBundle bundlePath="org.apache.beehive.samples.netui.resources.site" name="site"/>
Copied: incubator/beehive/trunk/samples/netui-samples/README.txt (from r179169, incubator/beehive/branches/v1/m1/samples/netui-samples/README.txt)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/README.txt?p2=incubator/beehive/trunk/samples/netui-samples/README.txt&p1=incubator/beehive/branches/v1/m1/samples/netui-samples/README.txt&r1=179169&r2=180352&rev=180352&view=diff
==============================================================================
(empty)
Propchange: incubator/beehive/trunk/samples/netui-samples/README.txt
------------------------------------------------------------------------------
svn:eol-style = CRLF
Modified: incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/build.xml?rev=180352&r1=180351&r2=180352&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/build.xml (original)
+++ incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/build.xml Mon Jun 6 11:05:27 2005
@@ -91,7 +91,7 @@
<delete dir="${webapp.dir}/WEB-INF/.pageflow-struts-generated"/>
</target>
- <target name="war" description="Build a compressed WAR file that can be deployed to an application container">
+ <target name="war" depends="build" description="Build a compressed WAR file that can be deployed to an application container">
<property name="archive.dir" value="${webapp.dir}/.."/>
<!-- this does *not* exclude source from the archive -->
@@ -108,9 +108,10 @@
Welcome to the Beehive netui-samples webapp!
To run the webapp, two steps need to occur:
-ant deploy-beehive -- this deploys the Beehive webapp runtime
-ant build -- this builds the netui-samples webapp
+ant deploy-beehive -- deploys the Beehive webapp runtime
+ant build -- builds the netui-samples webapp
ant war -- creates a .war archive to deploy
+ant clean -- cleans the netui-samples webapp
</echo>
</target>