You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2004/09/25 18:17:19 UTC
svn commit: rev 47202 - in incubator/beehive/trunk/netui: ant src/webapp-template/default test/webapps/drt/coreWeb
Author: ekoneil
Date: Sat Sep 25 09:17:17 2004
New Revision: 47202
Added:
incubator/beehive/trunk/netui/src/webapp-template/default/error-header.jpg (contents, props changed)
Modified:
incubator/beehive/trunk/netui/ant/common.properties
incubator/beehive/trunk/netui/ant/webappTemplate.xml
incubator/beehive/trunk/netui/src/webapp-template/default/error.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/error.jsp
Log:
Various build / webapp template changes.
- fix the broken image link for error-header.jpg
- fix the paths to Beehive resources in the webapp to resources/beehive/version1
- cleanup the webappTemplate Ant to whack commented-out sections and copy error-header.jpg
- update the error.jsp in the NetUI DRTs to use the new version of the error.jsp
BB: self
DRT: NetUI pass
WSM pass
Controls pass
BVT: NetUI pass
Modified: incubator/beehive/trunk/netui/ant/common.properties
==============================================================================
--- incubator/beehive/trunk/netui/ant/common.properties (original)
+++ incubator/beehive/trunk/netui/ant/common.properties Sat Sep 25 09:17:17 2004
@@ -171,7 +171,6 @@
deployed.commons-el.jar=${webappTemplate.webinf.lib}/commons-el.jar
deployed.netuiconfig.xml=${webappTemplate.webinf}/netui-config.xml
-deployed.javascript.dir=${webapp.dist.dir}/resources/javascript
netui-tomcat-common.4x.jar=${build.lib.dir}/${netui-tomcat-common.4x.jar.name}
netui-tomcat-server.4x.jar=${build.lib.dir}/${netui-tomcat-server.4x.jar.name}
Modified: incubator/beehive/trunk/netui/ant/webappTemplate.xml
==============================================================================
--- incubator/beehive/trunk/netui/ant/webappTemplate.xml (original)
+++ incubator/beehive/trunk/netui/ant/webappTemplate.xml Sat Sep 25 09:17:17 2004
@@ -9,6 +9,8 @@
<property name="template.root.dir" location="${src.dir}/webapp-template/"/>
+ <property name="resource.dir.name" value="resources/beehive/version1"/>
+
<target name="all.templates">
<echo>webapp.dist.dir: ${webapp.dist.dir}</echo>
<antcall target="generic"/>
@@ -27,9 +29,9 @@
<target name="_deploy.common">
<!-- define the javascript directory -->
- <property name="resource.dir" value="${webapp.dir}/resources"/>
+ <property name="resource.dir" value="${webapp.dir}/${resource.dir.name}"/>
<property name="javascript.dir" value="${resource.dir}/javascript"/>
- <property name="tag.javascript.files" value="${src.dir}/javascript/tagshtml"/>
+ <property name="src.javascript" value="${src.dir}/javascript/tagshtml"/>
<property name="globalapp.source.dir" value="${webinf.dir}/src/global/"/>
<mkdir dir="${webapp.dist.dir}"/>
@@ -106,24 +108,10 @@
<copy file="${template.root.dir}/default/Controller.jpf" todir="${webapp.dir}"/>
<copy file="${template.root.dir}/default/index.jsp" todir="${webapp.dir}"/>
<copy file="${template.root.dir}/default/error.jsp" todir="${webapp.dir}"/>
-
- <!-- copy the JSF implementation to directory -->
-<!--
- <copy todir="${webinf.lib}" file="${jsf.dir}/jsf-api.jar"/>
- <copy todir="${webinf.lib}" file="${jsf.dir}/jsf-impl.jar"/>
- <copy todir="${webinf.lib}" file="${jsf.dir}/jstl.jar"/>
- <copy todir="${webinf.lib}" file="${jsf.dir}/standard.jar"/>
- <copy todir="${webinf.dir}" file="${jsf.dir}/web.xml.faces"/>
- <copy todir="${webinf.dir}" file="${jsf.dir}/faces-config.xml"/>
- <copy todir="${webinf.dir}" file="${jsf.dir}/html_basic.tld"/>
- <copy todir="${webinf.dir}" file="${jsf.dir}/html_basic.tldx"/>
- <copy todir="${webinf.dir}" file="${jsf.dir}/jsf_core.tld"/>
- <copy todir="${webinf.dir}" file="${jsf.dir}/jsf_core.tldx"/>
- <copy todir="${webinf.dir}" file="${jsf.dir}/c.tld"/>
--->
+ <copy file="${template.root.dir}/default/error-header.jpg" todir="${webapp.dir}/${resource.dir.name}/images"/>
<!-- copy the javascript files to the javavscript directory -->
- <copy file="${tag.javascript.files}/netui-tree.js" todir="${javascript.dir}"/>
+ <copy file="${src.javascript}/netui-tree.js" todir="${javascript.dir}"/>
<!-- copy the NetUI compiler -->
<mkdir dir="${compiler.dist.dir}"/>
@@ -160,10 +148,11 @@
<include name="WEB-INF/lib/${pageflow.jar.name}"/>
<include name="WEB-INF/lib/${scoping.jar.name}"/>
+ <include name="WEB-INF/lib/commons-el.jar"/>
+
<!-- JSTL support JARs -->
<include name="WEB-INF/lib/jstl.jar"/>
<include name="WEB-INF/lib/standard.jar"/>
- <include name="WEB-INF/lib/commons-el.jar"/>
</patternset>
<patternset id="struts.runtime">
@@ -185,18 +174,7 @@
<mkdir dir="${webapp.dir}/WEB-INF"/>
<mkdir dir="${webapp.dir}/WEB-INF/lib"/>
<mkdir dir="${webapp.dir}/WEB-INF/src"/>
- <mkdir dir="${webapp.dir}/resources"/>
- <mkdir dir="${webapp.dir}/resources/javascript"/>
-
-<!-- build support for optionally deploying JSF into a webapp is coming ... -->
-<!--
- <echo>Deploy JSF to webapp rooted at: ${webapp.dir}</echo>
- <copy todir="${webapp.dir}">
- <fileset dir="${webapp.dist.dir}">
- <patternset refid="jsf.runtime"/>
- </fileset>
- </copy>
--->
+ <mkdir dir="${webapp.dir}/${resource.dir.name}"/>
<antcall target="deploy-struts">
<param name="webapp.dir" value="${webapp.dir}"/>
@@ -211,12 +189,15 @@
<copy todir="${webapp.dir}/WEB-INF/" file="${deployed.netuiconfig.xml}"/>
- <copy todir="${webapp.dir}/resources/javascript" overwrite="true">
- <fileset dir="${deployed.javascript.dir}">
- <include name="**/*.js"/>
+ <!-- Beehive/NetUI assumes ownership of the resources/beehive/version1 directory -->
+ <copy todir="${webapp.dir}/${resource.dir.name}" overwrite="true">
+ <fileset dir="${webapp.dist.dir}/${resource.dir.name}">
+ <include name="**/*"/>
</fileset>
</copy>
+ <antcall target="deploy-grid-resources"/>
+
<!--
@todo: it's as yet undecided how these should get into Tomcat classpath; for now,
they are copied directly into WEB-INF/lib of the webapp template.
@@ -225,9 +206,6 @@
<copy todir="${webapp.dir}/WEB-INF/lib" file="${controls.jar}"/>
<copy todir="${webapp.dir}/WEB-INF/lib" file="${jsr173.jar}"/>
<copy todir="${webapp.dir}/WEB-INF/lib" file="${xbean.jar}"/>
-
- <!-- @todo: deploy the grid resources here? -->
- <antcall target="deploy-grid-resources"/>
</target>
<target name="deploy-struts" description="Deploy only the Struts runtime to a webapp root directory.">
@@ -240,26 +218,12 @@
</target>
<target name="deploy-grid-resources">
-<!--
- <mkdir dir="${webapp.dir}/resources"/>
- <mkdir dir="${webapp.dir}/resources/grid"/>
-
- <copy todir="${webapp.dir}/resources/grid">
- <fileset dir="${webapp.dist.dir}">
- <patternset refid="v1grid.resources"/>
- </fileset>
- </copy>
--->
+ <!-- This is an empty call until the grid is further wired up -->
</target>
+
<target name="clean-grid-resources">
-<!--
- <delete quiet="true">
- <fileset dir="${webapp.dir}">
- <patternset refid="v1grid.resources"/>
- </fileset>
- </delete>
--->
+ <!-- This is an empty call until the grid is further wired up -->
</target>
<target name="undeploy.netui.runtime" description="Clean the NetUI runtime from a webapp root directory.">
@@ -287,10 +251,28 @@
</fileset>
</delete>
+ <delete dir="${resource.dir.name}" quiet="true"/>
+
<!-- @todo: need to whack only the netui / struts / JSF filesets -->
<delete quiet="true">
<fileset dir="${webinf.dir}/lib">
+ <patternset refid="struts.runtime"/>
+ <patternset refid="netui.runtime"/>
+ <patternset refid="jsf.runtime"/>
+ </fileset>
+<!--
+ <fileset dir="${webinf.dir}/lib">
<include name="**/*.jar"/>
+ </fileset>
+-->
+ </delete>
+
+ <delete failOnError="false">
+ <fileset dir="${webapp.dir}/WEB-INF/lib">
+ <include name="apache-xbean.jar"/>
+ <include name="log4j-1.2.8.jar"/>
+ <include name="controls.jar"/>
+ <include name="jsr173_1.0_api.jar"/>
</fileset>
</delete>
Added: incubator/beehive/trunk/netui/src/webapp-template/default/error-header.jpg
==============================================================================
Binary file. No diff available.
Modified: incubator/beehive/trunk/netui/src/webapp-template/default/error.jsp
==============================================================================
--- incubator/beehive/trunk/netui/src/webapp-template/default/error.jsp (original)
+++ incubator/beehive/trunk/netui/src/webapp-template/default/error.jsp Sat Sep 25 09:17:17 2004
@@ -6,7 +6,7 @@
<title>NetUI Error</title>
<style>
table {
- border: solid 1pt #2f73c9;
+ border: solid 1pt #90180F;
background-color: #ffffff;
}
body {
@@ -15,28 +15,29 @@
font-family: Arial, Helvetica, sans-serif;
font-size: 10pt;
}
- .caption {font-weight: strong;
- font-size: 14pt;
+ .caption {
+ font-weight: bold;
+ font-size: 20pt;
text-align: left;
width: 500px
}
th {vertical-align: top;
text-align: right;
font-size: 12pt;
- color: #2f73c9;
+ color: #90180F;
width: 100px;
}
td {
text-align: left;
}
hr {
- color: #2f73c9;
+ color: #90180F;
}
.posTitle {
position: relative;
- color: #2f73c9;
- left: -130pt;
- top: -16pt;
+ color: #6C0C06;
+ left: -160pt;
+ top: -12pt;
}
.pfErrorLineOne {
color: red;
@@ -44,14 +45,14 @@
font-style: italic;
}
img {
- border: solid 2pt #2f73c9;
+ border: solid 2pt #90180F;
}
</style>
<netui:base/>
</head>
<netui:body>
<div class="caption">
- <netui:image src="${pageContext.request.contextPath}/resources/images/error-header.jpg" width="338" height="96" alt="Page Flow Error"/>
+ <netui:image src="${pageContext.request.contextPath}/resources/beehive/version1/images/error-header.jpg" width="338" height="96" alt="Page Flow Error"/>
<span class="posTitle">NetUI Error</span>
</div>
<table border="0" cellspacing='0' cellpadding='4'>
Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/error.jsp
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/error.jsp (original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/error.jsp Sat Sep 25 09:17:17 2004
@@ -6,7 +6,7 @@
<title>NetUI Error</title>
<style>
table {
- border: solid 1pt #2f73c9;
+ border: solid 1pt #90180F;
background-color: #ffffff;
}
body {
@@ -15,28 +15,29 @@
font-family: Arial, Helvetica, sans-serif;
font-size: 10pt;
}
- .caption {font-weight: strong;
- font-size: 14pt;
+ .caption {
+ font-weight: bold;
+ font-size: 20pt;
text-align: left;
width: 500px
}
th {vertical-align: top;
text-align: right;
font-size: 12pt;
- color: #2f73c9;
+ color: #90180F;
width: 100px;
}
td {
text-align: left;
}
hr {
- color: #2f73c9;
+ color: #90180F;
}
.posTitle {
position: relative;
- color: #2f73c9;
- left: -130pt;
- top: -16pt;
+ color: #6C0C06;
+ left: -160pt;
+ top: -12pt;
}
.pfErrorLineOne {
color: red;
@@ -44,14 +45,14 @@
font-style: italic;
}
img {
- border: solid 2pt #2f73c9;
+ border: solid 2pt #90180F;
}
</style>
<netui:base/>
</head>
<netui:body>
<div class="caption">
- <netui:image src="${pageContext.request.contextPath}/resources/images/error-header.jpg" width="338" height="96" alt="Page Flow Error"/>
+ <netui:image src="${pageContext.request.contextPath}/resources/beehive/version1/images/error-header.jpg" width="338" height="96" alt="Page Flow Error"/>
<span class="posTitle">NetUI Error</span>
</div>
<table border="0" cellspacing='0' cellpadding='4'>