product zip files now have a proper root folder

diff --git a/eu.etaxonomy.taxeditor/pom.xml b/eu.etaxonomy.taxeditor/pom.xml
index 9fcf21a641d9e0f2a52c2abb0a61db207263a72c..4d215fbfa97213d5d541cb3eecd92dd851403465 100644 (file)
--- a/eu.etaxonomy.taxeditor/pom.xml
+++ b/eu.etaxonomy.taxeditor/pom.xml
@@ -34,6 +34,14 @@
                                                </goals>
                                        </execution>
                                </executions>
                                                </goals>
                                        </execution>
                                </executions>

+                               <configuration>
+                                       <products>
+                                               <product>
+                                                       <id>eu.etaxonomy.taxeditor.product</id>
+                                                       <rootFolder>EDIT Taxonomic Editor</rootFolder>
+                                               </product>
+                                       </products>
+                               </configuration>

                        </plugin>
                </plugins>
        </build>
                        </plugin>
                </plugins>
        </build>

diff --git a/pom.xml b/pom.xml
index 15f22ce9c0d519921f0069302a6226f00319f3a3..bd37a5af9e92e5fc57354eb27dfd5c116ed53bff 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -124,15 +124,6 @@
                                <artifactId>target-platform-configuration</artifactId>
                                <version>${tycho.version}</version>
                                <configuration>
                                <artifactId>target-platform-configuration</artifactId>
                                <version>${tycho.version}</version>
                                <configuration>

-                                       <!--target>
-                                               <artifact>
-                                                       <groupId>eu.etaxonomy</groupId>
-                                                       <artifactId>eu.etaxonomy.taxeditor</artifactId>
-                                                       <version>${taxeditor.version}</version>
-                                                       <classifier>rcp</classifier>
-                                               </artifact>
-                                       </target-->
-                                       <!--ignoreTychoRepositories>true</ignoreTychoRepositories-->

                                        <environments>
                                                <environment>
                                                        <os>macosx</os>
                                        <environments>
                                                <environment>
                                                        <os>macosx</os>


@@ -291,48 +282,6 @@
                                </configuration>
                        </plugin>
                </plugins>
                                </configuration>
                        </plugin>
                </plugins>

-               <!--pluginManagement>
-                       <plugins>
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-jar-plugin</artifactId>
-                                       <version>2.3.1</version>
-                               </plugin>
-                               <plugin>
-                                       <groupId>org.codehaus.mojo</groupId>
-                                       <artifactId>wagon-maven-plugin</artifactId>
-                                       <version>1.0-beta-3</version>
-                               </plugin-->
-               <!--plugin>
-                                       <groupId>org.eclipse.tycho</groupId>
-                                       <artifactId>tycho-packaging-plugin</artifactId>
-                                       <version>${tycho.version}</version-->
-               <!--executions>
-                                               <execution>
-                                                       <id>timestamp</id>
-                                                       <phase>validate</phase>
-                                                       <goals>
-                                                               <goal>timestamp</goal>
-                                                       </goals>
-                                               </execution>
-                                       </executions-->
-               <!-- for some reason configuration won't work here, have to define
-                                       in each module -->
-               <!--configuration>
-                                               <archive>
-                                                       <addMavenDescriptor>false</addMavenDescriptor>
-                                               </archive>
-                                               <environments>
-                                                       <environment>
-                                                               <os>macosx</os>
-                                                               <ws>cocoa</ws>
-                                                               <arch>x86</arch>
-                                                       </environment>
-                                               </environments>
-                                       </configuration>
-                               </plugin-->
-               <!--/plugins>
-               </pluginManagement-->

                <extensions>
                        <extension>
                                <groupId>org.apache.maven.wagon</groupId>
                <extensions>
                        <extension>
                                <groupId>org.apache.maven.wagon</groupId>


@@ -408,13 +357,13 @@
                <site>
                        <id>wp5.e-taxonomy.eu</id>
                        <name>EDIT Taxonomic Editor</name>
                <site>
                        <id>wp5.e-taxonomy.eu</id>
                        <name>EDIT Taxonomic Editor</name>

-                       <url>scpexe://160.45.63.151/var/www/wp5.e-taxonomy.eu/taxeditor/</url>
+                       <url>scpexe://wp5.e-taxonomy.eu/var/www/wp5.e-taxonomy.eu/taxeditor/</url>

                </site>
                <repository>
                        <uniqueVersion>false</uniqueVersion>
                        <id>wp5.e-taxonomy.eu</id>
                        <name>Edit Maven Repository</name>
                </site>
                <repository>
                        <uniqueVersion>false</uniqueVersion>
                        <id>wp5.e-taxonomy.eu</id>
                        <name>Edit Maven Repository</name>

-                       <url>scpexe://160.45.63.151/var/www/wp5.e-taxonomy.eu/mavenrepo/</url>
+                       <url>scpexe://wp5.e-taxonomy.eu/var/www/wp5.e-taxonomy.eu/mavenrepo/</url>

                </repository>
        </distributionManagement>
 </project>
                </repository>
        </distributionManagement>
 </project>