lenya/src/java/org/apache/lenya/cms/task AntTask.java,1.10,1.11
Andreas Hartmann <[email protected]>
| Newsgroups | gmane.comp.cms.wyona.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /repository/lenya/src/java/org/apache/lenya/cms/task
In directory erbium:/tmp/cvs-serv25863/src/java/org/apache/lenya/cms/task
Modified Files:
AntTask.java
Log Message:
- added new project parameters to AntTask
- added PublicationTask and Ant-based StaticHTMLExporter
Index: AntTask.java
===================================================================
RCS file: /repository/lenya/src/java/org/apache/lenya/cms/task/AntTask.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** AntTask.java 29 Apr 2003 09:52:12 -0000 1.10
--- AntTask.java 6 May 2003 18:22:32 -0000 1.11
***************
*** 97,100 ****
--- 97,102 ----
*/
public void executeAntTarget(
+ String servletContextPath,
+ String publicationId,
File publicationDirectory,
File buildFile,
***************
*** 121,124 ****
--- 123,128 ----
project.setUserProperty(PUBLICATION_DIRECTORY, publicationDirectory.getAbsolutePath());
+ project.setUserProperty(PUBLICATION_ID, publicationId);
+ project.setUserProperty(SERVLET_CONTEXT_PATH, servletContextPath);
for (Iterator keys = properties.keySet().iterator(); keys.hasNext(); ) {
***************
*** 153,156 ****
--- 157,162 ----
public static final String PUBLICATION_DIRECTORY = "pub.dir";
+ public static final String PUBLICATION_ID = "pub.id";
+ public static final String SERVLET_CONTEXT_PATH = "servlet.context";
public static final String BUILDFILE = "buildfile";
public static final String TARGET = "target";
***************
*** 170,173 ****
--- 176,180 ----
public void execute(String servletContextPath) throws ExecutionException {
+ String publicationId;
File publicationDirectory;
File buildFile;
***************
*** 183,187 ****
.replace('/', File.separatorChar);
! String publicationId = getParameters().getParameter(PARAMETER_PUBLICATION_ID);
if (publicationId.equals("")) {
--- 190,194 ----
.replace('/', File.separatorChar);
! publicationId = getParameters().getParameter(PARAMETER_PUBLICATION_ID);
if (publicationId.equals("")) {
***************
*** 215,219 ****
}
! executeAntTarget(publicationDirectory, buildFile, target, arguments, properties, logFile);
}
--- 222,226 ----
}
! executeAntTarget(servletContextPath, publicationId, publicationDirectory, buildFile, target, arguments, properties, logFile);
}