You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2012/07/30 22:54:56 UTC
svn commit: r1367293 - in /maven/plugins/trunk/maven-war-plugin/src:
main/java/org/apache/maven/plugin/war/packaging/
test/java/org/apache/maven/plugin/war/
test/java/org/apache/maven/plugin/war/stub/ test/resources/unit/sample_wars/
Author: olamy
Date: Mon Jul 30 20:54:56 2012
New Revision: 1367293
URL: http://svn.apache.org/viewvc?rev=1367293&view=rev
Log:
[MWAR-281] Allow Synapse extensions (.xar files) to be imported into WEB-INF/extensions
Submitted by Auke Schrijnen.
Added:
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/XarArtifactStub.java (with props)
maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/sample_wars/simple.xar
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java?rev=1367293&r1=1367292&r2=1367293&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java Mon Jul 30 20:54:56 2012
@@ -48,6 +48,8 @@ public class ArtifactsPackagingTask
public static final String MODULES_PATH = "WEB-INF/modules/";
+ public static final String EXTENSIONS_PATH = "WEB-INF/extensions/";
+
private final Set artifacts;
private final String id;
@@ -100,6 +102,10 @@ public class ArtifactsPackagingTask
{
copyFile( id, context, artifact.getFile(), MODULES_PATH + targetFileName );
}
+ else if ( "xar".equals( type ) )
+ {
+ copyFile( id, context, artifact.getFile(), EXTENSIONS_PATH + targetFileName );
+ }
else if ( "jar".equals( type ) || "ejb".equals( type ) || "ejb-client".equals( type )
|| "test-jar".equals( type ) )
{
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java?rev=1367293&r1=1367292&r2=1367293&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java Mon Jul 30 20:54:56 2012
@@ -60,6 +60,7 @@ public class DependenciesAnalysisPackagi
context.getLog().warn( warOrZipMessage );
}
else if ( "tld".equals( dependency.getType() ) || "aar".equals( dependency.getType() )
+ || "mar".equals( dependency.getType() ) || "xar".equals( dependency.getType() )
|| "jar".equals( dependency.getType() ) || "ejb".equals( dependency.getType() )
|| "ejb-client".equals( dependency.getType() ) || "test-jar".equals( dependency.getType() )
|| "par".equals( dependency.getType() ) )
@@ -80,6 +81,7 @@ public class DependenciesAnalysisPackagi
context.getLog().warn( warOrZipMessage );
}
else if ( "tld".equals( dependency.getType() ) || "aar".equals( dependency.getType() )
+ || "mar".equals( dependency.getType() ) || "xar".equals( dependency.getType() )
|| "jar".equals( dependency.getType() ) || "ejb".equals( dependency.getType() )
|| "ejb-client".equals( dependency.getType() ) || "test-jar".equals( dependency.getType() )
|| "par".equals( dependency.getType() ) )
@@ -108,6 +110,16 @@ public class DependenciesAnalysisPackagi
targetFile =
new File( context.getWebappDirectory(), ArtifactsPackagingTask.SERVICES_PATH + targetFileName );
}
+ else if ( "mar".equals( type ) )
+ {
+ targetFile =
+ new File( context.getWebappDirectory(), ArtifactsPackagingTask.MODULES_PATH + targetFileName );
+ }
+ else if ( "xar".equals( type ) )
+ {
+ targetFile =
+ new File( context.getWebappDirectory(), ArtifactsPackagingTask.EXTENSIONS_PATH + targetFileName );
+ }
else if ( "jar".equals( type ) || "ejb".equals( type ) || "ejb-client".equals( type )
|| "test-jar".equals( type ) )
{
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java?rev=1367293&r1=1367292&r2=1367293&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java Mon Jul 30 20:54:56 2012
@@ -34,6 +34,7 @@ import org.apache.maven.plugin.war.stub.
import org.apache.maven.plugin.war.stub.ResourceStub;
import org.apache.maven.plugin.war.stub.TLDArtifactStub;
import org.apache.maven.plugin.war.stub.WarArtifactStub;
+import org.apache.maven.plugin.war.stub.XarArtifactStub;
import org.codehaus.plexus.util.FileUtils;
import java.io.File;
@@ -634,6 +635,43 @@ public class WarExplodedMojoTest
expectedJarArtifact.delete();
}
+ public void testExplodedWarWithXar()
+ throws Exception
+ {
+ // setup test data
+ String testId = "ExplodedWarWithXar";
+ MavenProjectArtifactsStub project = new MavenProjectArtifactsStub();
+ File webAppDirectory = new File( getTestDirectory(), testId );
+ File webAppSource = createWebAppSource( testId );
+ File classesDir = createClassesDir( testId, true );
+ // Fake here since the xar artifact handler does not exist: no biggie
+ ArtifactHandler artifactHandler = (ArtifactHandler) lookup( ArtifactHandler.ROLE, "jar" );
+ ArtifactStub xarArtifact = new XarArtifactStub( getBasedir(), artifactHandler );
+ File xarFile = xarArtifact.getFile();
+
+ assertTrue( "jar not found: " + xarFile.toString(), xarFile.exists() );
+
+ // configure mojo
+ project.addArtifact( xarArtifact );
+ this.configureMojo( mojo, new LinkedList(), classesDir, webAppSource, webAppDirectory, project );
+ mojo.execute();
+
+ // validate operation
+ File expectedWebSourceFile = new File( webAppDirectory, "pansit.jsp" );
+ File expectedWebSource2File = new File( webAppDirectory, "org/web/app/last-exile.jsp" );
+ // final name form is <artifactId>-<version>.<type>
+ File expectedJarArtifact = new File( webAppDirectory, "WEB-INF/extensions/xarartifact-0.0-Test.jar" );
+
+ assertTrue( "source files not found: " + expectedWebSourceFile.toString(), expectedWebSourceFile.exists() );
+ assertTrue( "source files not found: " + expectedWebSource2File.toString(), expectedWebSource2File.exists() );
+ assertTrue( "jar artifact not found: " + expectedJarArtifact.toString(), expectedJarArtifact.exists() );
+
+ // house keeping
+ expectedWebSourceFile.delete();
+ expectedWebSource2File.delete();
+ expectedJarArtifact.delete();
+ }
+
/**
* @throws Exception
*/
Added: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/XarArtifactStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/XarArtifactStub.java?rev=1367293&view=auto
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/XarArtifactStub.java (added)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/XarArtifactStub.java Mon Jul 30 20:54:56 2012
@@ -0,0 +1,80 @@
+package org.apache.maven.plugin.war.stub;
+
+/*
+ * 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.maven.artifact.handler.ArtifactHandler;
+
+import java.io.File;
+
+/**
+ * @author Auke Schrijnen
+ * @version $Id$
+ */
+public class XarArtifactStub
+ extends AbstractArtifactStub
+{
+ protected String groupId;
+
+ private ArtifactHandler artifactHandler;
+
+ public XarArtifactStub( String basedir, ArtifactHandler artifactHandler )
+ {
+ super( basedir );
+ this.artifactHandler = artifactHandler;
+ }
+
+ public void setGroupId( String id )
+ {
+ groupId = id;
+ }
+
+ public String getGroupId()
+ {
+ if ( groupId != null )
+ {
+ return groupId;
+ }
+ else
+ {
+ return "org.sample.xar";
+ }
+ }
+
+ public String getType()
+ {
+ return "xar";
+ }
+
+ public String getArtifactId()
+ {
+ return "xarartifact";
+ }
+
+ public File getFile()
+ {
+ return new File( basedir, "/target/test-classes/unit/sample_wars/simple.xar" );
+ }
+
+ public ArtifactHandler getArtifactHandler()
+ {
+ return artifactHandler;
+ }
+}
Propchange: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/XarArtifactStub.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/XarArtifactStub.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/sample_wars/simple.xar
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/sample_wars/simple.xar?rev=1367293&view=auto
==============================================================================
(empty)