summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Donszelmann <Mark.Donszelmann@gmail.com>2009-11-03 09:39:47 +0100
committerMark Donszelmann <Mark.Donszelmann@gmail.com>2009-11-03 09:39:47 +0100
commit69ee41fe12a65686eb5cc809ba82236d6a5f94fa (patch)
tree92c58b2235ac10c9321510234848bfd03665940b
parent074146277b2f385869435bd84deccdf7386cb83d (diff)
downloadmaven-nar-plugin-69ee41fe12a65686eb5cc809ba82236d6a5f94fa.tar.gz
maven-nar-plugin-69ee41fe12a65686eb5cc809ba82236d6a5f94fa.tar.bz2
maven-nar-plugin-69ee41fe12a65686eb5cc809ba82236d6a5f94fa.tar.xz
maven-nar-plugin-69ee41fe12a65686eb5cc809ba82236d6a5f94fa.zip
Added different layouts; Fixed part of NAR-90
-rw-r--r--pom.xml2
-rw-r--r--src/main/java/org/apache/maven/plugin/nar/DefaultNarLayout.java42
-rw-r--r--src/main/java/org/apache/maven/plugin/nar/NarLayout20.java77
-rw-r--r--src/main/java/org/apache/maven/plugin/nar/NarLayout21.java80
4 files changed, 159 insertions, 42 deletions
diff --git a/pom.xml b/pom.xml
index bae006e..80ace45 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,7 +136,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
<executions>
<execution>
<phase>validate</phase>
diff --git a/src/main/java/org/apache/maven/plugin/nar/DefaultNarLayout.java b/src/main/java/org/apache/maven/plugin/nar/DefaultNarLayout.java
index 719e906..604ee85 100644
--- a/src/main/java/org/apache/maven/plugin/nar/DefaultNarLayout.java
+++ b/src/main/java/org/apache/maven/plugin/nar/DefaultNarLayout.java
@@ -25,46 +25,6 @@ import java.io.File;
* @author Mark Donszelmann (Mark.Donszelmann@gmail.com)
*/
public class DefaultNarLayout
- implements NarLayout
+ extends NarLayout21
{
- public File getAolDirectory( File baseDir )
- {
- return new File( baseDir, "aol" );
- }
-
- public File getNoarchDirectory( File baseDir )
- {
- return new File( baseDir, "noarch" );
- }
-
- private File getAolDirectory( File baseDir, String aol, String type )
- {
- return new File( getAolDirectory( baseDir ), aol + "-" + type );
- }
-
- /*
- * (non-Javadoc)
- * @see org.apache.maven.plugin.nar.NarLayout#getIncludeDirectory(java.io.File)
- */
- public File getIncludeDirectory( File baseDir )
- {
- File dir = getNoarchDirectory( baseDir );
- dir = new File( dir, "include" );
- return dir;
- }
-
- /*
- * (non-Javadoc)
- * @see org.apache.maven.plugin.nar.NarLayout#getLibDir(org.apache.maven.plugin.nar.AOL, java.lang.String)
- */
- public File getLibDirectory( File baseDir, String aol, String type )
- {
- File dir = getAolDirectory( baseDir, aol, type );
- dir = new File( dir, type.equals( Library.EXECUTABLE ) ? "bin" : "lib" );
- dir = new File( dir, aol.toString() );
- if ( !dir.equals( Library.EXECUTABLE ) )
- dir = new File( dir, type );
- return dir;
- }
-
}
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarLayout20.java b/src/main/java/org/apache/maven/plugin/nar/NarLayout20.java
new file mode 100644
index 0000000..9cd4f9d
--- /dev/null
+++ b/src/main/java/org/apache/maven/plugin/nar/NarLayout20.java
@@ -0,0 +1,77 @@
+package org.apache.maven.plugin.nar;
+
+import java.io.File;
+
+/*
+ * 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.
+ */
+
+/**
+ * Initial layout which expands a nar file into:
+ *
+ * <pre>
+ * nar/includue
+ * nar/bin
+ * nar/lib
+ * </pre>
+ *
+ * this layout was abandoned bacuse there is no one-to-one relation between the
+ * nar file and its directory structure. Therefore SNAPSHOTS could not be fully
+ * deleted when replaced.
+ *
+ * @author Mark Donszelmann (Mark.Donszelmann@gmail.com)
+ */
+public class NarLayout20
+ implements NarLayout
+{
+ public File getAolDirectory( File baseDir )
+ {
+ return baseDir;
+ }
+
+ public File getNoarchDirectory( File baseDir )
+ {
+ return baseDir;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.apache.maven.plugin.nar.NarLayout#getIncludeDirectory(java.io.File)
+ */
+ public File getIncludeDirectory( File baseDir )
+ {
+ File dir = getNoarchDirectory( baseDir );
+ dir = new File( dir, "include" );
+ return dir;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.apache.maven.plugin.nar.NarLayout#getLibDir(org.apache.maven.plugin.nar.AOL, java.lang.String)
+ */
+ public File getLibDirectory( File baseDir, String aol, String type )
+ {
+ File dir = getAolDirectory( baseDir );
+ dir = new File( dir, type.equals( Library.EXECUTABLE ) ? "bin" : "lib" );
+ dir = new File( dir, aol.toString() );
+ if ( !type.equals( Library.EXECUTABLE ) )
+ dir = new File( dir, type );
+ return dir;
+ }
+
+}
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarLayout21.java b/src/main/java/org/apache/maven/plugin/nar/NarLayout21.java
new file mode 100644
index 0000000..074d594
--- /dev/null
+++ b/src/main/java/org/apache/maven/plugin/nar/NarLayout21.java
@@ -0,0 +1,80 @@
+package org.apache.maven.plugin.nar;
+
+import java.io.File;
+
+/*
+ * 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.
+ */
+
+/**
+ * Layout which expands a nar file into:
+ *
+ * <pre>
+ * nar/noarch/include
+ * nar/aol/<aol>-<type>/bin
+ * nar/aol/<aol>-<type>/lib
+ * </pre>
+ *
+ * This loayout has a one-to-one relation with the aol-type version of the nar.
+ *
+ * @author Mark Donszelmann (Mark.Donszelmann@gmail.com)
+ */
+public class NarLayout21
+ implements NarLayout
+{
+ public File getAolDirectory( File baseDir )
+ {
+ return new File( baseDir, "aol" );
+ }
+
+ public File getNoarchDirectory( File baseDir )
+ {
+ return new File( baseDir, "noarch" );
+ }
+
+ private File getAolDirectory( File baseDir, String aol, String type )
+ {
+ return new File( getAolDirectory( baseDir ), aol + "-" + type );
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.apache.maven.plugin.nar.NarLayout#getIncludeDirectory(java.io.File)
+ */
+ public File getIncludeDirectory( File baseDir )
+ {
+ File dir = getNoarchDirectory( baseDir );
+ dir = new File( dir, "include" );
+ return dir;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.apache.maven.plugin.nar.NarLayout#getLibDir(org.apache.maven.plugin.nar.AOL, java.lang.String)
+ */
+ public File getLibDirectory( File baseDir, String aol, String type )
+ {
+ File dir = getAolDirectory( baseDir, aol, type );
+ dir = new File( dir, type.equals( Library.EXECUTABLE ) ? "bin" : "lib" );
+ dir = new File( dir, aol.toString() );
+ if ( !type.equals( Library.EXECUTABLE ) )
+ dir = new File( dir, type );
+ return dir;
+ }
+
+}