|
|
Author: rich
Date: Mon Jul 11 13:19:20 2005
New Revision: 210202
URL: http://svn.apache.org/viewcvs?rev=210202&view=rev
Log:
Following a thread on beehive-dev... created a "core" module in NetUI, and
moved org.apache.beehive.netui.core.* into it. Also moved code in the
"scoping" module off of direct log4j and onto the Beehive Logger.
tests: bvt in netui (WinXP)
BB: self (linux)
Added:
incubator/beehive/trunk/netui/src/core/
incubator/beehive/trunk/netui/src/core/build.xml (with props)
incubator/beehive/trunk/netui/src/core/org/
incubator/beehive/trunk/netui/src/core/org/apache/
incubator/beehive/trunk/netui/src/core/org/apache/beehive/
incubator/beehive/trunk/netui/src/core/org/apache/beehive/netui/
incubator/beehive/trunk/netui/src/core/org/apache/beehive/netui/core/
- copied from r210201,
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/
incubator/beehive/trunk/netui/src/core/schema/
incubator/beehive/trunk/netui/src/core/schema/url-template-config/
- copied from r210201,
incubator/beehive/trunk/netui/src/util/schema/url-template-config/
Removed:
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/
incubator/beehive/trunk/netui/src/util/schema/url-template-config/
Modified:
incubator/beehive/trunk/netui/ant/build.xml
incubator/beehive/trunk/netui/src/jar-assembly/build.xml
incubator/beehive/trunk/netui/src/pageflow/build.xml
incubator/beehive/trunk/netui/src/scoping/build.xml
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/ScopedServletUtils.java
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/AttributeContainer.java
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedRequestDispatcher.java
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedRequestImpl.java
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedResponseImpl.java
incubator/beehive/trunk/netui/src/tags-databinding/build.xml
incubator/beehive/trunk/netui/src/tags-html/build.xml
incubator/beehive/trunk/netui/src/tags-template/build.xml
Modified: incubator/beehive/trunk/netui/ant/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/ant/build.xml?rev=210202&r1=210201&r2=210202&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/ant/build.xml (original)
+++ incubator/beehive/trunk/netui/ant/build.xml Mon Jul 11 13:19:20 2005
@@ -64,10 +64,11 @@
<property name="struts.dependency.path.ref"
value="struts11.dependency.path"/>
<filelist dir="${src.dir}">
<file name="bootstrap"/>
- <file name="scoping"/>
<file name="tomcat-common"/>
<file name="tomcat-server"/>
<file name="util"/>
+ <file name="scoping"/>
+ <file name="core"/>
<file name="pageflow"/>
<file name="tomcat-webapp"/>
<file name="tags-html"/>
@@ -84,10 +85,11 @@
<file name="bootstrap"/>
<file name="compiler-core"/>
<file name="compiler"/>
- <file name="scoping"/>
<file name="tomcat-common"/>
<file name="tomcat-server"/>
<file name="util"/>
+ <file name="scoping"/>
+ <file name="core"/>
<file name="pageflow"/>
<file name="tomcat-webapp"/>
<file name="tags-html"/>
Added: incubator/beehive/trunk/netui/src/core/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/core/build.xml?rev=210202&view=auto
==============================================================================
--- incubator/beehive/trunk/netui/src/core/build.xml (added)
+++ incubator/beehive/trunk/netui/src/core/build.xml Mon Jul 11 13:19:20 2005
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+
+<project name="Beehive/NetUI/Core" default="build" basedir=".">
+
+ <import file="../../netui-imports.xml"/>
+
+ <property name="module.name" value="core"/>
+ <property name="module.dir" location="${src.dir}/${module.name}"/>
+
+ <path id="module.classpath">
+ <path refid="servlet.dependency.path"/>
+ <path refid="xbean.dependency.path"/>
+ <path refid="log4j.dependency.path"/>
+ <path refid="commons-codec.dependency.path"/>
+ <path refid="commons-logging.dependency.path"/>
+ <pathelement path="${classes.dir}/util"/>
+ <pathelement path="${classes.dir}/scoping"/>
+ </path>
+
+ <target name="build">
+ <echo>compile module: ${module.name}</echo>
+ <property name="classpath" refid="module.classpath"/>
+ <echo>module classpath: ${classpath}</echo>
+ <mkdir dir="${classes.dir}/${module.name}"/>
+
+ <ant antfile="${netui.ant.dir}/xmlBean.xml">
+ <property name="xsd.root.dir" value="${module.dir}/schema/"/>
+ <property name="class.output.dir"
value="${classes.dir}/${module.name}"/>
+ <property name="xbean.inputs"
value="${module.dir}/schema/**/*.xsd*"/>
+ <!-- TODO: put in the right output classname -->
+ <property name="xbean.output"
value="${classes.dir}/${module.name}/org/apache/beehive/netui/core/urltemplates/schema/CHANGEME.class"/>
+ </ant>
+
+ <javac srcdir="${module.dir}"
+ destdir="${classes.dir}/${module.name}"
+ classpathref="module.classpath"
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ optimize="${compile.optimize}"
+ source="${compile.source}"
+ target="${compile.target}">
+ <include name="**/*.java"/>
+ </javac>
+
+ <copy todir="${classes.dir}/${module.name}">
+ <fileset dir="${module.dir}" includes="**/*.properties"/>
+ </copy>
+
+ </target>
+
+ <target name="clean">
+ <delete dir="${classes.dir}/${module.name}"/>
+ </target>
+
+</project>
Propchange: incubator/beehive/trunk/netui/src/core/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/beehive/trunk/netui/src/jar-assembly/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/jar-assembly/build.xml?rev=210202&r1=210201&r2=210202&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/jar-assembly/build.xml (original)
+++ incubator/beehive/trunk/netui/src/jar-assembly/build.xml Mon Jul 11
13:19:20 2005
@@ -28,6 +28,7 @@
</jar>
<jar jarfile="${build.lib.dir}/beehive-netui-core.jar">
<fileset dir="${classes.dir}/pageflow"/>
+ <fileset dir="${classes.dir}/core"/>
<fileset dir="${classes.dir}/scoping"/>
<fileset dir="${classes.dir}/util"/>
<manifest>
Modified: incubator/beehive/trunk/netui/src/pageflow/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/build.xml?rev=210202&r1=210201&r2=210202&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/pageflow/build.xml (original)
+++ incubator/beehive/trunk/netui/src/pageflow/build.xml Mon Jul 11 13:19:20
2005
@@ -21,6 +21,7 @@
<pathelement path="${classes.dir}/util"/>
<pathelement path="${classes.dir}/scoping"/>
+ <pathelement path="${classes.dir}/core"/>
</path>
<target name="build">
@@ -66,31 +67,10 @@
<fileset dir="${module.dir}" includes="**/*.properties"/>
</copy>
-<!--
- <jar jarfile="${build.lib.dir}/${pageflow.jar.name}">
- <fileset dir="${module.classes.dir}">
- <include name="**/*.class"/>
- <include name="**/*.properties"/>
- <include name="**/*.xsb"/>
- </fileset>
- <manifest>
- <attribute name="Extension-Name" value="Beehive NetUI Page
Flow Core"/>
- <attribute name="Specification-Title" value="Beehive NetUI
Page Flow Core"/>
- <attribute name="Specification-Vendor" value="Apache Software
Foundation"/>
- <attribute name="Specification-Version"
value="${beehive.version}"/>
- <attribute name="Implementation-Title" value="Beehive NetUI
Page Flow Core"/>
- <attribute name="Implementation-Vendor" value="Apache Software
Foundation"/>
- <attribute name="Implementation-Version"
value="${beehive.version}"/>
- <attribute name="Beehive-Version" value="${beehive.version}"/>
- <attribute name="PageFlow-Runtime-Version"
value="${pageflow.version.runtime}"/>
- </manifest>
- </jar>
--->
</target>
<target name="clean">
<delete dir="${module.classes.dir}" failonerror="true"/>
- <delete file="${build.lib.dir}/${pageflow.jar.name}"/>
</target>
</project>
Modified: incubator/beehive/trunk/netui/src/scoping/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/scoping/build.xml?rev=210202&r1=210201&r2=210202&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/scoping/build.xml (original)
+++ incubator/beehive/trunk/netui/src/scoping/build.xml Mon Jul 11 13:19:20 2005
@@ -11,6 +11,7 @@
<path refid="servlet.dependency.path"/>
<path refid="log4j.dependency.path"/>
<path refid="commons-codec.dependency.path"/>
+ <pathelement path="${classes.dir}/util"/>
</path>
<target name="build">
@@ -34,29 +35,10 @@
<copy todir="${classes.dir}/${module.name}">
<fileset dir="${module.dir}" includes="**/*.properties"/>
</copy>
-<!--
- <jar jarfile="${build.lib.dir}/${scoping.jar.name}">
- <fileset dir="${classes.dir}/${module.name}">
- <include name="**/*.class"/>
- <include name="**/*.properties"/>
- </fileset>
- <manifest>
- <attribute name="Extension-Name" value="Beehive NetUI
Scoping"/>
- <attribute name="Specification-Title" value="Beehive NetUI
Scoping"/>
- <attribute name="Specification-Vendor" value="Apache Software
Foundation"/>
- <attribute name="Specification-Version"
value="${beehive.version}"/>
- <attribute name="Implementation-Title" value="Beehive NetUI
Scoping"/>
- <attribute name="Implementation-Vendor" value="Apache Software
Foundation"/>
- <attribute name="Implementation-Version"
value="${beehive.version}"/>
- <attribute name="Beehive-Version" value="${beehive.version}"/>
- </manifest>
- </jar>
--->
</target>
<target name="clean">
<delete dir="${classes.dir}/${module.name}"/>
- <delete dir="${build.lib.dir}/${scoping.jar.name}"/>
</target>
</project>
Modified:
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/ScopedServletUtils.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/ScopedServletUtils.java?rev=210202&r1=210201&r2=210202&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/ScopedServletUtils.java
(original)
+++
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/ScopedServletUtils.java
Mon Jul 11 13:19:20 2005
@@ -19,6 +19,7 @@
import org.apache.beehive.netui.pageflow.scoping.internal.ScopedRequestImpl;
import org.apache.beehive.netui.pageflow.scoping.internal.ScopedResponseImpl;
+import org.apache.beehive.netui.util.logging.Logger;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -29,8 +30,6 @@
import javax.servlet.ServletResponse;
import javax.servlet.ServletResponseWrapper;
-import org.apache.log4j.Logger;
-
import java.net.URI;
import java.net.URISyntaxException;
@@ -48,7 +47,7 @@
private static final String OVERRIDE_REQUEST_ATTR = ATTR_PREFIX +
"overrideRequest";
private static final String OVERRIDE_RESPONSE_ATTR = ATTR_PREFIX +
"overrideResponse";
- private static final Logger logger = Logger.getLogger(
ScopedServletUtils.class );
+ private static final Logger logger = Logger.getInstance(
ScopedServletUtils.class );
/**
@@ -98,10 +97,7 @@
//
// The override URI must start with a slash -- it's
webapp-relative.
//
- if ( overrideURI != null && ! overrideURI.startsWith( "/" ) )
- {
- overrideURI = "/" + overrideURI;
- }
+ if ( overrideURI != null && ! overrideURI.startsWith( "/" ) )
overrideURI = '/' + overrideURI;
scopedRequest =
new ScopedRequestImpl( realRequest, overrideURI, scopeKey,
servletContext, seeOuterRequestAttributes );
Modified:
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/AttributeContainer.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/AttributeContainer.java?rev=210202&r1=210201&r2=210202&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/AttributeContainer.java
(original)
+++
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/AttributeContainer.java
Mon Jul 11 13:19:20 2005
@@ -17,8 +17,7 @@
*/
package org.apache.beehive.netui.pageflow.scoping.internal;
-import org.apache.log4j.Logger;
-import org.apache.log4j.Priority;
+import org.apache.beehive.netui.util.logging.Logger;
import java.util.HashMap;
import java.util.Enumeration;
@@ -30,7 +29,7 @@
public class AttributeContainer
{
- private static final Logger logger = Logger.getLogger(
AttributeContainer.class );
+ private static final Logger logger = Logger.getInstance(
AttributeContainer.class );
private Map _attrs;
@@ -96,7 +95,7 @@
}
else
{
- if ( logger.isEnabledFor( Priority.INFO ) )
+ if ( logger.isInfoEnabled() )
{
logger.info( "Dropping non-serializable request attribute
" + entry.getKey()
+ " (" + entry.getValue() + ")." );
Modified:
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedRequestDispatcher.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedRequestDispatcher.java?rev=210202&r1=210201&r2=210202&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedRequestDispatcher.java
(original)
+++
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedRequestDispatcher.java
Mon Jul 11 13:19:20 2005
@@ -27,7 +27,7 @@
import java.io.IOException;
import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
-import org.apache.log4j.Logger;
+import org.apache.beehive.netui.util.logging.Logger;
/**
@@ -45,7 +45,7 @@
private static final String REQUEST_URI_INCLUDE =
"javax.servlet.include.request_uri";
- private static final Logger logger = Logger.getLogger(
ScopedRequestDispatcher.class );
+ private static final Logger logger = Logger.getInstance(
ScopedRequestDispatcher.class );
/**
Modified:
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedRequestImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedRequestImpl.java?rev=210202&r1=210201&r2=210202&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedRequestImpl.java
(original)
+++
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedRequestImpl.java
Mon Jul 11 13:19:20 2005
@@ -19,6 +19,7 @@
import org.apache.beehive.netui.pageflow.scoping.ScopedRequest;
import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
+import org.apache.beehive.netui.util.logging.Logger;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
@@ -37,7 +38,6 @@
import java.util.HashSet;
import java.io.UnsupportedEncodingException;
-import org.apache.log4j.Logger;
import org.apache.commons.codec.net.URLCodec;
import org.apache.commons.codec.DecoderException;
@@ -69,7 +69,7 @@
private static final String OUR_SESSION_ATTR = ATTR_PREFIX +
"scopedSession";
private static final String STORED_ATTRS_ATTR = ATTR_PREFIX +
"storedAttrs";
- private static final Logger _log = Logger.getLogger(
ScopedRequestImpl.class );
+ private static final Logger _log = Logger.getInstance(
ScopedRequestImpl.class );
private static final URLCodec URL_CODEC = new URLCodec();
Modified:
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedResponseImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedResponseImpl.java?rev=210202&r1=210201&r2=210202&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedResponseImpl.java
(original)
+++
incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedResponseImpl.java
Mon Jul 11 13:19:20 2005
@@ -18,6 +18,7 @@
package org.apache.beehive.netui.pageflow.scoping.internal;
import org.apache.beehive.netui.pageflow.scoping.ScopedResponse;
+import org.apache.beehive.netui.util.logging.Logger;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
@@ -29,8 +30,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.log4j.Logger;
-
/**
* A wrapper around HttpServletResponse, associated with a given scope-key.
Delegates to the wrapped
@@ -41,6 +40,8 @@
extends HttpServletResponseWrapper
implements ScopedResponse
{
+ private static final Cookie[] NO_COOKIES = new Cookie[0];
+
private boolean _isError = false;
private int _statusCode = -1;
private String _redirectURI = null;
@@ -50,12 +51,12 @@
private HashMap _headers = new HashMap();
private static final String SET_COOKIE = "Set-Cookie";
- private static final Logger logger = Logger.getLogger(
ScopedResponseImpl.class );
+ private static final Logger logger = Logger.getInstance(
ScopedResponseImpl.class );
- public ScopedResponseImpl( HttpServletResponse response )
+ public ScopedResponseImpl( HttpServletResponse servletResponse )
{
- super( response );
+ super( servletResponse );
}
public void sendError( int i, String s ) throws IOException
@@ -152,8 +153,7 @@
public Cookie[] getCookies()
{
List cookies = (List)_headers.get(SET_COOKIE);
-
- return ( cookies != null ? ( Cookie[] ) cookies.toArray( new Cookie[0]
) : new Cookie[0] );
+ return cookies != null ? ( Cookie[] ) cookies.toArray( new
Cookie[cookies.size()] ) : NO_COOKIES;
}
/**
@@ -240,7 +240,7 @@
public Object getFirstHeader( String name )
{
List foundHeaders = ( List ) _headers.get( name );
- return ( ! foundHeaders.isEmpty() ? foundHeaders.get( 0 ) : null );
+ return ! foundHeaders.isEmpty() ? foundHeaders.get( 0 ) : null;
}
protected void addObjectHeader( String name, Object val )
Modified: incubator/beehive/trunk/netui/src/tags-databinding/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/build.xml?rev=210202&r1=210201&r2=210202&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/build.xml (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/build.xml Mon Jul 11
13:19:20 2005
@@ -16,6 +16,7 @@
<pathelement path="${classes.dir}/tags-html"/>
<pathelement path="${classes.dir}/pageflow"/>
<pathelement path="${classes.dir}/scoping"/>
+ <pathelement path="${classes.dir}/core"/>
</path>
<target name="build">
@@ -71,27 +72,10 @@
/>
</webdoclet>
-<!--
- <jar jarfile="${build.lib.dir}/${tags-databinding.jar.name}">
- <fileset dir="${classes.dir}/${module.name}"/>
- <zipfileset
file="${build.lib.dir}/${netui-tags-databinding.tld.name}" prefix="META-INF"/>
- <manifest>
- <attribute name="Extension-Name" value="Beehive NetUI
Databinding Tag Library"/>
- <attribute name="Specification-Title" value="Beehive NetUI
Databinding Tag Library"/>
- <attribute name="Specification-Vendor" value="Apache Software
Foundation"/>
- <attribute name="Specification-Version"
value="${beehive.version}"/>
- <attribute name="Implementation-Title" value="Beehive NetUI
Databinding Tag Library"/>
- <attribute name="Implementation-Vendor" value="Apache Software
Foundation"/>
- <attribute name="Implementation-Version"
value="${beehive.version}"/>
- <attribute name="Beehive-Version" value="${beehive.version}"/>
- </manifest>
- </jar>
--->
</target>
<target name="clean">
<delete dir="${module.classes.dir}"/>
- <delete dir="${build.lib.dir}/${tags-databinding.jar.name}"/>
<delete dir="${build.lib.dir}/${netui-tags-databinding.tld.name}"/>
</target>
Modified: incubator/beehive/trunk/netui/src/tags-html/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/build.xml?rev=210202&r1=210201&r2=210202&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/build.xml (original)
+++ incubator/beehive/trunk/netui/src/tags-html/build.xml Mon Jul 11 13:19:20
2005
@@ -15,6 +15,7 @@
<pathelement path="${classes.dir}/tags-html"/>
<pathelement path="${classes.dir}/pageflow"/>
<pathelement path="${classes.dir}/scoping"/>
+ <pathelement path="${classes.dir}/core"/>
</path>
<target name="build">
@@ -67,27 +68,10 @@
/>
</webdoclet>
-<!--
- <jar jarfile="${build.lib.dir}/${tags-html.jar.name}">
- <fileset dir="${classes.dir}/${module.name}"/>
- <zipfileset file="${build.lib.dir}/${netui-tags-html.tld.name}"
prefix="META-INF"/>
- <manifest>
- <attribute name="Extension-Name" value="Beehive NetUI HTML Tag
Library"/>
- <attribute name="Specification-Title" value="Beehive NetUI
HTML Tag Library"/>
- <attribute name="Specification-Vendor" value="Apache Software
Foundation"/>
- <attribute name="Specification-Version"
value="${beehive.version}"/>
- <attribute name="Implementation-Title" value="Beehive NetUI
HTML Tag Library"/>
- <attribute name="Implementation-Vendor" value="Apache Software
Foundation"/>
- <attribute name="Implementation-Version"
value="${beehive.version}"/>
- <attribute name="Beehive-Version" value="${beehive.version}"/>
- </manifest>
- </jar>
--->
</target>
<target name="clean">
<delete dir="${classes.dir}/${module.name}"/>
- <delete dir="${build.lib.dir}/${tags-html.jar.name}"/>
<delete dir="${build.lib.dir}/${netui-tags-html.tld.name}"/>
</target>
Modified: incubator/beehive/trunk/netui/src/tags-template/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-template/build.xml?rev=210202&r1=210201&r2=210202&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-template/build.xml (original)
+++ incubator/beehive/trunk/netui/src/tags-template/build.xml Mon Jul 11
13:19:20 2005
@@ -12,6 +12,7 @@
<path refid="log4j.dependency.path"/>
<path refid="${struts.dependency.path.ref}"/>
<pathelement path="${classes.dir}/util"/>
+ <pathelement path="${classes.dir}/core"/>
<pathelement path="${classes.dir}/pageflow"/>
<pathelement path="${classes.dir}/tags-html"/>
<pathelement path="${classes.dir}/tags-databinding"/>
@@ -71,7 +72,6 @@
<target name="clean">
<delete dir="${classes.dir}/${module.name}"/>
- <delete dir="${build.lib.dir}/${tags-template.jar.name}"/>
<delete dir="${build.lib.dir}/${netui-tags-template.tld.name}"/>
</target>
|
|