Author: mes
Date: 2010-09-17 16:12:55 -0700 (Fri, 17 Sep 2010)
New Revision: 21931

Added:
   cytoscape/trunk/packaging/
   cytoscape/trunk/packaging/pom.xml
Removed:
   cytoscape/trunk/packaging/pom.xml
   cytoscape/trunk/release-bundles/
Modified:
   cytoscape/trunk/pom.xml
Log:
renamed release-bundles to packaging

Deleted: cytoscape/trunk/packaging/pom.xml
===================================================================
--- cytoscape/trunk/release-bundles/pom.xml     2010-09-17 18:38:00 UTC (rev 
21918)
+++ cytoscape/trunk/packaging/pom.xml   2010-09-17 23:12:55 UTC (rev 21931)
@@ -1,87 +0,0 @@
-<project xmlns="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";>
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>cytoscape</groupId>
-    <artifactId>parent</artifactId>
-    <version>2.8.0-beta2-SNAPSHOT</version>
-  </parent>
-
-  <groupId>cytoscape</groupId>
-  <artifactId>release-bundles</artifactId>
-  <packaging>jar</packaging>
-  <name>Cytoscape Release Bundles</name>
-
-  <pluginRepositories>
-    <pluginRepository>
-      <id>googlecode-maven-install4j</id>
-      <name>googlecode-maven-install4j</name>
-      <url>http://maven-install4j.googlecode.com/svn/m2-repo</url>
-    </pluginRepository>
-  </pluginRepositories>
-
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/install4j</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
-    <plugins>
-      <!-- This will unpack the distribution into the target directory -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack-distribution</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>unpack-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}</outputDirectory>
-              <excludeTransitive>true</excludeTransitive>
-              <includeTypes>zip</includeTypes>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <!-- This will create the bundles -->
-      <plugin>
-        <groupId>com.google.code.maven-install4j</groupId>
-        <artifactId>maven-install4j-plugin</artifactId>
-        <version>0.1.1</version>
-        <configuration>
-          <executable>/Applications/install4j 4/bin/install4jc</executable>
-          
<configFile>${project.build.outputDirectory}/Cytoscape.install4j</configFile>
-          <releaseId>${project.version}</releaseId>
-          <attach>true</attach>
-          <skipOnMissingExecutable>true</skipOnMissingExecutable>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>compile</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>cytoscape</groupId>
-      <artifactId>distribution</artifactId>
-      <version>${version}</version>
-      <type>zip</type>
-    </dependency>
-  </dependencies>
-
-</project>
-

Copied: cytoscape/trunk/packaging/pom.xml (from rev 21930, 
cytoscape/trunk/release-bundles/pom.xml)
===================================================================
--- cytoscape/trunk/packaging/pom.xml                           (rev 0)
+++ cytoscape/trunk/packaging/pom.xml   2010-09-17 23:12:55 UTC (rev 21931)
@@ -0,0 +1,119 @@
+<project xmlns="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";>
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>cytoscape</groupId>
+    <artifactId>parent</artifactId>
+    <version>2.8.0-beta2-SNAPSHOT</version>
+  </parent>
+
+  <groupId>cytoscape</groupId>
+  <artifactId>packaging</artifactId>
+  <packaging>jar</packaging>
+  <name>Cytoscape Release Bundle Packaging</name>
+
+  <pluginRepositories>
+    <pluginRepository>
+      <id>googlecode-maven-install4j</id>
+      <name>googlecode-maven-install4j</name>
+      <url>http://maven-install4j.googlecode.com/svn/m2-repo</url>
+    </pluginRepository>
+  </pluginRepositories>
+
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/install4j</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
+    <plugins>
+      <!-- This will unpack the distribution into the target directory,
+              copy the distribution into target/install4j directory, and
+                  unpack the javadoc in the target/install4j directory -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>unpack-distribution</id>
+            <phase>deploy</phase>
+            <goals>
+              <goal>unpack-dependencies</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}</outputDirectory>
+              <excludeTransitive>true</excludeTransitive>
+              <includeTypes>zip</includeTypes>
+            </configuration>
+          </execution>
+          <execution>
+            <id>unpack-javadoc</id>
+            <phase>deploy</phase>
+            <goals>
+              <goal>unpack-dependencies</goal>
+            </goals>
+            <configuration>
+              
<outputDirectory>${project.build.directory}/install4j/javadoc</outputDirectory>
+              <excludeTransitive>true</excludeTransitive>
+              <excludeGroupIds>junit</excludeGroupIds>
+              <includeClassifiers>javadoc</includeClassifiers>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-distribution</id>
+            <phase>deploy</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              
<outputDirectory>${project.build.directory}/install4j</outputDirectory>
+              <excludeTransitive>true</excludeTransitive>
+              <includeTypes>zip</includeTypes>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <!-- This will create the bundles -->
+      <plugin>
+        <groupId>com.google.code.maven-install4j</groupId>
+        <artifactId>maven-install4j-plugin</artifactId>
+        <version>0.1.1</version>
+        <configuration>
+          <executable>/Applications/install4j 4/bin/install4jc</executable>
+          
<configFile>${project.build.outputDirectory}/Cytoscape.install4j</configFile>
+          <releaseId>${project.version}</releaseId>
+          <attach>true</attach>
+          <skipOnMissingExecutable>true</skipOnMissingExecutable>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>deploy</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>cytoscape</groupId>
+      <artifactId>distribution</artifactId>
+      <version>${version}</version>
+      <type>zip</type>
+    </dependency>
+    <dependency>
+      <groupId>cytoscape</groupId>
+      <artifactId>javadoc</artifactId>
+      <version>${version}</version>
+      <classifier>javadoc</classifier>
+    </dependency>
+  </dependencies>
+</project>
+

Modified: cytoscape/trunk/pom.xml
===================================================================
--- cytoscape/trunk/pom.xml     2010-09-17 23:11:08 UTC (rev 21930)
+++ cytoscape/trunk/pom.xml     2010-09-17 23:12:55 UTC (rev 21931)
@@ -17,7 +17,7 @@
     <module>coreplugins</module>
     <module>javadoc</module>
     <module>distribution</module>
-    <module>release-bundles</module>
+    <module>packaging</module>
     <module>webstart</module>
   </modules>
 

-- 
You received this message because you are subscribed to the Google Groups 
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/cytoscape-cvs?hl=en.

Reply via email to