[jira] Commented: (MAVEN-1399) upgrade jelly to CVS HEAD
The following comment has been added to this issue:
Author: Brett Porter
Created: Tue, 17 Aug 2004 8:11 PM
Body:
a bug was resolved in the tests for MavenUtils. With the new Jelly version,
environment variables are all available in the context and take precendence over
everything (same behaviour as Maven itself).
The only plugin test failing that wasn't already broken is javadoc (and dist when it
hits javadoc). This is because ${plugin.resources} is empty. Investigating before
committing.
-
View this comment:
http://jira.codehaus.org/browse/MAVEN-1399?page=comments#action_23205
-
View the issue:
http://jira.codehaus.org/browse/MAVEN-1399
Here is an overview of the issue:
-
Key: MAVEN-1399
Summary: upgrade jelly to CVS HEAD
Type: Task
Status: Open
Original Estimate: Unknown
Time Spent: Unknown
Remaining: Unknown
Project: maven
Fix Fors:
1.1
Assignee: Brett Porter
Reporter: Brett Porter
Created: Fri, 23 Jul 2004 1:09 PM
Updated: Tue, 17 Aug 2004 8:11 PM
Description:
attempt to use the most recent CVS of jelly and jexl - build new snapshots.
If it is a lot of work, this may not be attempted and removed from 1.1
-
JIRA INFORMATION:
This message is automatically generated by JIRA.
If you think it was sent incorrectly contact one of the administrators:
http://jira.codehaus.org/secure/Administrators.jspa
If you want more information on JIRA, or have a bug to report see:
http://www.atlassian.com/software/jira
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-plugins/linkcheck/src/main/org/apache/maven/linkcheck/validation LinkValidatorManager.java
carlos 2004/08/17 10:29:49
Modified:linkcheck/src/main/org/apache/maven/linkcheck/validation
LinkValidatorManager.java
Log:
Use Buffered Streams and close them properly
Revision ChangesPath
1.8 +16 -3
maven-plugins/linkcheck/src/main/org/apache/maven/linkcheck/validation/LinkValidatorManager.java
Index: LinkValidatorManager.java
===
RCS file:
/home/cvs/maven-plugins/linkcheck/src/main/org/apache/maven/linkcheck/validation/LinkValidatorManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LinkValidatorManager.java 1 Aug 2004 21:05:32 - 1.7
+++ LinkValidatorManager.java 17 Aug 2004 17:29:49 - 1.8
@@ -17,10 +17,13 @@
*
*/
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
+import java.io.IOException;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -103,10 +106,15 @@
try {
File f = new File(cacheFilename);
if (f.exists()) {
-this.cache.load(new FileInputStream(cacheFilename));
+BufferedInputStream is = new BufferedInputStream(
+new FileInputStream(cacheFilename));
+this.cache.load(is);
+is.close();
}
} catch (FileNotFoundException e) {
e.printStackTrace();
+} catch (IOException e) {
+e.printStackTrace();
}
}
@@ -117,8 +125,13 @@
if (dir != null) {
dir.mkdirs();
}
-this.cache.save(new FileOutputStream(cacheFilename));
+BufferedOutputStream os = new BufferedOutputStream(
+new FileOutputStream(cacheFilename));
+this.cache.save(os);
+os.close();
} catch (FileNotFoundException e) {
+e.printStackTrace();
+} catch (IOException e) {
e.printStackTrace();
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Closed: (MPLINKCHECK-15) [PATCH] FileToCheck does not use BufferedInputStream
Message:
The following issue has been closed.
Resolver: Carlos Sanchez
Date: Tue, 17 Aug 2004 1:22 PM
Fixed. Thanks
-
View the issue:
http://jira.codehaus.org/browse/MPLINKCHECK-15
Here is an overview of the issue:
-
Key: MPLINKCHECK-15
Summary: [PATCH] FileToCheck does not use BufferedInputStream
Type: Improvement
Status: Closed
Priority: Minor
Resolution: FIXED
Original Estimate: 10 minutes
Time Spent: Unknown
Remaining: 10 minutes
Project: maven-linkcheck-plugin
Fix Fors:
1.4
Versions:
1.3.2
Assignee: Carlos Sanchez
Reporter: Stephane Mikaty
Created: Tue, 17 Aug 2004 9:37 AM
Updated: Tue, 17 Aug 2004 1:22 PM
Environment: N/A
Description:
This results in an unacceptably long parse time for large
html files, as the file seems to be read one byte at a time,
incurring a native call each time.
On my machine, the disk utilization is very high as a result
of this. I discovered this because my checkstyle-report.html
is 40 megs big. the workaround is simple (do not include the
linkcheck report in the site generation), however everyone
will benefit from a faster parsing of big html files. So i
submitted the issue.
Index: src/main/org/apache/maven/linkcheck/FileToCheck.java
===
RCS file:
/home/cvspublic/maven-plugins/linkcheck/src/main/org/apache/maven/linkcheck/FileToCheck.java,v
retrieving revision 1.17
diff -u -r1.17 FileToCheck.java
--- src/main/org/apache/maven/linkcheck/FileToCheck.java1 Aug 2004 22:23:33
- 1.17
+++ src/main/org/apache/maven/linkcheck/FileToCheck.java17 Aug 2004 13:26:32
-
@@ -17,6 +17,7 @@
*
*/
+import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -146,13 +147,13 @@
{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
PrintWriter errOut = new PrintWriter(baos);
-FileInputStream in = new FileInputStream(fileToCheck);
+BufferedInputStream bin = new BufferedInputStream(new
FileInputStream(fileToCheck));
try
{
Tidy tidy = getTidy();
tidy.setErrout(errOut);
LOG.debug("Processing:" + fileToCheck);
-org.w3c.dom.Document domDocument = tidy.parseDOM(in, null);
+org.w3c.dom.Document domDocument = tidy.parseDOM(bin, null);
// now read a dom4j document from
// JTidy's W3C DOM object
@@ -165,7 +166,7 @@
}
finally
{
-close(in);
+close(bin);
close(baos);
}
}
-
JIRA INFORMATION:
This message is automatically generated by JIRA.
If you think it was sent incorrectly contact one of the administrators:
http://jira.codehaus.org/secure/Administrators.jspa
If you want more information on JIRA, or have a bug to report see:
http://www.atlassian.com/software/jira
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-plugins/linkcheck/xdocs changes.xml
carlos 2004/08/17 10:14:36
Modified:linkcheck/src/main/org/apache/maven/linkcheck
FileToCheck.java
linkcheck/xdocs changes.xml
Log:
Fixed MPLINKCHECK-15. Use BufferedInputStream in FileToCheck
Revision ChangesPath
1.18 +5 -4
maven-plugins/linkcheck/src/main/org/apache/maven/linkcheck/FileToCheck.java
Index: FileToCheck.java
===
RCS file:
/home/cvs/maven-plugins/linkcheck/src/main/org/apache/maven/linkcheck/FileToCheck.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- FileToCheck.java 1 Aug 2004 22:23:33 - 1.17
+++ FileToCheck.java 17 Aug 2004 17:14:35 - 1.18
@@ -17,6 +17,7 @@
*
*/
+import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -146,13 +147,13 @@
{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
PrintWriter errOut = new PrintWriter(baos);
-FileInputStream in = new FileInputStream(fileToCheck);
+BufferedInputStream bin = new BufferedInputStream(new
FileInputStream(fileToCheck));
try
{
Tidy tidy = getTidy();
tidy.setErrout(errOut);
LOG.debug("Processing:" + fileToCheck);
-org.w3c.dom.Document domDocument = tidy.parseDOM(in, null);
+org.w3c.dom.Document domDocument = tidy.parseDOM(bin, null);
// now read a dom4j document from
// JTidy's W3C DOM object
@@ -165,7 +166,7 @@
}
finally
{
-close(in);
+close(bin);
close(baos);
}
}
1.24 +1 -0 maven-plugins/linkcheck/xdocs/changes.xml
Index: changes.xml
===
RCS file: /home/cvs/maven-plugins/linkcheck/xdocs/changes.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- changes.xml 1 Aug 2004 22:28:14 - 1.23
+++ changes.xml 17 Aug 2004 17:14:35 - 1.24
@@ -26,6 +26,7 @@
+ Use BufferedInputStream in FileToCheck
Set links as invalid on unknown
errors
Use CDATA in file
name
Added maven.linkcheck.exclude
property
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
RE: cvs commit: maven-plugins/abbot/src/plugin-resources jnlp.jsl
> -Original Message- > From: Emmanuel Venisse [mailto:[EMAIL PROTECTED] > Sent: mardi 17 août 2004 17:30 > To: Maven Developers List > Subject: Re: cvs commit: maven-plugins/abbot/src/plugin-resources jnlp.jsl > > > > > > Hi Vincent, > > > > > > > > > > Why you don't use the jnlp plugin? Do you have some specific > > > requirement? > > > > > > > > I need to take an existing JNLP file and add some items to it. Is > that > > > > supported by the JNLP plugin? > > > > > > No, but we can add a merge goal (or tag) for merge two files. > > > I think it's a better idea. > > > > Even if you add this it won't help me, because I don't have 2 JNLP > files. > I > > have only one JNLP file and some plugin logic that needs to be inserted > in > > the JNLP. Making it generic would be too difficult (template) and I > really > > don't see what it would have to do with the JNLP plugin... > > It's not really 2 jnlp files but 1 jnlp file and a "patch" > For abbot you can create a patch like this : > > > > > > > Note that I only write the specific part. > > We merge original jar part with your part and original properties part > with > your part. > > So, for all jnlp tags, we write original part + patch part. Sorry but I fail to understand how it would be better than what currently exists (I find it worse as it creates an unnecessary dependency with the JNLP plugin and it looks like it's the same amount of code). I don't have much time to work on this but feel free to create a JIRA patch for the Abbot plugin if you're interested and I'll have a look. Thanks -Vincent - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: maven-plugins/abbot/src/plugin-resources jnlp.jsl
> > > > Hi Vincent, > > > > > > > > Why you don't use the jnlp plugin? Do you have some specific > > requirement? > > > > > > I need to take an existing JNLP file and add some items to it. Is that > > > supported by the JNLP plugin? > > > > No, but we can add a merge goal (or tag) for merge two files. > > I think it's a better idea. > > Even if you add this it won't help me, because I don't have 2 JNLP files. I > have only one JNLP file and some plugin logic that needs to be inserted in > the JNLP. Making it generic would be too difficult (template) and I really > don't see what it would have to do with the JNLP plugin... It's not really 2 jnlp files but 1 jnlp file and a "patch" For abbot you can create a patch like this : Note that I only write the specific part. We merge original jar part with your part and original properties part with your part. So, for all jnlp tags, we write original part + patch part. Emmanuel - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-plugins/abbot/xdocs changes.xml properties.xml
vmassol 2004/08/17 08:11:16
Modified:abbotplugin.jelly project.xml plugin.properties
abbot/xdocs changes.xml properties.xml
Log:
Added new maven.abbot.extrajars property that can be used to specify
extra jars to be added to the executing classpath. For example, this is useful to add
custom Abbot tester classes.
Revision ChangesPath
1.6 +21 -2 maven-plugins/abbot/plugin.jelly
Index: plugin.jelly
===
RCS file: /home/cvs/maven-plugins/abbot/plugin.jelly,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin.jelly 17 Aug 2004 13:54:11 - 1.5
+++ plugin.jelly 17 Aug 2004 15:11:15 - 1.6
@@ -171,6 +171,19 @@
+
+ ${maven.abbot.extrajars}
+
+
+
+
+
+
-
-
+
+${maven.abbot.extrajars}
+
+
+
+
1.10 +1 -1 maven-plugins/abbot/project.xml
Index: project.xml
===
RCS file: /home/cvs/maven-plugins/abbot/project.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.xml 8 Jul 2004 09:50:45 - 1.9
+++ project.xml 17 Aug 2004 15:11:15 - 1.10
@@ -23,7 +23,7 @@
3
maven-abbot-plugin
Maven Abbot plugin
- 1.0
+ 1.1-SNAPSHOT
Run Abbot tests
Abbot Tests
http://maven.apache.org/reference/plugins/abbot/
1.3 +5 -0 maven-plugins/abbot/plugin.properties
Index: plugin.properties
===
RCS file: /home/cvs/maven-plugins/abbot/plugin.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.properties 17 Aug 2004 13:54:11 - 1.2
+++ plugin.properties 17 Aug 2004 15:11:15 - 1.3
@@ -92,3 +92,8 @@
# from the local file system we need to have the permissions and thus we
# need signed jars to get these permissions.
maven.abbot.sign = true
+
+# Extra list of jars (separated by commas) to be added to the generated JNLP
+# and to the executing CP for the editor goal. This is useful for example when
+# creating custom Abbot testers that need to be included in the executing CP.
+#maven.abbot.extrajars =
\ No newline at end of file
1.4 +7 -0 maven-plugins/abbot/xdocs/changes.xml
Index: changes.xml
===
RCS file: /home/cvs/maven-plugins/abbot/xdocs/changes.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- changes.xml 8 Jul 2004 09:36:35 - 1.3
+++ changes.xml 17 Aug 2004 15:11:16 - 1.4
@@ -6,6 +6,13 @@
Vincent Massol
+
+
+Added new maven.abbot.extrajars property that can be used
+to specify extra jars to be added to the executing classpath. For example,
+this is useful to add custom Abbot tester classes.
+
+
Initial creation by Christian Blavier and
Vincent Massol. See the feature list on the Abbot plugin web site for a full list of
what the plugin does.
1.2 +9 -0 maven-plugins/abbot/xdocs/properties.xml
Index: properties.xml
===
RCS file: /home/cvs/maven-plugins/abbot/xdocs/properties.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- properties.xml12 Jun 2004 14:10:25 - 1.1
+++ properties.xml17 Aug 2004 15:11:16 - 1.2
@@ -27,6 +27,10 @@
# Location where the abbot plugin puts build files related to abbot
maven.abbot.dest.dir = ${maven.build.dir}/abbot
+# Location where the abbot plugin signs the jars to be added to the
+# generated JNLP file.
+maven.abbot.dest.jar.dir = ${maven.abbot.dest.dir}/jars
+
# Location where abbot junit test results will be located
maven.abbot.reports.dir = ${maven.build.dir}/abbot-reports
@@ -82,6 +86,11 @@
# from the local file system we need to have the permissions and thus we
# need signed jars to get these permissions.
maven.abbot.sign = true
+
+# Extra list of jars (separated by commas) to be added to the generated JNLP
+# and to the executing CP for the editor goal. This is useful for example when
+# creating custom Abbot testers that need to be included in the executing CP.
+#maven.abbot.extrajars =
]]>
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For
RE: cvs commit: maven-plugins/abbot/src/plugin-resources jnlp.jsl
> -Original Message- > From: Emmanuel Venisse [mailto:[EMAIL PROTECTED] > Sent: mardi 17 août 2004 16:44 > To: Maven Developers List > Subject: Re: cvs commit: maven-plugins/abbot/src/plugin-resources jnlp.jsl > > > > Subject: Re: cvs commit: maven-plugins/abbot/src/plugin-resources > jnlp.jsl > > > > > > Hi Vincent, > > > > > > Why you don't use the jnlp plugin? Do you have some specific > requirement? > > > > I need to take an existing JNLP file and add some items to it. Is that > > supported by the JNLP plugin? > > No, but we can add a merge goal (or tag) for merge two files. > I think it's a better idea. Even if you add this it won't help me, because I don't have 2 JNLP files. I have only one JNLP file and some plugin logic that needs to be inserted in the JNLP. Making it generic would be too difficult (template) and I really don't see what it would have to do with the JNLP plugin... -Vincent - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: maven-plugins/abbot/src/plugin-resources jnlp.jsl
> > Subject: Re: cvs commit: maven-plugins/abbot/src/plugin-resources jnlp.jsl > > > > Hi Vincent, > > > > Why you don't use the jnlp plugin? Do you have some specific requirement? > > I need to take an existing JNLP file and add some items to it. Is that > supported by the JNLP plugin? No, but we can add a merge goal (or tag) for merge two files. I think it's a better idea. Emmanuel - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: cvs commit: maven-plugins/abbot/src/plugin-resources jnlp.jsl
Hi Emmanuel,
> -Original Message-
> From: Emmanuel Venisse [mailto:[EMAIL PROTECTED]
> Sent: mardi 17 août 2004 16:14
> To: Maven Developers List
> Subject: Re: cvs commit: maven-plugins/abbot/src/plugin-resources jnlp.jsl
>
> Hi Vincent,
>
> Why you don't use the jnlp plugin? Do you have some specific requirement?
I need to take an existing JNLP file and add some items to it. Is that
supported by the JNLP plugin?
-Vincent
>
> Emmanuel
>
> - Original Message -
> From: <[EMAIL PROTECTED]>
> To: <[EMAIL PROTECTED]>
> Sent: Tuesday, August 17, 2004 3:54 PM
> Subject: cvs commit: maven-plugins/abbot/src/plugin-resources jnlp.jsl
>
>
> > vmassol 2004/08/17 06:54:11
> >
> > Modified:abbotplugin.jelly plugin.properties
> >abbot/src/plugin-resources jnlp.jsl
> > Log:
> > Refactoring: all jars to include in the generated JNLP are now signed
> in
> the maven.abbot.dest.jar.dir and the JNLP generation logic scans all jars
> in
> this directory for inclusion
> >
> > Revision ChangesPath
> > 1.5 +12 -7 maven-plugins/abbot/plugin.jelly
> >
> > Index: plugin.jelly
> > ===
> > RCS file: /home/cvs/maven-plugins/abbot/plugin.jelly,v
> > retrieving revision 1.4
> > retrieving revision 1.5
> > diff -u -r1.4 -r1.5
> > --- plugin.jelly 16 Aug 2004 10:41:22 - 1.4
> > +++ plugin.jelly 17 Aug 2004 13:54:11 - 1.5
> > @@ -131,7 +131,7 @@
> >
> >
> > - destfile="${maven.abbot.dest.dir}/${maven.abbot.webstart.main.jar}"
> > + destfile="${maven.abbot.dest.jar.dir}/${maven.abbot.webstart.main.jar}"
> > basedir="${plugin.dir}" includes="**/*.class"/>
> >
> >
> > @@ -145,35 +145,39 @@
> >
> >
> > > -srcfile="${plugin.getDependencyPath(dep.Id)}"
> > -
> targetfile="${maven.abbot.dest.dir}/${filename}.jar"/>
> > + srcfile="${plugin.getDependencyPath(dep.Id)}"
> > + targetfile="${maven.abbot.dest.dir}/${filename}.jar"/>
> >
> >
> > ${dep.id} is uptodate ?
> ${context.getVariable(varname) == true}
> >
> > -
> > +
> >
> >
> >
> > -
> > + destfile="${maven.abbot.dest.jar.dir}/${filename}.jar">
> > > excludes="**/*.SF **/*.RSA **/*.DSA"/>
> >
> >
> >
> > - > + jar="${maven.abbot.dest.jar.dir}/${filename}.jar"
> > keystore="${maven.abbot.sign.keystore}"
> > alias="${maven.abbot.sign.alias}"
> > storepass="${maven.abbot.sign.storepass}"/>
> >
> >
> >
> > +
> >
> > +
> >
> > - jar="${maven.abbot.dest.dir}/${maven.abbot.webstart.main.jar}"
> > +
> > + jar="${maven.abbot.dest.jar.dir}/${maven.abbot.webstart.main.jar}"
> >keystore="${maven.abbot.sign.keystore}"
> >alias="${maven.abbot.sign.alias}"
> >storepass="${maven.abbot.sign.storepass}"/>
> > +
> >
> >
> >
> > @@ -299,6 +303,7 @@
> >
> >
> >
> > +
> >
> >
> >
> >
> >
> >
> > 1.2 +4 -0 maven-plugins/abbot/plugin.properties
> >
> > Index: plugin.properties
> > ===
> > RCS file: /home/cvs/maven-plugins/abbot/plugin.properties,v
> > retrieving revision 1.1
> > retrieving revision 1.2
> > diff -u -r1.1 -r1.2
> > --- plugin.properties 12 Jun 2004 14:09:36 - 1.1
> > +++ plugin.properties 17 Aug 2004 13:54:11 - 1.2
> > @@ -33,6 +33,10 @@
> ># Location where the abbot plugin puts build files related to abbot
> >maven.abbot.dest.dir = ${maven.build.dir}/abbot
> >
> > +# Location where the abbot plugin signs the jars to be added to the
> > +# generated JNLP file.
> > +maven.abbot.dest.jar.dir = ${maven.abbot.dest.dir}/jars
> > +
> ># Location where abbot junit test results will be located
> >maven.abbot.reports.dir = ${maven.build.dir}/abbot-reports
> >
> >
> >
> >
> > 1.3 +12 -21maven-plugins/abbot/src/plugin-resources/jnlp.jsl
> >
> > Index: jnlp.jsl
> > ===
> > RCS file: /home/cvs/maven-plugins/abbot/src/plugin-
> resources/jnlp.jsl,v
> > retrieving revision 1.2
> > retrieving revision 1.3
> > diff -u -r1.2 -r1.3
> > --- jnlp.jsl 12 Jun 2004 14:11:13 - 1.2
> > +++ jnlp.jsl 17 Aug 2004 13:54:11 - 1.3
> > @@ -65,28 +65,19 @@
> >
> >
> >
> > -
> > -
> > -
> > - value="${dep.GroupId}-${dep.ArtifactId}"/>
> > -
> > -
> > - name="href">file:${maven.abbot.dest.dir}/${filename}.jar
> > -
Re: cvs commit: maven-plugins/abbot/src/plugin-resources jnlp.jsl
Hi Vincent,
Why you don't use the jnlp plugin? Do you have some specific requirement?
Emmanuel
- Original Message -
From: <[EMAIL PROTECTED]>
To: <[EMAIL PROTECTED]>
Sent: Tuesday, August 17, 2004 3:54 PM
Subject: cvs commit: maven-plugins/abbot/src/plugin-resources jnlp.jsl
> vmassol 2004/08/17 06:54:11
>
> Modified:abbotplugin.jelly plugin.properties
>abbot/src/plugin-resources jnlp.jsl
> Log:
> Refactoring: all jars to include in the generated JNLP are now signed in
the maven.abbot.dest.jar.dir and the JNLP generation logic scans all jars in
this directory for inclusion
>
> Revision ChangesPath
> 1.5 +12 -7 maven-plugins/abbot/plugin.jelly
>
> Index: plugin.jelly
> ===
> RCS file: /home/cvs/maven-plugins/abbot/plugin.jelly,v
> retrieving revision 1.4
> retrieving revision 1.5
> diff -u -r1.4 -r1.5
> --- plugin.jelly 16 Aug 2004 10:41:22 - 1.4
> +++ plugin.jelly 17 Aug 2004 13:54:11 - 1.5
> @@ -131,7 +131,7 @@
>
>
> - +basedir="${plugin.dir}" includes="**/*.class"/>
>
>
> @@ -145,35 +145,39 @@
>
>
> -srcfile="${plugin.getDependencyPath(dep.Id)}"
> -targetfile="${maven.abbot.dest.dir}/${filename}.jar"/>
> + srcfile="${plugin.getDependencyPath(dep.Id)}"
> + targetfile="${maven.abbot.dest.dir}/${filename}.jar"/>
>
>
> ${dep.id} is uptodate ?
${context.getVariable(varname) == true}
>
> -
> +
>
>
>
> -
> +
>excludes="**/*.SF **/*.RSA **/*.DSA"/>
>
>
>
> - + keystore="${maven.abbot.sign.keystore}"
> alias="${maven.abbot.sign.alias}"
> storepass="${maven.abbot.sign.storepass}"/>
>
>
>
> +
>
> +
>
> - +
> + keystore="${maven.abbot.sign.keystore}"
>alias="${maven.abbot.sign.alias}"
>storepass="${maven.abbot.sign.storepass}"/>
> +
>
>
>
> @@ -299,6 +303,7 @@
>
>
>
> +
>
>
>
>
>
>
> 1.2 +4 -0 maven-plugins/abbot/plugin.properties
>
> Index: plugin.properties
> ===
> RCS file: /home/cvs/maven-plugins/abbot/plugin.properties,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- plugin.properties 12 Jun 2004 14:09:36 - 1.1
> +++ plugin.properties 17 Aug 2004 13:54:11 - 1.2
> @@ -33,6 +33,10 @@
># Location where the abbot plugin puts build files related to abbot
>maven.abbot.dest.dir = ${maven.build.dir}/abbot
>
> +# Location where the abbot plugin signs the jars to be added to the
> +# generated JNLP file.
> +maven.abbot.dest.jar.dir = ${maven.abbot.dest.dir}/jars
> +
># Location where abbot junit test results will be located
>maven.abbot.reports.dir = ${maven.build.dir}/abbot-reports
>
>
>
>
> 1.3 +12 -21maven-plugins/abbot/src/plugin-resources/jnlp.jsl
>
> Index: jnlp.jsl
> ===
> RCS file: /home/cvs/maven-plugins/abbot/src/plugin-resources/jnlp.jsl,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -r1.2 -r1.3
> --- jnlp.jsl 12 Jun 2004 14:11:13 - 1.2
> +++ jnlp.jsl 17 Aug 2004 13:54:11 - 1.3
> @@ -65,28 +65,19 @@
>
>
>
> -
> -
> -
> -
> -
> -
> - file:${maven.abbot.dest.dir}/${filename}.jar
> -
> +
> +
> +
> +
> +
> +
> +
> +
> +true
>
> -
> -
> - ${dep.getDependancyPath()}
> -
> -
> -
> -
> -
> -
> -
> -true
> -file:${maven.abbot.dest.dir}/${maven.abbot.webstart.main.jar}
> -
> + file:${jar.absolutePath}
> +
> +
>
>
>
>
>
>
>
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
>
>
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Reopened: (MPJCOVERAGE-11) Place generated files, like jcoverage.ser and HEAD.xml in the target directory
Message:
The following issue has been reopened.
Reopener: Emmanuel Venisse
Date: Tue, 17 Aug 2004 10:07 AM
jcoverage.ser is stored in directory define by com.jcoverage.rawcoverage.dir system
property whith ${user.dir} as default directory.
Patch (and test) are welcome.
-
View the issue:
http://jira.codehaus.org/browse/MPJCOVERAGE-11
Here is an overview of the issue:
-
Key: MPJCOVERAGE-11
Summary: Place generated files, like jcoverage.ser and HEAD.xml in the target
directory
Type: Improvement
Status: Reopened
Priority: Minor
Original Estimate: Unknown
Time Spent: Unknown
Remaining: Unknown
Project: maven-jcoverage-plugin
Versions:
1.0.4
Assignee: Emmanuel Venisse
Reporter: Paul Spencer
Created: Fri, 18 Jun 2004 2:42 PM
Updated: Tue, 17 Aug 2004 10:07 AM
Description:
Jcoverage currently places 3 files in the project's root directory, jcoverage.ser and
2 XML files. Since these files are generated, they should be placed somewhere in the
target directory tree. This would accomplish the following:
o The files will be deleted by "maven clean" without then need for
in plugin.jelly
o Prevent the need to change to .cvsignore since the files should
not be in the CVS repository.
o Remove a collision when the old or new tag matches a file in the
project's home directory. Imagine the problems cause by the
following:
maven.jdiff.old.tag=maven
maven.jdiff.new.tag=project
-
JIRA INFORMATION:
This message is automatically generated by JIRA.
If you think it was sent incorrectly contact one of the administrators:
http://jira.codehaus.org/secure/Administrators.jspa
If you want more information on JIRA, or have a bug to report see:
http://www.atlassian.com/software/jira
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-plugins/jcoverage/xdocs changes.xml properties.xml
evenisse2004/08/17 07:00:48
Modified:jcoverage plugin.jelly plugin.properties project.xml
jcoverage/xdocs changes.xml properties.xml
Log:
Add the possibility to set multiple includes and excludes files for instrumentation.
Revision ChangesPath
1.16 +3 -4 maven-plugins/jcoverage/plugin.jelly
Index: plugin.jelly
===
RCS file: /home/cvs/maven-plugins/jcoverage/plugin.jelly,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- plugin.jelly 11 Jul 2004 15:19:32 - 1.15
+++ plugin.jelly 17 Aug 2004 14:00:48 - 1.16
@@ -122,10 +122,9 @@
-
-
-
-
+
1.5 +2 -1 maven-plugins/jcoverage/plugin.properties
Index: plugin.properties
===
RCS file: /home/cvs/maven-plugins/jcoverage/plugin.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.properties 26 Apr 2004 12:12:14 - 1.4
+++ plugin.properties 17 Aug 2004 14:00:48 - 1.5
@@ -20,4 +20,5 @@
maven.jcoverage.junit.fork=yes
maven.jcoverage.report.template=maven
maven.jcoverage.report.stylesheet=${plugin.resources}/style.css
-maven.jcoverage.instrumentation.excludes=NOT_DEFINED
\ No newline at end of file
+maven.jcoverage.instrumentation.includes=**/*.class
+maven.jcoverage.instrumentation.excludes=NOT_DEFINED
1.30 +1 -1 maven-plugins/jcoverage/project.xml
Index: project.xml
===
RCS file: /home/cvs/maven-plugins/jcoverage/project.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- project.xml 11 Jul 2004 15:27:48 - 1.29
+++ project.xml 17 Aug 2004 14:00:48 - 1.30
@@ -23,7 +23,7 @@
3
maven-jcoverage-plugin
Maven JCoverage plugin
- 1.0.7
+ 1.0.8-SNAPSHOT
org.apache.maven.jcoveragereport
This plugin provides coverage analysis of your source-code based on
the open-source jcoverage tool.
This plugin provides coverage analysis of your source-code
based on the open-source jcoverage tool.
1.23 +3 -0 maven-plugins/jcoverage/xdocs/changes.xml
Index: changes.xml
===
RCS file: /home/cvs/maven-plugins/jcoverage/xdocs/changes.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- changes.xml 11 Jul 2004 15:27:48 - 1.22
+++ changes.xml 17 Aug 2004 14:00:48 - 1.23
@@ -24,6 +24,9 @@
Emmanuel Venisse
+
+ Add the possibility to set multiple
includes and excludes files for instrumentation.
+
Fixed tests execution when artifact
contains properties.
Remove deprecated APIs.
1.6 +8 -0 maven-plugins/jcoverage/xdocs/properties.xml
Index: properties.xml
===
RCS file: /home/cvs/maven-plugins/jcoverage/xdocs/properties.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- properties.xml26 Apr 2004 12:12:14 - 1.5
+++ properties.xml17 Aug 2004 14:00:48 - 1.6
@@ -57,6 +57,14 @@
+ maven.jcoverage.instrumentation.includes
+ **/*.class
+ Yes
+
+Specifies the pattern for the included classes of instrumentation.
+
+
+
maven.jcoverage.instrumentation.excludes
Not defined
Yes
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-plugins/abbot/src/plugin-resources jnlp.jsl
vmassol 2004/08/17 06:54:11
Modified:abbotplugin.jelly plugin.properties
abbot/src/plugin-resources jnlp.jsl
Log:
Refactoring: all jars to include in the generated JNLP are now signed in the
maven.abbot.dest.jar.dir and the JNLP generation logic scans all jars in this
directory for inclusion
Revision ChangesPath
1.5 +12 -7 maven-plugins/abbot/plugin.jelly
Index: plugin.jelly
===
RCS file: /home/cvs/maven-plugins/abbot/plugin.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.jelly 16 Aug 2004 10:41:22 - 1.4
+++ plugin.jelly 17 Aug 2004 13:54:11 - 1.5
@@ -131,7 +131,7 @@
-
@@ -145,35 +145,39 @@
+ srcfile="${plugin.getDependencyPath(dep.Id)}"
+ targetfile="${maven.abbot.dest.dir}/${filename}.jar"/>
${dep.id} is uptodate ?
${context.getVariable(varname) == true}
-
+
-
+
-
+
+
-
+
+
@@ -299,6 +303,7 @@
+
1.2 +4 -0 maven-plugins/abbot/plugin.properties
Index: plugin.properties
===
RCS file: /home/cvs/maven-plugins/abbot/plugin.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.properties 12 Jun 2004 14:09:36 - 1.1
+++ plugin.properties 17 Aug 2004 13:54:11 - 1.2
@@ -33,6 +33,10 @@
# Location where the abbot plugin puts build files related to abbot
maven.abbot.dest.dir = ${maven.build.dir}/abbot
+# Location where the abbot plugin signs the jars to be added to the
+# generated JNLP file.
+maven.abbot.dest.jar.dir = ${maven.abbot.dest.dir}/jars
+
# Location where abbot junit test results will be located
maven.abbot.reports.dir = ${maven.build.dir}/abbot-reports
1.3 +12 -21maven-plugins/abbot/src/plugin-resources/jnlp.jsl
Index: jnlp.jsl
===
RCS file: /home/cvs/maven-plugins/abbot/src/plugin-resources/jnlp.jsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jnlp.jsl 12 Jun 2004 14:11:13 - 1.2
+++ jnlp.jsl 17 Aug 2004 13:54:11 - 1.3
@@ -65,28 +65,19 @@
-
-
-
-
-
-
- file:${maven.abbot.dest.dir}/${filename}.jar
-
+
+
+
+
+
+
+
+
+true
-
-
- ${dep.getDependancyPath()}
-
-
-
-
-
-
-
-true
-file:${maven.abbot.dest.dir}/${maven.abbot.webstart.main.jar}
-
+ file:${jar.absolutePath}
+
+
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Created: (MPPDF-14) pre tag not suppoprted
Message: A new issue has been created in JIRA. - View the issue: http://jira.codehaus.org/browse/MPPDF-14 Here is an overview of the issue: - Key: MPPDF-14 Summary: pre tag not suppoprted Type: Improvement Status: Open Priority: Major Original Estimate: Unknown Time Spent: Unknown Remaining: Unknown Project: maven-pdf-plugin Versions: 2.2 Assignee: Arnaud HERITIER Reporter: Joerg Schaible Created: Tue, 17 Aug 2004 9:46 AM Updated: Tue, 17 Aug 2004 9:46 AM Description: The current implementation dows not support the tag. This makes the embedding of configuration or code examples completely unreadable, since indentation and line breaks are not respected. - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Updated: (MPLINKCHECK-15) [PATCH] FileToCheck does not use BufferedInputStream
The following issue has been updated:
Updater: Stephane Mikaty (mailto:[EMAIL PROTECTED])
Date: Tue, 17 Aug 2004 9:40 AM
Comment:
patch file.
Changes:
Attachment changed to patch.txt
-
For a full history of the issue, see:
http://jira.codehaus.org/browse/MPLINKCHECK-15?page=history
-
View the issue:
http://jira.codehaus.org/browse/MPLINKCHECK-15
Here is an overview of the issue:
-
Key: MPLINKCHECK-15
Summary: [PATCH] FileToCheck does not use BufferedInputStream
Type: Improvement
Status: Open
Priority: Minor
Original Estimate: 10 minutes
Time Spent: Unknown
Remaining: 10 minutes
Project: maven-linkcheck-plugin
Versions:
1.3.2
Assignee: Ben Walding
Reporter: Stephane Mikaty
Created: Tue, 17 Aug 2004 9:37 AM
Updated: Tue, 17 Aug 2004 9:40 AM
Environment: N/A
Description:
This results in an unacceptably long parse time for large
html files, as the file seems to be read one byte at a time,
incurring a native call each time.
On my machine, the disk utilization is very high as a result
of this. I discovered this because my checkstyle-report.html
is 40 megs big. the workaround is simple (do not include the
linkcheck report in the site generation), however everyone
will benefit from a faster parsing of big html files. So i
submitted the issue.
Index: src/main/org/apache/maven/linkcheck/FileToCheck.java
===
RCS file:
/home/cvspublic/maven-plugins/linkcheck/src/main/org/apache/maven/linkcheck/FileToCheck.java,v
retrieving revision 1.17
diff -u -r1.17 FileToCheck.java
--- src/main/org/apache/maven/linkcheck/FileToCheck.java1 Aug 2004 22:23:33
- 1.17
+++ src/main/org/apache/maven/linkcheck/FileToCheck.java17 Aug 2004 13:26:32
-
@@ -17,6 +17,7 @@
*
*/
+import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -146,13 +147,13 @@
{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
PrintWriter errOut = new PrintWriter(baos);
-FileInputStream in = new FileInputStream(fileToCheck);
+BufferedInputStream bin = new BufferedInputStream(new
FileInputStream(fileToCheck));
try
{
Tidy tidy = getTidy();
tidy.setErrout(errOut);
LOG.debug("Processing:" + fileToCheck);
-org.w3c.dom.Document domDocument = tidy.parseDOM(in, null);
+org.w3c.dom.Document domDocument = tidy.parseDOM(bin, null);
// now read a dom4j document from
// JTidy's W3C DOM object
@@ -165,7 +166,7 @@
}
finally
{
-close(in);
+close(bin);
close(baos);
}
}
-
JIRA INFORMATION:
This message is automatically generated by JIRA.
If you think it was sent incorrectly contact one of the administrators:
http://jira.codehaus.org/secure/Administrators.jspa
If you want more information on JIRA, or have a bug to report see:
http://www.atlassian.com/software/jira
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Created: (MPLINKCHECK-15) [PATCH] FileToCheck does not use BufferedInputStream
Message:
A new issue has been created in JIRA.
-
View the issue:
http://jira.codehaus.org/browse/MPLINKCHECK-15
Here is an overview of the issue:
-
Key: MPLINKCHECK-15
Summary: [PATCH] FileToCheck does not use BufferedInputStream
Type: Improvement
Status: Open
Priority: Minor
Original Estimate: 10 minutes
Time Spent: Unknown
Remaining: 10 minutes
Project: maven-linkcheck-plugin
Versions:
1.3.2
Assignee: Ben Walding
Reporter: Stephane Mikaty
Created: Tue, 17 Aug 2004 9:37 AM
Updated: Tue, 17 Aug 2004 9:37 AM
Environment: N/A
Description:
This results in an unacceptably long parse time for large
html files, as the file seems to be read one byte at a time,
incurring a native call each time.
On my machine, the disk utilization is very high as a result
of this. I discovered this because my checkstyle-report.html
is 40 megs big. the workaround is simple (do not include the
linkcheck report in the site generation), however everyone
will benefit from a faster parsing of big html files. So i
submitted the issue.
Index: src/main/org/apache/maven/linkcheck/FileToCheck.java
===
RCS file:
/home/cvspublic/maven-plugins/linkcheck/src/main/org/apache/maven/linkcheck/FileToCheck.java,v
retrieving revision 1.17
diff -u -r1.17 FileToCheck.java
--- src/main/org/apache/maven/linkcheck/FileToCheck.java1 Aug 2004 22:23:33
- 1.17
+++ src/main/org/apache/maven/linkcheck/FileToCheck.java17 Aug 2004 13:26:32
-
@@ -17,6 +17,7 @@
*
*/
+import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -146,13 +147,13 @@
{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
PrintWriter errOut = new PrintWriter(baos);
-FileInputStream in = new FileInputStream(fileToCheck);
+BufferedInputStream bin = new BufferedInputStream(new
FileInputStream(fileToCheck));
try
{
Tidy tidy = getTidy();
tidy.setErrout(errOut);
LOG.debug("Processing:" + fileToCheck);
-org.w3c.dom.Document domDocument = tidy.parseDOM(in, null);
+org.w3c.dom.Document domDocument = tidy.parseDOM(bin, null);
// now read a dom4j document from
// JTidy's W3C DOM object
@@ -165,7 +166,7 @@
}
finally
{
-close(in);
+close(bin);
close(baos);
}
}
-
JIRA INFORMATION:
This message is automatically generated by JIRA.
If you think it was sent incorrectly contact one of the administrators:
http://jira.codehaus.org/secure/Administrators.jspa
If you want more information on JIRA, or have a bug to report see:
http://www.atlassian.com/software/jira
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Commented: (MPXDOC-85) theme.url is not relative
The following comment has been added to this issue: Author: Joerg Schaible Created: Tue, 17 Aug 2004 3:54 AM Body: Hallo Arnaud, see also related MPXDOC-80. Jörg - View this comment: http://jira.codehaus.org/browse/MPXDOC-85?page=comments#action_23172 - View the issue: http://jira.codehaus.org/browse/MPXDOC-85 Here is an overview of the issue: - Key: MPXDOC-85 Summary: theme.url is not relative Type: Bug Status: Open Priority: Minor Original Estimate: Unknown Time Spent: Unknown Remaining: Unknown Project: maven-xdoc-plugin Assignee: Arnaud HERITIER Reporter: Joerg Schaible Created: Fri, 27 Feb 2004 5:50 AM Updated: Tue, 17 Aug 2004 3:54 AM Description: If you set maven.xdoc.theme.url to something like "style/mytheme.css" you'll have to notice, that this woprks only for pages in the root directory. For all pages in a sudirectory the theme is not available, since in site.jsl the relative path is not prepended. You can see the effect easily if you define an own theme and generate statcvs report. - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Commented: (MAVEN-1399) upgrade jelly to CVS HEAD
The following comment has been added to this issue: Author: Brett Porter Created: Tue, 17 Aug 2004 3:14 AM Body: I have attempted this and it progressed well - bootstrap & touchstone were successful. I have failures in the plugin tests, but I'm not sure if they already existed - will investigate further before committing. - View this comment: http://jira.codehaus.org/browse/MAVEN-1399?page=comments#action_23170 - View the issue: http://jira.codehaus.org/browse/MAVEN-1399 Here is an overview of the issue: - Key: MAVEN-1399 Summary: upgrade jelly to CVS HEAD Type: Task Status: Open Original Estimate: Unknown Time Spent: Unknown Remaining: Unknown Project: maven Fix Fors: 1.1 Assignee: Brett Porter Reporter: Brett Porter Created: Fri, 23 Jul 2004 1:09 PM Updated: Tue, 17 Aug 2004 3:14 AM Description: attempt to use the most recent CVS of jelly and jexl - build new snapshots. If it is a lot of work, this may not be attempted and removed from 1.1 - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
