This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag maven-sling-plugin-2.0.4-incubator in repository https://gitbox.apache.org/repos/asf/sling-maven-sling-plugin.git
commit 1c70e6ee2b6f2939fe123c41d519c7d8ab581302 Author: Carsten Ziegeler <[email protected]> AuthorDate: Wed Feb 18 13:58:22 2009 +0000 SLING-861 : Rename mimeTypeForPut to just mimeType. git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/maven/maven-sling-plugin@745515 13f79535-47bb-0310-9956-ffa450edef68 --- .../bundlesupport/AbstractBundleInstallMojo.java | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleInstallMojo.java b/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleInstallMojo.java index 01e62b7..1f5a883 100644 --- a/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleInstallMojo.java +++ b/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleInstallMojo.java @@ -88,7 +88,7 @@ abstract class AbstractBundleInstallMojo extends AbstractBundlePostMojo { * If a simple HTTP PUT should be used instead of the standard POST to the * felix console. In the <code>uninstall</code> goal, a HTTP DELETE will be * used. - * + * * @parameter expression="${sling.usePut}" default-value="false" * @required */ @@ -97,13 +97,13 @@ abstract class AbstractBundleInstallMojo extends AbstractBundlePostMojo { /** * The content type / mime type used for the HTTP PUT (if * <code>sling.usePut=true</code>). - * - * @parameter expression="${sling.mimeTypeForPut}" + * + * @parameter expression="${sling.mimeType}" * default-value="application/java-archive" * @required */ - protected String mimeTypeForPut; - + protected String mimeType; + /** * The user name to authenticate at the running Sling instance. * @@ -199,19 +199,19 @@ abstract class AbstractBundleInstallMojo extends AbstractBundlePostMojo { getLog().info(bundleFile + " is not an OSGi Bundle, not uploading"); return; } - + String targetURL = getTargetURL(); getLog().info( "Installing Bundle " + bundleName + "(" + bundleFile + ") to " + targetURL + " via " + (usePut ? "PUT" : "POST")); - + if (usePut) { put(targetURL, bundleFile); } else { post(targetURL, bundleFile); } - + if ( mountByFS ) { configure(targetURL, bundleFile); } @@ -293,10 +293,10 @@ abstract class AbstractBundleInstallMojo extends AbstractBundlePostMojo { protected void put(String targetURL, File file) throws MojoExecutionException { PutMethod filePut = new PutMethod(getPutURL(targetURL, file.getName())); - + try { - filePut.setRequestEntity(new FileRequestEntity(file, mimeTypeForPut)); - + filePut.setRequestEntity(new FileRequestEntity(file, mimeType)); + int status = getHttpClient().executeMethod(filePut); if (status >= 200 && status < 300) { getLog().info("Bundle installed"); @@ -312,7 +312,7 @@ abstract class AbstractBundleInstallMojo extends AbstractBundlePostMojo { filePut.releaseConnection(); } } - + /** * Add configurations to a running OSGi instance for initial content. * @param targetURL The web console base url -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
