svn commit: r1132896 - /maven/site/trunk/src/site/apt/plugins/index.apt
Author: stephenc
Date: Tue Jun 7 07:55:25 2011
New Revision: 1132896
URL: http://svn.apache.org/viewvc?rev=1132896&view=rev
Log:
reflect the release of m-gpg-p version 1.3
Modified:
maven/site/trunk/src/site/apt/plugins/index.apt
Modified: maven/site/trunk/src/site/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/plugins/index.apt?rev=1132896&r1=1132895&r2=1132896&view=diff
==
--- maven/site/trunk/src/site/apt/plugins/index.apt (original)
+++ maven/site/trunk/src/site/apt/plugins/index.apt Tue Jun 7 07:55:25 2011
@@ -138,7 +138,7 @@ Available Plugins
*--++--++--+++
| {{{/plugins/maven-enforcer-plugin/} <<>>}} | B |
1.0 | 2010-11-08 | Environmental constraint checking (Maven Version,
JDK etc), User Custom Rule Execution. |
{{{http://svn.apache.org/repos/asf/maven/enforcer/trunk/maven-enforcer-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MENFORCER}JIRA}}
*--++--++--+++
-| {{{/plugins/maven-gpg-plugin/} <<>>}} | B |
1.2 | 2011-03-24 | Create signatures for the artifacts and poms. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-gpg-plugin}SVN}} |
{{{http://jira.codehaus.org/browse/MGPG}JIRA}}
+| {{{/plugins/maven-gpg-plugin/} <<>>}} | B |
1.3 | 2011-06-07 | Create signatures for the artifacts and poms. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-gpg-plugin}SVN}} |
{{{http://jira.codehaus.org/browse/MGPG}JIRA}}
*--++--++--+++
| {{{/plugins/maven-help-plugin/} <<>>}} | B |
2.1.1| 2010-03-26 | Get information about the working environment for
the project. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-help-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MPH}JIRA}}
*--++--++--+++
svn commit: r1132936 - in /maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/src/site/apt: ./ index.apt
Author: ltheussl Date: Tue Jun 7 10:03:28 2011 New Revision: 1132936 URL: http://svn.apache.org/viewvc?rev=1132936&view=rev Log: add a bogus index file to sync with the m3 version of the IT Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/src/site/apt/ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/src/site/apt/index.apt Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/src/site/apt/index.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/src/site/apt/index.apt?rev=1132936&view=auto == --- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/src/site/apt/index.apt (added) +++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/src/site/apt/index.apt Tue Jun 7 10:03:28 2011 @@ -0,0 +1,32 @@ + -- + Title + -- + Author + -- + Date + -- + + ~~ Licensed to the Apache Software Foundation (ASF) under one + ~~ or more contributor license agreements. See the NOTICE file + ~~ distributed with this work for additional information + ~~ regarding copyright ownership. The ASF licenses this file + ~~ to you under the Apache License, Version 2.0 (the + ~~ "License"); you may not use this file except in compliance + ~~ with the License. You may obtain a copy of the License at + ~~ + ~~ http://www.apache.org/licenses/LICENSE-2.0 + ~~ + ~~ Unless required by applicable law or agreed to in writing, + ~~ software distributed under the License is distributed on an + ~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~~ KIND, either express or implied. See the License for the + ~~ specific language governing permissions and limitations + ~~ under the License. + + ~~ NOTE: For help with the syntax of this file, see: + ~~ http://maven.apache.org/doxia/references/apt-format.html + + +MSITE-458 + + This is a test.
svn commit: r1132939 - in /maven/plugins/branches/maven-site-plugin-3.x: ./ src/it/MSITE-458/src/site/apt/ src/it/MSITE-458/src/site/apt/index.apt
Author: ltheussl Date: Tue Jun 7 10:06:41 2011 New Revision: 1132939 URL: http://svn.apache.org/viewvc?rev=1132939&view=rev Log: merge r1132936 from trunk: add an index file which is not generated by pir in m3 Added: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-458/src/site/apt/ - copied from r1132936, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/src/site/apt/ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-458/src/site/apt/index.apt - copied unchanged from r1132936, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/src/site/apt/index.apt Modified: maven/plugins/branches/maven-site-plugin-3.x/ (props changed) Propchange: maven/plugins/branches/maven-site-plugin-3.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 7 10:06:41 2011 @@ -1 +1 @@ -/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1039748-1039749,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018,1075782,1075810,1075995,1076167,1076195,1077911,1077924,1078235,1079474,1079529,1079698,1080781,1081676,1081837,1081887,1082091,1082242,1082274,1082877,1083147,1083251,1083473,1084564,1086313,1086338-1086339,1086533,1087455,1088584,1089802,1089852,1091331,1098168,1098170,1099591,1126420,1126918-1126945 +/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1039748-1039749,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018,1075782,1075810,1075995,1076167,1076195,1077911,1077924,1078235,1079474,1079529,1079698,1080781,1081676,1081837,1081887,1082091,1082242,1082274,1082877,1083147,1083251,1083473,1084564,1086313,1086338-1086339,1086533,1087455,1088584,1089802,1089852,1091331,1098168,1098170,1099591,1126420,1126918-1126945,1132936
svn commit: r1133006 - in /maven/site/trunk/src/site/apt/guides: introduction/introduction-to-plugin-prefix-mapping.apt plugin/guide-java-plugin-development.apt
Author: ltheussl
Date: Tue Jun 7 13:33:00 2011
New Revision: 1133006
URL: http://svn.apache.org/viewvc?rev=1133006&view=rev
Log:
escape special characters
Modified:
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-plugin-prefix-mapping.apt
maven/site/trunk/src/site/apt/guides/plugin/guide-java-plugin-development.apt
Modified:
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-plugin-prefix-mapping.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/introduction/introduction-to-plugin-prefix-mapping.apt?rev=1133006&r1=1133005&r2=1133006&view=diff
==
---
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-plugin-prefix-mapping.apt
(original)
+++
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-plugin-prefix-mapping.apt
Tue Jun 7 13:33:00 2011
@@ -55,9 +55,9 @@ Introduction to Plugin Prefix Resolution
"maven" or "plugin" surrounded by dashes in the plugin's artifact ID. The
conventional artifact ID formats to use are:
-* <<>> - for plugins from the Apache Maven project
+* <<>> - for plugins from the Apache Maven
project
-* <<<${prefix}-maven-plugin>>> - for plugins from other sources
+* <<<$\{prefix\}-maven-plugin>>> - for plugins from other sources
If your plugin's artifactId fits this pattern, Maven will automatically map
your plugin to the correct prefix in the metadata stored within your plugin's
Modified:
maven/site/trunk/src/site/apt/guides/plugin/guide-java-plugin-development.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/plugin/guide-java-plugin-development.apt?rev=1133006&r1=1133005&r2=1133006&view=diff
==
---
maven/site/trunk/src/site/apt/guides/plugin/guide-java-plugin-development.apt
(original)
+++
maven/site/trunk/src/site/apt/guides/plugin/guide-java-plugin-development.apt
Tue Jun 7 13:33:00 2011
@@ -208,7 +208,7 @@ mvn groupID:artifactID:version:goal
* You can assign a shortened prefix to your plugin, such as <<>>.
This is done automatically if you follow the convention of using
-<<<${prefix}-maven-plugin>>> (or <<>> if the
plugin is
+<<<$\{prefix\}-maven-plugin>>> (or <<>> if the
plugin is
part of the Apache Maven project). You may also assign one through
additional
configuration - for more information see
{{{../introduction/introduction-to-plugin-prefix-mapping.html}
Introduction to Plugin Prefix Mapping}}.
svn commit: r1133015 - /maven/site/trunk/src/site/resources/pdf-config.xml
Author: ltheussl Date: Tue Jun 7 14:00:17 2011 New Revision: 1133015 URL: http://svn.apache.org/viewvc?rev=1133015&view=rev Log: tweak some properties for pdf Added: maven/site/trunk/src/site/resources/pdf-config.xml Added: maven/site/trunk/src/site/resources/pdf-config.xml URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/resources/pdf-config.xml?rev=1133015&view=auto == --- maven/site/trunk/src/site/resources/pdf-config.xml (added) +++ maven/site/trunk/src/site/resources/pdf-config.xml Tue Jun 7 14:00:17 2011 @@ -0,0 +1,24 @@ +http://www.w3.org/1999/XSL/Transform"; + xmlns:fo="http://www.w3.org/1999/XSL/Format";> + + +scale-down-to-fit +scale-down-to-fit +100% +100% + + + +monospace +no-wrap +auto +false + + + +9pt + + +
svn commit: r1133088 - in /maven/plugins/trunk/maven-compiler-plugin: ./ src/it/mcompiler-120/ src/it/mcompiler-120/src/ src/it/mcompiler-120/src/main/ src/it/mcompiler-120/src/main/java/ src/it/mcomp
Author: krosenvold
Date: Tue Jun 7 16:38:54 2011
New Revision: 1133088
URL: http://svn.apache.org/viewvc?rev=1133088&view=rev
Log:
[MCOMPILER-120] -Werror options support
Invoker based IT added to test plexus-compiler feature. Based on test project
by Martin Ackermann
Added:
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/invoker.properties
(with props)
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/pom.xml
(with props)
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/src/
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/src/main/
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/src/main/java/
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/src/main/java/org/
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/src/main/java/org/maven/
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/src/main/java/org/maven/test/
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/src/main/java/org/maven/test/Main.java
(with props)
Modified:
maven/plugins/trunk/maven-compiler-plugin/pom.xml
Modified: maven/plugins/trunk/maven-compiler-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/pom.xml?rev=1133088&r1=1133087&r2=1133088&view=diff
==
--- maven/plugins/trunk/maven-compiler-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-compiler-plugin/pom.xml Tue Jun 7 16:38:54 2011
@@ -53,6 +53,7 @@ under the License.
2.0.9
+1.8.2
@@ -125,7 +126,7 @@ under the License.
org.codehaus.plexus
plexus-compiler-api
- 1.8.1
+ ${plexusCompilerVersion}
org.codehaus.plexus
@@ -136,7 +137,7 @@ under the License.
org.codehaus.plexus
plexus-compiler-manager
- 1.8.1
+ ${plexusCompilerVersion}
org.codehaus.plexus
@@ -147,7 +148,7 @@ under the License.
org.codehaus.plexus
plexus-compiler-javac
- 1.8.1
+ ${plexusCompilerVersion}
runtime
Added:
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/invoker.properties?rev=1133088&view=auto
==
---
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/invoker.properties
(added)
+++
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/invoker.properties
Tue Jun 7 16:38:54 2011
@@ -0,0 +1,2 @@
+invoker.buildResult = failure
+
Propchange:
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/invoker.properties
--
svn:eol-style = native
Added: maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/pom.xml?rev=1133088&view=auto
==
--- maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/pom.xml
(added)
+++ maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/pom.xml Tue
Jun 7 16:38:54 2011
@@ -0,0 +1,49 @@
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+ 4.0.0
+ org.maven.test
+ warningsbuild
+ 0.1
+ Werror warnings build
+ jar
+
+
+
+
+ junit
+ junit
+ 4.4
+ test
+
+
+
+ log4j
+ log4j
+ 1.2.14
+ jar
+ compile
+
+
+
+
+
+
+
+maven-compiler-plugin
+@project.version@
+
+ 1.6
+ 1.6
+ -Xlint:all, -path
+
+
+
+ true
+
+
+
+
+
+
+
Propchange:
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/pom.xml
--
svn:eol-style = native
Added:
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/src/main/java/org/maven/test/Main.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/src/main/java/org/maven/test/Main.java?rev=1133088&view=auto
==
---
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/src/main/java/org/maven/test/Main.java
(added)
+++
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/src/main/java/org/maven/test/Main.java
Tue Jun 7
svn commit: r1133143 - /maven/maven-3/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
Author: pgier Date: Tue Jun 7 20:28:08 2011 New Revision: 1133143 URL: http://svn.apache.org/viewvc?rev=1133143&view=rev Log: Add unit tests to verify behaviour of unrecognized version qualifiers. Issue id: MNG-5114 Modified: maven/maven-3/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java Modified: maven/maven-3/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java?rev=1133143&r1=1133142&r2=1133143&view=diff == --- maven/maven-3/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java (original) +++ maven/maven-3/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java Tue Jun 7 20:28:08 2011 @@ -114,7 +114,8 @@ public class DefaultArtifactVersionTest assertVersionOlder( "2.0-1", "2.0.1" ); assertVersionOlder( "2.0.1-klm", "2.0.1-lmn" ); -//assertVersionOlder( "2.0.1-xyz", "2.0.1" ); +assertVersionOlder( "2.0.1", "2.0.1-xyz" ); +assertVersionOlder( "2.0.1-xyz-1", "2.0.1-1-xyz" ); assertVersionOlder( "2.0.1", "2.0.1-123" ); assertVersionOlder( "2.0.1-xyz", "2.0.1-123" );
svn commit: r1133178 - in /maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util: FileUtils.java io/ io/InputStreamFacade.java
Author: stephenc
Date: Tue Jun 7 22:17:28 2011
New Revision: 1133178
URL: http://svn.apache.org/viewvc?rev=1133178&view=rev
Log:
adding some FileUtils stubs and impls
Added:
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/FileUtils.java
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/io/
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/io/InputStreamFacade.java
Added:
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/FileUtils.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/FileUtils.java?rev=1133178&view=auto
==
---
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/FileUtils.java
(added)
+++
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/FileUtils.java
Tue Jun 7 22:17:28 2011
@@ -0,0 +1,474 @@
+package org.codehaus.plexus.util;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.commons.io.FilenameUtils;
+import org.codehaus.plexus.util.io.InputStreamFacade;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.Reader;
+import java.lang.String;
+import java.util.List;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: stephenc
+ * Date: 07/06/2011
+ * Time: 22:39
+ * To change this template use File | Settings | File Templates.
+ */
+public class FileUtils
+{
+public static final int ONE_KB = 1024;
+
+public static final int ONE_MB = ONE_KB * 1024;
+
+public static final int ONE_GB = ONE_MB * 1024;
+
+public static String FS = System.getProperty( "file.separator" );
+
+public FileUtils()
+{
+throw new UnsupportedOperationException( "TODO: Implement" );
+}
+
+public static String[] getDefaultExcludes()
+{
+throw new UnsupportedOperationException( "TODO: Implement" );
+}
+
+public static List getDefaultExcludesAsList()
+{
+throw new UnsupportedOperationException( "TODO: Implement" );
+}
+
+public static String getDefaultExcludesAsString()
+{
+throw new UnsupportedOperationException( "TODO: Implement" );
+}
+
+public static String byteCountToDisplaySize( int byteCount )
+{
+return org.apache.commons.io.FileUtils.byteCountToDisplaySize(
byteCount );
+}
+
+public static String dirname( String name )
+{
+throw new UnsupportedOperationException( "TODO: Implement" );
+}
+
+public static String filename( String name )
+{
+throw new UnsupportedOperationException( "TODO: Implement" );
+}
+
+public static String basename( String name )
+{
+throw new UnsupportedOperationException( "TODO: Implement" );
+}
+
+public static String basename( String s1, String s2 )
+{
+throw new UnsupportedOperationException( "TODO: Implement" );
+}
+
+public static String extension( String name )
+{
+throw new UnsupportedOperationException( "TODO: Implement" );
+}
+
+public static boolean fileExists( String name )
+{
+throw new UnsupportedOperationException( "TODO: Implement" );
+}
+
+public static String fileRead( String file )
+throws IOException
+{
+throw new UnsupportedOperationException( "TODO: Implement" );
+}
+
+public static String fileRead( String file, String encoding )
+throws IOException
+{
+throw new UnsupportedOperationException( "TODO: Implement" );
+}
+
+public static String fileRead( File file )
+throws IOException
+{
+throw new UnsupportedOperationException( "TODO: Implement" );
+}
+
+public static String fileRead( File file, String encoding )
+throws IOException
+{
+throw new UnsupportedOperation
svn commit: r1133184 - /maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/FileUtils.java
Author: stephenc
Date: Tue Jun 7 22:37:20 2011
New Revision: 1133184
URL: http://svn.apache.org/viewvc?rev=1133184&view=rev
Log:
more impls... need to beef out the test cases for this class though
Modified:
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/FileUtils.java
Modified:
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/FileUtils.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/FileUtils.java?rev=1133184&r1=1133183&r2=1133184&view=diff
==
---
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/FileUtils.java
(original)
+++
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/FileUtils.java
Tue Jun 7 22:37:20 2011
@@ -19,13 +19,11 @@ package org.codehaus.plexus.util;
* under the License.
*/
-import org.apache.commons.io.FilenameUtils;
import org.codehaus.plexus.util.io.InputStreamFacade;
import java.io.File;
import java.io.IOException;
import java.io.Reader;
-import java.lang.String;
import java.util.List;
/**
@@ -103,25 +101,25 @@ public class FileUtils
public static String fileRead( String file )
throws IOException
{
-throw new UnsupportedOperationException( "TODO: Implement" );
+return org.apache.commons.io.FileUtils.readFileToString( new File(
file ) );
}
public static String fileRead( String file, String encoding )
throws IOException
{
-throw new UnsupportedOperationException( "TODO: Implement" );
+return org.apache.commons.io.FileUtils.readFileToString( new File(
file ), encoding );
}
public static String fileRead( File file )
throws IOException
{
-throw new UnsupportedOperationException( "TODO: Implement" );
+return org.apache.commons.io.FileUtils.readFileToString( file );
}
public static String fileRead( File file, String encoding )
throws IOException
{
-throw new UnsupportedOperationException( "TODO: Implement" );
+return org.apache.commons.io.FileUtils.readFileToString( file,
encoding );
}
public static void fileAppend( String file, String content )
@@ -130,7 +128,7 @@ public class FileUtils
throw new UnsupportedOperationException( "TODO: Implement" );
}
-public static void fileAppend( String file, String content, String
encoding )
+public static void fileAppend( String file, String encoding, String
content )
throws IOException
{
throw new UnsupportedOperationException( "TODO: Implement" );
@@ -139,25 +137,25 @@ public class FileUtils
public static void fileWrite( String file, String content )
throws IOException
{
-throw new UnsupportedOperationException( "TODO: Implement" );
+org.apache.commons.io.FileUtils.writeStringToFile( new File( file ),
content );
}
-public static void fileWrite( String file, String content, String encoding
)
+public static void fileWrite( String file, String encoding, String content
)
throws IOException
{
-throw new UnsupportedOperationException( "TODO: Implement" );
+org.apache.commons.io.FileUtils.writeStringToFile( new File( file ),
content, encoding );
}
public static void fileWrite( File file, String content )
throws IOException
{
-throw new UnsupportedOperationException( "TODO: Implement" );
+org.apache.commons.io.FileUtils.writeStringToFile( file, content );
}
-public static void fileWrite( File file, String content, String encoding )
+public static void fileWrite( File file, String encoding, String content )
throws IOException
{
-throw new UnsupportedOperationException( "TODO: Implement" );
+org.apache.commons.io.FileUtils.writeStringToFile( file, content,
encoding );
}
public static void fileDelete( String file )
@@ -167,12 +165,12 @@ public class FileUtils
public static boolean waitFor( String file, int duration )
{
-throw new UnsupportedOperationException( "TODO: Implement" );
+return org.apache.commons.io.FileUtils.waitFor( new File( file ),
duration );
}
public static boolean waitFor( File file, int duration )
{
-throw new UnsupportedOperationException( "TODO: Implement" );
+return org.apache.commons.io.FileUtils.waitFor( file, duration );
}
public static File getFile( String file )
@@ -193,7 +191,7 @@ public class FileUtils
public static boolean contentEquals( File file1, File file2 )
throws IOExceptio
svn commit: r1133186 - /maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/Base64.java
Author: stephenc
Date: Tue Jun 7 22:46:31 2011
New Revision: 1133186
URL: http://svn.apache.org/viewvc?rev=1133186&view=rev
Log:
add impls for Base64
Modified:
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/Base64.java
Modified:
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/Base64.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/Base64.java?rev=1133186&r1=1133185&r2=1133186&view=diff
==
---
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/Base64.java
(original)
+++
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/Base64.java
Tue Jun 7 22:46:31 2011
@@ -29,36 +29,36 @@ public class Base64
public static boolean isArrayByteBase64(byte[] arrayOctect)
{
-throw new UnsupportedOperationException( "Not implemented yet" );
+return org.apache.commons.codec.binary.Base64.isArrayByteBase64(
arrayOctect );
}
public static byte[] encodeBase64(byte[] binaryData)
{
-throw new UnsupportedOperationException( "Not implemented yet" );
+return org.apache.commons.codec.binary.Base64.encodeBase64( binaryData
);
}
public static byte[] encodeBase64Chunked(byte[] binaryData)
{
-throw new UnsupportedOperationException( "Not implemented yet" );
+return org.apache.commons.codec.binary.Base64.encodeBase64Chunked(
binaryData );
}
public static byte[] encodeBase64(byte[] binaryData, boolean isChunked)
{
-throw new UnsupportedOperationException( "Not implemented yet" );
+return org.apache.commons.codec.binary.Base64.encodeBase64(
binaryData, isChunked );
}
public static byte[] decodeBase64(byte[] base64Data)
{
-throw new UnsupportedOperationException( "Not implemented yet" );
+return org.apache.commons.codec.binary.Base64.decodeBase64( base64Data
);
}
public byte[] encode(byte[] pArray)
{
-throw new UnsupportedOperationException( "Not implemented yet" );
+return org.apache.commons.codec.binary.Base64.encodeBase64( pArray );
}
public byte[] decode(byte[] pArray)
{
-throw new UnsupportedOperationException( "Not implemented yet" );
+return org.apache.commons.codec.binary.Base64.decodeBase64( pArray );
}
}
svn commit: r1133256 - /maven/site/trunk/pom.xml
Author: ltheussl Date: Wed Jun 8 06:22:29 2011 New Revision: 1133256 URL: http://svn.apache.org/viewvc?rev=1133256&view=rev Log: remove dead mailing lists Modified: maven/site/trunk/pom.xml Modified: maven/site/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/site/trunk/pom.xml?rev=1133256&r1=1133255&r2=1133256&view=diff == --- maven/site/trunk/pom.xml (original) +++ maven/site/trunk/pom.xml Wed Jun 8 06:22:29 2011 @@ -84,145 +84,6 @@ - - - Doxia Developer List - doxia-...@maven.apache.org - doxia-dev-subscr...@maven.apache.org - doxia-dev-unsubscr...@maven.apache.org - http://mail-archives.apache.org/mod_mbox/maven-doxia-dev/ - - http://www.mail-archive.com/doxia-dev@maven.apache.org - http://old.nabble.com/Doxia---dev-f11816.html - http://markmail.org/list/org.apache.maven.doxia-dev - - - - Doxia User List - doxia-us...@maven.apache.org - doxia-users-subscr...@maven.apache.org - doxia-users-unsubscr...@maven.apache.org - http://mail-archives.apache.org/mod_mbox/maven-doxia-users/ - - http://www.mail-archive.com/doxia-users@maven.apache.org - http://old.nabble.com/Doxia---Users-f14483.html - http://markmail.org/list/org.apache.maven.doxia-users - - - - Doxia Commits List - doxia-commits-subscr...@maven.apache.org - doxia-commits-unsubscr...@maven.apache.org - http://mail-archives.apache.org/mod_mbox/maven-doxia-commits/ - - http://www.mail-archive.com/doxia-commits@maven.apache.org - http://markmail.org/list/org.apache.maven.doxia-commits - - - - - - SCM Developer List - scm-dev-subscr...@maven.apache.org - scm-dev-unsubscr...@maven.apache.org - scm-...@maven.apache.org - http://mail-archives.apache.org/mod_mbox/maven-scm-dev - - http://www.mail-archive.com/scm-dev@maven.apache.org - http://markmail.org/list/org.apache.maven.scm-dev - - - - SCM User List - scm-users-subscr...@maven.apache.org - scm-users-unsubscr...@maven.apache.org - scm-us...@maven.apache.org - http://mail-archives.apache.org/mod_mbox/maven-scm-users - - http://www.mail-archive.com/scm-users@maven.apache.org - http://markmail.org/list/org.apache.maven.scm-users - - - - SCM Commits List - scm-commits-subscr...@maven.apache.org - scm-commits-unsubscr...@maven.apache.org - http://mail-archives.apache.org/mod_mbox/maven-scm-commits - - http://www.mail-archive.com/scm-commits@maven.apache.org - http://markmail.org/list/org.apache.maven.scm-commits - - - - - - Surefire User List - surefire-us...@maven.apache.org - surefire-users-subscr...@maven.apache.org - surefire-users-unsubscr...@maven.apache.org - http://mail-archives.apache.org/mod_mbox/maven-surefire-users/ - - http://www.mail-archive.com/surefire-users@maven.apache.org - http://markmail.org/list/org.apache.maven.surefire-users - - - - Surefire Developer List - surefire-...@maven.apache.org - surefire-dev-subscr...@maven.apache.org - surfire-dev-unsubscr...@maven.apache.org - http://mail-archives.apache.org/mod_mbox/maven-surefire-dev/ - - http://www.mail-archive.com/surefire-dev@maven.apache.org - http://markmail.org/list/org.apache.maven.surefire-dev - - - - Surefire Commits List - surefire-commits-subscr...@maven.apache.org - surefire-commits-unsubscr...@maven.apache.org - http://mail-archives.apache.org/mod_mbox/maven-surefire-commits/ - - http://www.mail-archive.com/surefire-commits@maven.apache.org - http://markmail.org/list/org.apache.maven.surefire-commits - - - - - - Wagon User List - wagon-us...@maven.apache.org - wagon-users-subscr...@maven.apache.org - wagon-users-unsubscr...@maven.apache.org - http://mail-archives.apache.org/mod_mbox/maven-wagon-users/ - - http://www.mail-archive.com/wagon-users@maven.apache.org - http://old.nabble.com/Wagon---Users-f13870.html - http://markmail.org/list/org.apache.maven.wagon-users - - - - Wagon Developer List - wagon-...@maven.apache.org - wagon-dev-subscr...@maven.apache.org - wagon-dev-unsubscr...@maven.apache.org - http://mail-archives.apache.org/mod_mbox/maven-wagon-dev/ - - http://www.mail-archive.com/wagon-dev@maven.apache.org - http://old.nabble.com/Wagon---Dev-f13871.html - http://markmail.org/list/org.apache.maven.wagon-dev - - - - Wagon Commits List - wagon-commits-subscr...@maven.apache.org - wagon-comm
svn commit: r1133257 - /maven/site/trunk/pom.xml
Author: ltheussl Date: Wed Jun 8 06:23:56 2011 New Revision: 1133257 URL: http://svn.apache.org/viewvc?rev=1133257&view=rev Log: get latest changes from parent Modified: maven/site/trunk/pom.xml Modified: maven/site/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/site/trunk/pom.xml?rev=1133257&r1=1133256&r2=1133257&view=diff == --- maven/site/trunk/pom.xml (original) +++ maven/site/trunk/pom.xml Wed Jun 8 06:23:56 2011 @@ -23,7 +23,7 @@ org.apache.maven maven-parent -19 +20-SNAPSHOT ../pom/maven/pom.xml
