From: <fu...@us...> - 2010-11-22 06:03:41
|
Revision: 1175 http://cishell.svn.sourceforge.net/cishell/?rev=1175&view=rev Author: fugu13 Date: 2010-11-22 06:03:33 +0000 (Mon, 22 Nov 2010) Log Message: ----------- okay, this is nearly, but not quite, at a working product build Modified Paths: -------------- branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/pom.xml branches/tycho/clients/gui/org.cishell.reference.gui.datamanager/pom.xml branches/tycho/clients/gui/org.cishell.reference.gui.guibuilder.swt/META-INF/MANIFEST.MF branches/tycho/clients/gui/org.cishell.reference.gui.guibuilder.swt/pom.xml branches/tycho/clients/gui/org.cishell.reference.gui.log/pom.xml branches/tycho/clients/gui/org.cishell.reference.gui.menumanager/pom.xml branches/tycho/clients/gui/org.cishell.reference.gui.persistence/pom.xml branches/tycho/clients/gui/org.cishell.reference.gui.prefs.swt/META-INF/MANIFEST.MF branches/tycho/clients/gui/org.cishell.reference.gui.prefs.swt/pom.xml branches/tycho/clients/gui/org.cishell.reference.gui.scheduler/pom.xml branches/tycho/clients/gui/org.cishell.reference.gui.workspace/pom.xml branches/tycho/core/core-build/pom.xml branches/tycho/deployment/deployment-parent/pom.xml branches/tycho/libs/colt/pom.xml branches/tycho/libs/com.google.collections/pom.xml branches/tycho/libs/commons-collections/pom.xml branches/tycho/libs/concurrent/pom.xml branches/tycho/libs/jung/pom.xml branches/tycho/libs/org.prefuse/pom.xml Added Paths: ----------- branches/tycho/clients/gui/gui-build/ branches/tycho/clients/gui/gui-build/pom.xml branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/src/main/ branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/src/main/java/ branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/src/main/java/org/ branches/tycho/clients/gui/org.cishell.reference.gui.datamanager/src/main/ branches/tycho/clients/gui/org.cishell.reference.gui.datamanager/src/main/java/ branches/tycho/clients/gui/org.cishell.reference.gui.datamanager/src/main/java/org/ branches/tycho/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/main/ branches/tycho/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/main/java/ branches/tycho/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/main/java/org/ branches/tycho/clients/gui/org.cishell.reference.gui.log/src/main/ branches/tycho/clients/gui/org.cishell.reference.gui.log/src/main/java/ branches/tycho/clients/gui/org.cishell.reference.gui.log/src/main/java/org/ branches/tycho/clients/gui/org.cishell.reference.gui.menumanager/src/main/ branches/tycho/clients/gui/org.cishell.reference.gui.menumanager/src/main/java/ branches/tycho/clients/gui/org.cishell.reference.gui.menumanager/src/main/java/org/ branches/tycho/clients/gui/org.cishell.reference.gui.persistence/src/main/ branches/tycho/clients/gui/org.cishell.reference.gui.persistence/src/main/java/ branches/tycho/clients/gui/org.cishell.reference.gui.persistence/src/main/java/org/ branches/tycho/clients/gui/org.cishell.reference.gui.prefs.swt/src/main/ branches/tycho/clients/gui/org.cishell.reference.gui.prefs.swt/src/main/java/ branches/tycho/clients/gui/org.cishell.reference.gui.prefs.swt/src/main/java/org/ branches/tycho/clients/gui/org.cishell.reference.gui.scheduler/src/main/ branches/tycho/clients/gui/org.cishell.reference.gui.scheduler/src/main/java/ branches/tycho/clients/gui/org.cishell.reference.gui.scheduler/src/main/java/org/ branches/tycho/clients/gui/org.cishell.reference.gui.workspace/src/main/ branches/tycho/clients/gui/org.cishell.reference.gui.workspace/src/main/java/ branches/tycho/clients/gui/org.cishell.reference.gui.workspace/src/main/java/org/ branches/tycho/deployment/org.cishell.reference.gui.feature/ branches/tycho/deployment/org.cishell.reference.gui.feature/build.properties branches/tycho/deployment/org.cishell.reference.gui.feature/feature.xml branches/tycho/deployment/org.cishell.reference.gui.feature/pom.xml branches/tycho/deployment/org.cishell.reference.product/ branches/tycho/deployment/org.cishell.reference.product/cishell.product branches/tycho/deployment/org.cishell.reference.product/pom.xml branches/tycho/lib-dependencies/ branches/tycho/lib-dependencies/pom.xml Removed Paths: ------------- branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/src/org/ branches/tycho/clients/gui/org.cishell.reference.gui.datamanager/src/org/ branches/tycho/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/ branches/tycho/clients/gui/org.cishell.reference.gui.log/src/org/ branches/tycho/clients/gui/org.cishell.reference.gui.menumanager/src/org/ branches/tycho/clients/gui/org.cishell.reference.gui.persistence/src/org/ branches/tycho/clients/gui/org.cishell.reference.gui.prefs.swt/src/org/ branches/tycho/clients/gui/org.cishell.reference.gui.scheduler/src/org/ branches/tycho/clients/gui/org.cishell.reference.gui.workspace/src/org/ branches/tycho/clients/gui/pom.xml Added: branches/tycho/clients/gui/gui-build/pom.xml =================================================================== --- branches/tycho/clients/gui/gui-build/pom.xml (rev 0) +++ branches/tycho/clients/gui/gui-build/pom.xml 2010-11-22 06:03:33 UTC (rev 1175) @@ -0,0 +1,81 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <groupId>cishell</groupId> + <artifactId>gui</artifactId> + <version>1.0.0</version> + <packaging>pom</packaging> + <properties> + <tycho-version>0.10.0</tycho-version> + </properties> + + + <modules> + <module>../org.cishell.reference.gui.brand.cishell</module> + <module>../org.cishell.reference.gui.datamanager</module> + <module>../org.cishell.reference.gui.guibuilder.swt</module> + <module>../org.cishell.reference.gui.log</module> + <module>../org.cishell.reference.gui.menumanager</module> + <module>../org.cishell.reference.gui.persistence</module> + <module>../org.cishell.reference.gui.prefs.swt</module> + <module>../org.cishell.reference.gui.scheduler</module> + <module>../org.cishell.reference.gui.workspace</module> + </modules> + + <repositories> + <repository> + <id>ganymede</id> + <layout>p2</layout> + <url>http://download.eclipse.org/eclipse/updates/3.4</url> + </repository> + </repositories> + <dependencies> +<!-- <dependency> + <groupId>org.eclipse.core</groupId> + <artifactId>runtime</artifactId> + <version>3.3.100-v20070530</version> + </dependency> + <dependency> + <groupId>org.eclipse</groupId> + <artifactId>ui</artifactId> + <version>3.3.0-I20070614-0800</version> + </dependency> --> + <dependency> + <groupId>cishell</groupId> + <artifactId>org.cishell.reference</artifactId> + <version>1.0.0</version> + </dependency> + <dependency> + <groupId>cishell</groupId> + <artifactId>org.cishell.framework</artifactId> + <version>1.0.0</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>tycho-maven-plugin</artifactId> + <version>${tycho-version}</version> + <extensions>true</extensions> + </plugin> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho-version}</version> + <configuration> + <resolver>p2</resolver> + <pomDependencies>consider</pomDependencies> + <environments> + <environment> + <os>linux</os> + <ws>gtk</ws> + <arch>x86</arch> + </environment> + </environments> + </configuration> + </plugin> + </plugins> + </build> +</project> Modified: branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/pom.xml =================================================================== --- branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/pom.xml 2010-11-21 00:59:34 UTC (rev 1174) +++ branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/pom.xml 2010-11-22 06:03:33 UTC (rev 1175) @@ -6,6 +6,7 @@ <artifactId>gui</artifactId> <groupId>cishell</groupId> <version>1.0.0</version> + <relativePath>../gui-build/pom.xml</relativePath> </parent> <groupId>cishell</groupId> <artifactId>org.cishell.reference.gui.brand.cishell</artifactId> Modified: branches/tycho/clients/gui/org.cishell.reference.gui.datamanager/pom.xml =================================================================== --- branches/tycho/clients/gui/org.cishell.reference.gui.datamanager/pom.xml 2010-11-21 00:59:34 UTC (rev 1174) +++ branches/tycho/clients/gui/org.cishell.reference.gui.datamanager/pom.xml 2010-11-22 06:03:33 UTC (rev 1175) @@ -6,6 +6,7 @@ <artifactId>gui</artifactId> <groupId>cishell</groupId> <version>1.0.0</version> + <relativePath>../gui-build/pom.xml</relativePath> </parent> <groupId>cishell</groupId> <artifactId>org.cishell.reference.gui.datamanager</artifactId> Modified: branches/tycho/clients/gui/org.cishell.reference.gui.guibuilder.swt/META-INF/MANIFEST.MF =================================================================== --- branches/tycho/clients/gui/org.cishell.reference.gui.guibuilder.swt/META-INF/MANIFEST.MF 2010-11-21 00:59:34 UTC (rev 1174) +++ branches/tycho/clients/gui/org.cishell.reference.gui.guibuilder.swt/META-INF/MANIFEST.MF 2010-11-22 06:03:33 UTC (rev 1175) @@ -6,8 +6,8 @@ Bundle-Localization: plugin Import-Package: org.cishell.framework, org.cishell.service.guibuilder, - org.eclipse.ui, org.osgi.framework;version="1.3.0", org.osgi.service.metatype;version="1.1.0" -Require-Bundle: org.eclipse.swt +Require-Bundle: org.eclipse.swt, + org.eclipse.ui Export-Package: org.cishell.reference.gui.guibuilder.swt Modified: branches/tycho/clients/gui/org.cishell.reference.gui.guibuilder.swt/pom.xml =================================================================== --- branches/tycho/clients/gui/org.cishell.reference.gui.guibuilder.swt/pom.xml 2010-11-21 00:59:34 UTC (rev 1174) +++ branches/tycho/clients/gui/org.cishell.reference.gui.guibuilder.swt/pom.xml 2010-11-22 06:03:33 UTC (rev 1175) @@ -6,6 +6,7 @@ <artifactId>gui</artifactId> <groupId>cishell</groupId> <version>1.0.0</version> + <relativePath>../gui-build/pom.xml</relativePath> </parent> <groupId>cishell</groupId> <artifactId>org.cishell.reference.gui.guibuilder.swt</artifactId> Modified: branches/tycho/clients/gui/org.cishell.reference.gui.log/pom.xml =================================================================== --- branches/tycho/clients/gui/org.cishell.reference.gui.log/pom.xml 2010-11-21 00:59:34 UTC (rev 1174) +++ branches/tycho/clients/gui/org.cishell.reference.gui.log/pom.xml 2010-11-22 06:03:33 UTC (rev 1175) @@ -6,6 +6,7 @@ <artifactId>gui</artifactId> <groupId>cishell</groupId> <version>1.0.0</version> + <relativePath>../gui-build/pom.xml</relativePath> </parent> <groupId>cishell</groupId> <artifactId>org.cishell.reference.gui.log</artifactId> Modified: branches/tycho/clients/gui/org.cishell.reference.gui.menumanager/pom.xml =================================================================== --- branches/tycho/clients/gui/org.cishell.reference.gui.menumanager/pom.xml 2010-11-21 00:59:34 UTC (rev 1174) +++ branches/tycho/clients/gui/org.cishell.reference.gui.menumanager/pom.xml 2010-11-22 06:03:33 UTC (rev 1175) @@ -6,6 +6,7 @@ <artifactId>gui</artifactId> <groupId>cishell</groupId> <version>1.0.0</version> + <relativePath>../gui-build/pom.xml</relativePath> </parent> <groupId>cishell</groupId> <artifactId>org.cishell.reference.gui.menumanager</artifactId> Modified: branches/tycho/clients/gui/org.cishell.reference.gui.persistence/pom.xml =================================================================== --- branches/tycho/clients/gui/org.cishell.reference.gui.persistence/pom.xml 2010-11-21 00:59:34 UTC (rev 1174) +++ branches/tycho/clients/gui/org.cishell.reference.gui.persistence/pom.xml 2010-11-22 06:03:33 UTC (rev 1175) @@ -6,6 +6,7 @@ <artifactId>gui</artifactId> <groupId>cishell</groupId> <version>1.0.0</version> + <relativePath>../gui-build/pom.xml</relativePath> </parent> <groupId>cishell</groupId> <artifactId>org.cishell.reference.gui.persistence</artifactId> Modified: branches/tycho/clients/gui/org.cishell.reference.gui.prefs.swt/META-INF/MANIFEST.MF =================================================================== --- branches/tycho/clients/gui/org.cishell.reference.gui.prefs.swt/META-INF/MANIFEST.MF 2010-11-21 00:59:34 UTC (rev 1174) +++ branches/tycho/clients/gui/org.cishell.reference.gui.prefs.swt/META-INF/MANIFEST.MF 2010-11-22 06:03:33 UTC (rev 1175) @@ -4,6 +4,7 @@ Bundle-SymbolicName: org.cishell.reference.gui.prefs.swt Bundle-Version: 0.0.1 Bundle-ClassPath: . +Require-Bundle: org.eclipse.ui Import-Package: org.cishell.framework, org.cishell.framework.algorithm, org.cishell.framework.data, @@ -19,7 +20,6 @@ org.eclipse.swt.graphics, org.eclipse.swt.layout, org.eclipse.swt.widgets, - org.eclipse.ui, org.osgi.framework;version="1.3.0", org.osgi.service.cm;version="1.2.0", org.osgi.service.component;version="1.0.0", Modified: branches/tycho/clients/gui/org.cishell.reference.gui.prefs.swt/pom.xml =================================================================== --- branches/tycho/clients/gui/org.cishell.reference.gui.prefs.swt/pom.xml 2010-11-21 00:59:34 UTC (rev 1174) +++ branches/tycho/clients/gui/org.cishell.reference.gui.prefs.swt/pom.xml 2010-11-22 06:03:33 UTC (rev 1175) @@ -6,6 +6,7 @@ <artifactId>gui</artifactId> <groupId>cishell</groupId> <version>1.0.0</version> + <relativePath>../gui-build/pom.xml</relativePath> </parent> <groupId>cishell</groupId> <artifactId>org.cishell.reference.gui.prefs.swt</artifactId> Modified: branches/tycho/clients/gui/org.cishell.reference.gui.scheduler/pom.xml =================================================================== --- branches/tycho/clients/gui/org.cishell.reference.gui.scheduler/pom.xml 2010-11-21 00:59:34 UTC (rev 1174) +++ branches/tycho/clients/gui/org.cishell.reference.gui.scheduler/pom.xml 2010-11-22 06:03:33 UTC (rev 1175) @@ -6,6 +6,7 @@ <artifactId>gui</artifactId> <groupId>cishell</groupId> <version>1.0.0</version> + <relativePath>../gui-build/pom.xml</relativePath> </parent> <groupId>cishell</groupId> <artifactId>org.cishell.reference.gui.scheduler</artifactId> Modified: branches/tycho/clients/gui/org.cishell.reference.gui.workspace/pom.xml =================================================================== --- branches/tycho/clients/gui/org.cishell.reference.gui.workspace/pom.xml 2010-11-21 00:59:34 UTC (rev 1174) +++ branches/tycho/clients/gui/org.cishell.reference.gui.workspace/pom.xml 2010-11-22 06:03:33 UTC (rev 1175) @@ -6,6 +6,7 @@ <artifactId>gui</artifactId> <groupId>cishell</groupId> <version>1.0.0</version> + <relativePath>../gui-build/pom.xml</relativePath> </parent> <groupId>cishell</groupId> <artifactId>org.cishell.reference.gui.workspace</artifactId> Deleted: branches/tycho/clients/gui/pom.xml =================================================================== --- branches/tycho/clients/gui/pom.xml 2010-11-21 00:59:34 UTC (rev 1174) +++ branches/tycho/clients/gui/pom.xml 2010-11-22 06:03:33 UTC (rev 1175) @@ -1,57 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - <groupId>cishell</groupId> - <artifactId>gui</artifactId> - <version>1.0.0</version> - <packaging>pom</packaging> - <properties> - <tycho-version>0.10.0</tycho-version> - </properties> - - - <modules> - <module>org.cishell.reference.gui.brand.cishell</module> - <module>org.cishell.reference.gui.datamanager</module> - <module>org.cishell.reference.gui.guibuilder.swt</module> - <module>org.cishell.reference.gui.log</module> - <module>org.cishell.reference.gui.menumanager</module> - <module>org.cishell.reference.gui.persistence</module> - <module>org.cishell.reference.gui.prefs.swt</module> - <module>org.cishell.reference.gui.scheduler</module> - <module>org.cishell.reference.gui.workspace</module> - <module>../../core/core-build</module> - </modules> - <dependencies> - <dependency> - <groupId>org.eclipse.core</groupId> - <artifactId>runtime</artifactId> - <version>3.3.100-v20070530</version> - </dependency> - <dependency> - <groupId>org.eclipse</groupId> - <artifactId>ui</artifactId> - <version>3.3.0-I20070614-0800</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.sonatype.tycho</groupId> - <artifactId>tycho-maven-plugin</artifactId> - <version>0.10.0</version> - <extensions>true</extensions> - </plugin> - <plugin> - <groupId>org.sonatype.tycho</groupId> - <artifactId>target-platform-configuration</artifactId> - <version>${tycho-version}</version> - <configuration> - <resolver>p2</resolver> - <pomDependencies>consider</pomDependencies> - </configuration> - </plugin> - </plugins> - </build> -</project> Modified: branches/tycho/core/core-build/pom.xml =================================================================== --- branches/tycho/core/core-build/pom.xml 2010-11-21 00:59:34 UTC (rev 1174) +++ branches/tycho/core/core-build/pom.xml 2010-11-22 06:03:33 UTC (rev 1175) @@ -11,7 +11,15 @@ <version>1.0.0</version> <packaging>pom</packaging> + + <parent> + <groupId>cishell</groupId> + <artifactId>lib-dependencies</artifactId> + <version>1.0.0</version> + <relativePath>../../lib-dependencies/pom.xml</relativePath> + </parent> + <scm> <connection>scm:svn:http://cishell.svn.sourceforge.net/svnroot/cishell/branches/tycho/core</connection> <developerConnection>scm:svn:https://cishell.svn.sourceforge.net/svnroot/cishell/branches/tycho/core</developerConnection> @@ -35,16 +43,16 @@ <module>../org.cishell.reference.prefs.admin</module> </modules> - <dependencies> +<!-- <dependencies> <dependency> <groupId>cishell.libs</groupId> <artifactId>jung</artifactId> - <version>1.7.6-001-SNAPSHOT</version> + <version>1.7.6-001</version> </dependency> <dependency> <groupId>cishell.libs</groupId> <artifactId>com.google.collections</artifactId> - <version>1.0-001-SNAPSHOT</version> + <version>1.0-001</version> </dependency> <dependency> <groupId>joda-time</groupId> @@ -54,16 +62,17 @@ <dependency> <groupId>cishell.libs</groupId> <artifactId>org.prefuse</artifactId> - <version>beta-20071021-001-SNAPSHOT</version> + <version>beta-20071021-001</version> </dependency> - </dependencies> + </dependencies> --> + <repositories> <repository> <id>ganymede</id> <layout>p2</layout> - <url>http://download.eclipse.org/releases/ganymede</url> + <url>http://download.eclipse.org/eclipse/updates/3.4</url> </repository> </repositories> Modified: branches/tycho/deployment/deployment-parent/pom.xml =================================================================== --- branches/tycho/deployment/deployment-parent/pom.xml 2010-11-21 00:59:34 UTC (rev 1174) +++ branches/tycho/deployment/deployment-parent/pom.xml 2010-11-22 06:03:33 UTC (rev 1175) @@ -9,6 +9,14 @@ <packaging>pom</packaging> <name>CIShell Deployment Parent</name> + <parent> + <groupId>cishell</groupId> + <artifactId>lib-dependencies</artifactId> + <version>1.0.0</version> + <relativePath>../../lib-dependencies/pom.xml</relativePath> + </parent> + + <properties> <tycho-version>0.10.0</tycho-version> <tycho-groupid>org.sonatype.tycho</tycho-groupid> @@ -17,6 +25,9 @@ <modules> <module>../org.cishell.feature</module> + <module>../org.cishell.reference.gui.feature</module> + <module>../org.cishell.reference.product</module> + <module>../../clients/gui/gui-build</module> <module>../../core/core-build</module> </modules> @@ -24,7 +35,7 @@ <repository> <id>ganymede</id> <layout>p2</layout> - <url>http://download.eclipse.org/releases/ganymede</url> + <url>http://download.eclipse.org/eclipse/updates/3.4</url> </repository> </repositories> @@ -44,6 +55,14 @@ <configuration> <resolver>p2</resolver> <pomDependencies>consider</pomDependencies> + <environments> + <environment> + <os>linux</os> + <ws>gtk</ws> + <arch>x86</arch> + </environment> + </environments> + </configuration> </plugin> Added: branches/tycho/deployment/org.cishell.reference.gui.feature/build.properties =================================================================== --- branches/tycho/deployment/org.cishell.reference.gui.feature/build.properties (rev 0) +++ branches/tycho/deployment/org.cishell.reference.gui.feature/build.properties 2010-11-22 06:03:33 UTC (rev 1175) @@ -0,0 +1 @@ +bin.includes = feature.xml Added: branches/tycho/deployment/org.cishell.reference.gui.feature/feature.xml =================================================================== --- branches/tycho/deployment/org.cishell.reference.gui.feature/feature.xml (rev 0) +++ branches/tycho/deployment/org.cishell.reference.gui.feature/feature.xml 2010-11-22 06:03:33 UTC (rev 1175) @@ -0,0 +1,102 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.cishell.reference.gui.feature" + label="CIShell Reference GUI Feature" + version="0.4.0"> + + <description url="http://cishell.org"> + CIShell Reference GUI + </description> + + <copyright> + Copyright 2006 Indiana University + </copyright> + + <license url="http://www.apache.org/licenses/LICENSE-2.0"> + CIShell: Cyberinfrastructure Shell +Copyright 2006 Indiana University +Licensed 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. +Project Contacts: +Bruce Herr (bh...@bh...) +Weixia Huang (hu...@in...) +Shashikant Penumarthy (sp...@in...) +Dr. Katy Borner (ka...@in...) + </license> + + <url> + <update label="CIShell Update Site" url="http://cishell.org/update"/> + <discovery label="CIShell Update Site" url="http://cishell.org/update"/> + </url> + + <plugin + id="org.cishell.reference.gui.brand.cishell" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + <plugin + id="org.cishell.reference.gui.datamanager" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.cishell.reference.gui.guibuilder.swt" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.cishell.reference.gui.log" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.cishell.reference.gui.menumanager" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.cishell.reference.gui.persistence" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.cishell.reference.gui.prefs.swt" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.cishell.reference.gui.scheduler" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.cishell.reference.gui.workspace" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + +</feature> Added: branches/tycho/deployment/org.cishell.reference.gui.feature/pom.xml =================================================================== --- branches/tycho/deployment/org.cishell.reference.gui.feature/pom.xml (rev 0) +++ branches/tycho/deployment/org.cishell.reference.gui.feature/pom.xml 2010-11-22 06:03:33 UTC (rev 1175) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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> + + <version>0.4.0</version> + <artifactId>org.cishell.reference.gui.feature</artifactId> + <packaging>eclipse-feature</packaging> + <name>CIShell Reference GUI Feature</name> + + <parent> + <version>1.0.0</version> + <groupId>org.cishell</groupId> + <artifactId>deployment-parent</artifactId> + <relativePath>../deployment-parent/pom.xml</relativePath> + </parent> + +</project> Added: branches/tycho/deployment/org.cishell.reference.product/cishell.product =================================================================== --- branches/tycho/deployment/org.cishell.reference.product/cishell.product (rev 0) +++ branches/tycho/deployment/org.cishell.reference.product/cishell.product 2010-11-22 06:03:33 UTC (rev 1175) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?pde version="3.5"?> + +<product name="CIShell" uid="cishell.product.id" id="cishell.product" application="cishell.application" version="1.0.0" useFeatures="true" includeLaunchers="true"> + + <configIni use="default"> + </configIni> + + <launcherArgs> + </launcherArgs> + + <plugins> + </plugins> + + <features> + <feature id="org.cishell.feature" version="0.0.0"/> + <feature id="org.cishell.reference.gui.feature" version="0.0.0"/> + <feature id="org.eclipse.rcp" version="0.0.0"/> + <feature id="org.eclipse.equinox.p2.user.ui" version="0.0.0"/> + </features> + + <configurations> + <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" /> + <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" /> + <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" /> + <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" /> + <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" /> + + <!-- Disable update manager. It seems as if this could be achieved by the first line, but in + fact the second line sets reconcile to false (see org.eclipse.equinox.p2.publisher.eclipse.ConfigCUsAction#publishBundleCUs) --> + <property name="org.eclipse.update.reconcile" value="false" /> + <plugin id="org.eclipse.update.configurator" autoStart="true" startLevel="4"/> + + </configurations> + +</product> Added: branches/tycho/deployment/org.cishell.reference.product/pom.xml =================================================================== --- branches/tycho/deployment/org.cishell.reference.product/pom.xml (rev 0) +++ branches/tycho/deployment/org.cishell.reference.product/pom.xml 2010-11-22 06:03:33 UTC (rev 1175) @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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> + + <version>1.0.0</version> + <artifactId>org.cishell.reference.product</artifactId> + <packaging>eclipse-repository</packaging> + <name>The Reference CIShell Application</name> + + <parent> + <version>1.0.0</version> + <groupId>org.cishell</groupId> + <artifactId>deployment-parent</artifactId> + <relativePath>../deployment-parent/pom.xml</relativePath> + </parent> + + <build> + <plugins> + <plugin> + <groupId>${tycho-groupid}</groupId> + <artifactId>tycho-p2-publisher-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <publishArtifacts>true</publishArtifacts> + </configuration> + </plugin> + <plugin> + <groupId>${tycho-groupid}</groupId> + <artifactId>tycho-p2-director-plugin</artifactId> + <version>${tycho-version}</version> + <executions> + <execution> + <id>materialize-products</id> + <goals> + <goal>materialize-products</goal> + </goals> + </execution> + <execution> + <id>archive-products</id> + <goals> + <goal>archive-products</goal> + </goals> + </execution> + </executions> + <configuration> + <products> + <product> + <id>cishell.product.id</id> + </product> + </products> + </configuration> + </plugin> + </plugins> + </build> +</project> Added: branches/tycho/lib-dependencies/pom.xml =================================================================== --- branches/tycho/lib-dependencies/pom.xml (rev 0) +++ branches/tycho/lib-dependencies/pom.xml 2010-11-22 06:03:33 UTC (rev 1175) @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project> + + <modelVersion>4.0.0</modelVersion> + + <prerequisites> + <maven>3.0</maven> + </prerequisites> + <groupId>cishell</groupId> + <artifactId>lib-dependencies</artifactId> + <version>1.0.0</version> + + <packaging>pom</packaging> + + + <properties> + <tycho-version>0.10.0</tycho-version> + </properties> + + + <dependencies> + <dependency> + <groupId>cishell.libs</groupId> + <artifactId>jung</artifactId> + <version>1.7.6-001</version> + </dependency> + <dependency> + <groupId>cishell.libs</groupId> + <artifactId>com.google.collections</artifactId> + <version>1.0-001</version> + </dependency> + <dependency> + <groupId>joda-time</groupId> + <artifactId>joda-time</artifactId> + <version>1.6.2</version> + </dependency> + <dependency> + <groupId>cishell.libs</groupId> + <artifactId>org.prefuse</artifactId> + <version>beta-20071021-001</version> + </dependency> + + </dependencies> + + + <repositories> + <repository> + <id>ganymede</id> + <layout>p2</layout> + <url>http://download.eclipse.org/eclipse/updates/3.4</url> + </repository> + </repositories> + + <build> + <plugins> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>tycho-maven-plugin</artifactId> + <version>${tycho-version}</version> + <extensions>true</extensions> + </plugin> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho-version}</version> + <configuration> + <resolver>p2</resolver> + <pomDependencies>consider</pomDependencies> + </configuration> + </plugin> + </plugins> + </build> + +</project> Modified: branches/tycho/libs/colt/pom.xml =================================================================== --- branches/tycho/libs/colt/pom.xml 2010-11-21 00:59:34 UTC (rev 1174) +++ branches/tycho/libs/colt/pom.xml 2010-11-22 06:03:33 UTC (rev 1175) @@ -18,7 +18,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>cishell.libs</groupId> <artifactId>colt</artifactId> - <version>1.2.0-001-SNAPSHOT</version> + <version>1.2.0-001</version> <name>${bundle.symbolicName} ${wrapped.version} [osgi]</name> @@ -34,7 +34,7 @@ <dependency> <groupId>cishell.libs</groupId> <artifactId>concurrent</artifactId> - <version>1.3.4-001-SNAPSHOT</version> + <version>1.3.4-001</version> </dependency> </dependencies> Modified: branches/tycho/libs/com.google.collections/pom.xml =================================================================== --- branches/tycho/libs/com.google.collections/pom.xml 2010-11-21 00:59:34 UTC (rev 1174) +++ branches/tycho/libs/com.google.collections/pom.xml 2010-11-22 06:03:33 UTC (rev 1175) @@ -18,7 +18,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>cishell.libs</groupId> <artifactId>com.google.collections</artifactId> - <version>1.0-001-SNAPSHOT</version> + <version>1.0-001</version> <name>${bundle.symbolicName} ${wrapped.version} [osgi]</name> @@ -33,4 +33,4 @@ </dependency> </dependencies> -</project> \ No newline at end of file +</project> Modified: branches/tycho/libs/commons-collections/pom.xml =================================================================== --- branches/tycho/libs/commons-collections/pom.xml 2010-11-21 00:59:34 UTC (rev 1174) +++ branches/tycho/libs/commons-collections/pom.xml 2010-11-22 06:03:33 UTC (rev 1175) @@ -18,7 +18,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>cishell.libs</groupId> <artifactId>commons-collections</artifactId> - <version>3.1-001-SNAPSHOT</version> + <version>3.1-001</version> <name>${bundle.symbolicName} ${wrapped.version} [osgi]</name> @@ -33,4 +33,4 @@ </dependency> </dependencies> -</project> \ No newline at end of file +</project> Modified: branches/tycho/libs/concurrent/pom.xml =================================================================== --- branches/tycho/libs/concurrent/pom.xml 2010-11-21 00:59:34 UTC (rev 1174) +++ branches/tycho/libs/concurrent/pom.xml 2010-11-22 06:03:33 UTC (rev 1175) @@ -18,7 +18,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>cishell.libs</groupId> <artifactId>concurrent</artifactId> - <version>1.3.4-001-SNAPSHOT</version> + <version>1.3.4-001</version> <name>${bundle.symbolicName} ${wrapped.version} [osgi]</name> @@ -33,4 +33,4 @@ </dependency> </dependencies> -</project> \ No newline at end of file +</project> Modified: branches/tycho/libs/jung/pom.xml =================================================================== --- branches/tycho/libs/jung/pom.xml 2010-11-21 00:59:34 UTC (rev 1174) +++ branches/tycho/libs/jung/pom.xml 2010-11-22 06:03:33 UTC (rev 1175) @@ -18,7 +18,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>cishell.libs</groupId> <artifactId>jung</artifactId> - <version>1.7.6-001-SNAPSHOT</version> + <version>1.7.6-001</version> <name>${bundle.symbolicName} ${wrapped.version} [osgi]</name> @@ -34,12 +34,12 @@ <dependency> <groupId>cishell.libs</groupId> <artifactId>commons-collections</artifactId> - <version>3.1-001-SNAPSHOT</version> + <version>3.1-001</version> </dependency> <dependency> <groupId>cishell.libs</groupId> <artifactId>colt</artifactId> - <version>1.2.0-001-SNAPSHOT</version> + <version>1.2.0-001</version> </dependency> </dependencies> Modified: branches/tycho/libs/org.prefuse/pom.xml =================================================================== --- branches/tycho/libs/org.prefuse/pom.xml 2010-11-21 00:59:34 UTC (rev 1174) +++ branches/tycho/libs/org.prefuse/pom.xml 2010-11-22 06:03:33 UTC (rev 1175) @@ -19,7 +19,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>cishell.libs</groupId> <artifactId>org.prefuse</artifactId> - <version>beta-20071021-001-SNAPSHOT</version> + <version>beta-20071021-001</version> <name>${bundle.symbolicName} ${wrapped.version} [osgi]</name> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |