jvanzyl 2002/07/12 08:17:55
Modified: src/java/org/apache/maven/app PluginManager.java
src/java/org/apache/maven/changelog ChangeLog.java
src/java/org/apache/maven/executor AbstractExecutor.java
src/java/org/apache/maven/tasklist TaskList.java
TaskListExecutor.java
src/plugins/activity plugin.jelly
src/plugins/changelog plugin.jelly
src/plugins/tasklist plugin.jelly
Log:
o Applying Kuisong Tong's encoding patches. Much appreciated.
Revision Changes Path
1.8 +6 -0
jakarta-turbine-maven/src/java/org/apache/maven/app/PluginManager.java
Index: PluginManager.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/app/PluginManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PluginManager.java 12 Jul 2002 05:52:16 -0000 1.7
+++ PluginManager.java 12 Jul 2002 15:17:54 -0000 1.8
@@ -212,7 +212,13 @@
log.debug("plugin: " + name + " -> " + getPluginDir(name));
+ // Let the classloader know where the classes provided by
+ // the plugin live.
Forehead.getInstance().getClassLoader("root.maven").addURL(getPluginDir(name).toURL());
+
+ // Now for each plugin we have to let the classloader know about
+ // the JARs that this plugin needs.
+
// For each plugin we create a new MavenJellyContext so that we
// can push in commonly named elements like ${plugin.dir} without
1.7 +6 -4
jakarta-turbine-maven/src/java/org/apache/maven/changelog/ChangeLog.java
Index: ChangeLog.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/changelog/ChangeLog.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ChangeLog.java 4 Jun 2002 15:26:24 -0000 1.6
+++ ChangeLog.java 12 Jul 2002 15:17:55 -0000 1.7
@@ -174,7 +174,7 @@
{
this.output = output;
}
-
+
/**
* Execute task.
* @throws FileNotFoundException if {@link ChangeLog#base} doesn't exist
@@ -302,7 +302,7 @@
{
PrintWriter out = new PrintWriter(new OutputStreamWriter(
- new FileOutputStream(output), "ISO-8859-1"));
+ new FileOutputStream(output), getOutputEncoding()));
out.println(toXML());
out.flush();
out.close();
@@ -314,7 +314,9 @@
private String toXML()
{
StringBuffer buffer = new StringBuffer();
- buffer.append("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n")
+ buffer.append("<?xml version=\"1.0\" encoding=\"")
+ .append(getOutputEncoding())
+ .append("\" ?>\n")
.append("<document>\n")
.append("<properties><title>Change Log</title></properties>\n")
.append("<body>\n")
1.6 +24 -1
jakarta-turbine-maven/src/java/org/apache/maven/executor/AbstractExecutor.java
Index: AbstractExecutor.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/executor/AbstractExecutor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractExecutor.java 27 May 2002 12:48:03 -0000 1.5
+++ AbstractExecutor.java 12 Jul 2002 15:17:55 -0000 1.6
@@ -73,9 +73,32 @@
implements Executor
{
/**
+ * Output encoding.
+ */
+ private String outputEncoding = "ISO-8859-1";
+
+ /**
* Ant project.
*/
private Project project;
+
+ /**
+ * Set Output encoding.
+ * @param outputEncoding the Charset Encoding that the object is executing in
+ */
+ public void setOutputEncoding(String outputEncoding)
+ {
+ this.outputEncoding = outputEncoding;
+ }
+
+ /**
+ * Get Output encoding.
+ * @return the Charset Encoding that the object is using
+ */
+ public String getOutputEncoding()
+ {
+ return outputEncoding;
+ }
/**
* Set Ant project.
1.3 +25 -5
jakarta-turbine-maven/src/java/org/apache/maven/tasklist/TaskList.java
Index: TaskList.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/tasklist/TaskList.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TaskList.java 6 Jun 2002 16:54:28 -0000 1.2
+++ TaskList.java 12 Jul 2002 15:17:55 -0000 1.3
@@ -70,8 +70,10 @@
*/
class TaskList
{
- /** The encoding used when creating the XML representation. */
- static final String ENCODING = "ISO-8859-1";
+ /**
+ * Output encoding.
+ */
+ private String outputEncoding = "ISO-8859-1";
/** The list of TaskListEntries accumulated. */
private List taskListEntries = new ArrayList();
@@ -95,6 +97,24 @@
}
/**
+ * Set Output encoding.
+ * @param outputEncoding the Charset Encoding that the object is using
+ */
+ public void setOutputEncoding(String outputEncoding)
+ {
+ this.outputEncoding = outputEncoding;
+ }
+
+ /**
+ * Get Output encoding.
+ * @return the Charset Encoding that the object is using
+ */
+ public String getOutputEncoding()
+ {
+ return outputEncoding;
+ }
+
+ /**
* Add a TaskListEntry to the list of entries.
*
* @param taskListEntry The TaskListEntry to be added.
@@ -128,7 +148,7 @@
StringBuffer sb = new StringBuffer();
sb.append("<?xml version=\"1.0\" encoding=\"");
- sb.append(ENCODING);
+ sb.append(outputEncoding);
sb.append("\" ?>\n");
sb.append("<document>\n");
sb.append("<properties>\n");
@@ -152,4 +172,4 @@
return sb.toString();
}
-}
+}
\ No newline at end of file
1.4 +11 -2
jakarta-turbine-maven/src/java/org/apache/maven/tasklist/TaskListExecutor.java
Index: TaskListExecutor.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/tasklist/TaskListExecutor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TaskListExecutor.java 7 Jun 2002 16:46:21 -0000 1.3
+++ TaskListExecutor.java 12 Jul 2002 15:17:55 -0000 1.4
@@ -116,6 +116,15 @@
}
/**
+ * Set Output encoding.
+ * @param outputEncoding the Charset Encoding that the object is executing in
+ */
+ public void setOutputEncoding(String outputEncoding)
+ {
+ taskList.setOutputEncoding(outputEncoding);
+ }
+
+ /**
* Initializes the source tool and the appropriate visitor. This
* method is invoked once (not once per file) before any processing
* begins. The source tool is used to parse each file of the source
@@ -182,7 +191,7 @@
try
{
PrintWriter out = new PrintWriter(new OutputStreamWriter(
- new FileOutputStream(outputFile), TaskList.ENCODING));
+ new FileOutputStream(outputFile),
taskList.getOutputEncoding()));
/*
* Let the task list render itself.
1.7 +1 -0 jakarta-turbine-maven/src/plugins/activity/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/activity/plugin.jelly,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plugin.jelly 8 Jul 2002 17:41:51 -0000 1.6
+++ plugin.jelly 12 Jul 2002 15:17:55 -0000 1.7
@@ -33,6 +33,7 @@
output="${maven.build.dir}/activity-log.xml"
range="${maven.activitylog.range}"
factory="${maven.changelog.factory}"
+ outputEncoding="${maven.docs.outputencoding}"
/>
<!-- Transform the activity log into developer activity first -->
1.4 +1 -0 jakarta-turbine-maven/src/plugins/changelog/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/changelog/plugin.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.jelly 8 Jul 2002 16:47:24 -0000 1.3
+++ plugin.jelly 12 Jul 2002 15:17:55 -0000 1.4
@@ -27,6 +27,7 @@
output="${maven.gen.docs}/changelog.xml"
range="${maven.changelog.range}"
factory="${maven.changelog.factory}"
+ outputEncoding="${maven.docs.outputencoding}"
/>
</goal>
1.4 +2 -1 jakarta-turbine-maven/src/plugins/tasklist/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/tasklist/plugin.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.jelly 10 Jul 2002 22:53:29 -0000 1.3
+++ plugin.jelly 12 Jul 2002 15:17:55 -0000 1.4
@@ -29,8 +29,9 @@
base="${maven.src.dir}"
includes="**/*.java"
outputFile="${maven.gen.docs}/task-list.xml"
+ outputEncoding="${maven.docs.outputencoding}"
/>
-
+
</j:if>
</goal>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
