Menu
▾
▴
cishell-svn — Mailing list for commit messages to CIShell
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(7) |
Aug
|
Sep
(46) |
Oct
(102) |
Nov
(10) |
Dec
(21) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(1) |
Feb
(3) |
Mar
(14) |
Apr
(9) |
May
(12) |
Jun
(4) |
Jul
(40) |
Aug
(60) |
Sep
(38) |
Oct
(2) |
Nov
(1) |
Dec
(42) |
| 2008 |
Jan
(23) |
Feb
(29) |
Mar
(107) |
Apr
(27) |
May
(3) |
Jun
(1) |
Jul
(15) |
Aug
(7) |
Sep
(19) |
Oct
|
Nov
(2) |
Dec
|
| 2009 |
Jan
(36) |
Feb
(4) |
Mar
(2) |
Apr
(1) |
May
(1) |
Jun
(15) |
Jul
(30) |
Aug
(32) |
Sep
(11) |
Oct
(21) |
Nov
(12) |
Dec
(15) |
| 2010 |
Jan
(29) |
Feb
(9) |
Mar
(25) |
Apr
|
May
(7) |
Jun
(5) |
Jul
(21) |
Aug
(32) |
Sep
(10) |
Oct
(8) |
Nov
(29) |
Dec
(8) |
| 2011 |
Jan
(9) |
Feb
(35) |
Mar
(11) |
Apr
(4) |
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
(3) |
Dec
(30) |
| 2012 |
Jan
(5) |
Feb
(7) |
Mar
(10) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <fu...@us...> - 2010-11-27 03:47:35
|
Revision: 1177
http://cishell.svn.sourceforge.net/cishell/?rev=1177&view=rev
Author: fugu13
Date: 2010-11-27 03:47:24 +0000 (Sat, 27 Nov 2010)
Log Message:
-----------
committing because working copy is getting cumbersome, but stupid dependency problems with new packaging type are not yet resolved
Modified Paths:
--------------
branches/tycho/clients/gui/gui-build/pom.xml
branches/tycho/core/core-build/pom.xml
branches/tycho/deployment/deployment-parent/pom.xml
branches/tycho/deployment/org.cishell.reference.application/pom.xml
branches/tycho/deployment/org.cishell.reference.gui.feature/feature.xml
branches/tycho/deployment/org.cishell.reference.product/cishell.product
branches/tycho/deployment/org.cishell.reference.product/pom.xml
branches/tycho/lib-dependencies/pom.xml
branches/tycho/libs/org.prefuse/osgi.bnd
Added Paths:
-----------
branches/tycho/deployment/org.cishell.reference.application/
branches/tycho/deployment/org.cishell.reference.application/extra-files/
branches/tycho/deployment/org.cishell.reference.application/extra-files/configuration/
branches/tycho/deployment/org.cishell.reference.application/extra-files/configuration/config.ini.bak
branches/tycho/deployment/org.cishell.reference.application/extra-files/configuration/default_menu.xml
branches/tycho/deployment/org.cishell.reference.application/extra-files/licenses/
branches/tycho/deployment/org.cishell.reference.application/extra-files/licenses/license-apache-commons-collections.txt
branches/tycho/deployment/org.cishell.reference.application/extra-files/licenses/license-cishell.txt
branches/tycho/deployment/org.cishell.reference.application/extra-files/licenses/license-colt.txt
branches/tycho/deployment/org.cishell.reference.application/extra-files/licenses/license-jung.txt
branches/tycho/deployment/org.cishell.reference.application/extra-files/licenses/license-knopflerfish.txt
branches/tycho/deployment/org.cishell.reference.application/extra-files/licenses/license-prefuse.txt
branches/tycho/deployment/org.cishell.reference.application/extra-files/sampledata/
branches/tycho/deployment/org.cishell.reference.application/extra-files/sampledata/isi/
branches/tycho/deployment/org.cishell.reference.application/extra-files/sampledata/isi/barabasi-vespignani-wasserman.isi
branches/tycho/deployment/org.cishell.reference.application/extra-files/sampledata/isi/savedrecs-barabasi.isi
branches/tycho/deployment/org.cishell.reference.application/extra-files/sampledata/isi/savedrecs-garfield.isi
branches/tycho/deployment/org.cishell.reference.application/extra-files/sampledata/isi/savedrecs-vespignani.isi
branches/tycho/deployment/org.cishell.reference.application/extra-files/sampledata/isi/savedrecs-wasserman.isi
branches/tycho/deployment/org.cishell.reference.application/extra-files/sampledata/network/
branches/tycho/deployment/org.cishell.reference.application/extra-files/sampledata/network/TARL/
branches/tycho/deployment/org.cishell.reference.application/extra-files/sampledata/network/TARL/agingfunction.txt
branches/tycho/deployment/org.cishell.reference.application/extra-files/sampledata/network/TARL/iniscript.tarl
branches/tycho/deployment/org.cishell.reference.application/extra-files/sampledata/network/bio/
branches/tycho/deployment/org.cishell.reference.application/extra-files/sampledata/network/bio/FlyMINT.nwb
branches/tycho/deployment/org.cishell.reference.application/extra-files/sampledata/network/bio/TF_DNA_regulonDB.nwb
branches/tycho/deployment/org.cishell.reference.application/extra-files/sampledata/network/bio/WI5.nwb
branches/tycho/deployment/org.cishell.reference.application/extra-files/sampledata/network/bio/WormMint.nwb
branches/tycho/deployment/org.cishell.reference.application/extra-files/sampledata/network/bio/YeastMINT.nwb
branches/tycho/deployment/org.cishell.reference.application/extra-files/sampledata/network/conversionGraph.graphml.xml
branches/tycho/deployment/org.cishell.reference.application/extra-files/sampledata/network/florentine.nwb
branches/tycho/deployment/org.cishell.reference.application/extra-files/sampledata/network/friendster.graphml.xml
branches/tycho/deployment/org.cishell.reference.application/extra-files/sampledata/network/friendster.xgmml.xml
branches/tycho/deployment/org.cishell.reference.application/extra-files/sampledata/network/netsci06-conference.net
branches/tycho/deployment/org.cishell.reference.application/extra-files/sampledata/network/seiyu.graphml.xml
branches/tycho/deployment/org.cishell.reference.application/extra-files/sampledata/network/terror.graphml.xml
branches/tycho/deployment/org.cishell.reference.application/extra-files/sampledata/network/terror.xgmml.xml
branches/tycho/deployment/org.cishell.reference.application/org.cishell.reference.application.product
branches/tycho/deployment/org.cishell.reference.application/root.properties
branches/tycho/deployment/org.cishell.reference.brand.feature/
branches/tycho/deployment/org.cishell.reference.brand.feature/build.properties
branches/tycho/deployment/org.cishell.reference.brand.feature/feature.xml
branches/tycho/deployment/org.cishell.reference.brand.feature/pom.xml
branches/tycho/deployment/org.cishell.reference.product/extra-files/
branches/tycho/deployment/org.cishell.reference.product/extra-files/configuration/
branches/tycho/deployment/org.cishell.reference.product/extra-files/configuration/config.ini
branches/tycho/deployment/org.cishell.reference.product/extra-files/configuration/default_menu.xml
branches/tycho/deployment/org.cishell.reference.product/extra-files/licenses/
branches/tycho/deployment/org.cishell.reference.product/extra-files/licenses/license-apache-commons-collections.txt
branches/tycho/deployment/org.cishell.reference.product/extra-files/licenses/license-cishell.txt
branches/tycho/deployment/org.cishell.reference.product/extra-files/licenses/license-colt.txt
branches/tycho/deployment/org.cishell.reference.product/extra-files/licenses/license-jung.txt
branches/tycho/deployment/org.cishell.reference.product/extra-files/licenses/license-knopflerfish.txt
branches/tycho/deployment/org.cishell.reference.product/extra-files/licenses/license-prefuse.txt
branches/tycho/deployment/org.cishell.reference.product/extra-files/sampledata/
branches/tycho/deployment/org.cishell.reference.product/extra-files/sampledata/isi/
branches/tycho/deployment/org.cishell.reference.product/extra-files/sampledata/isi/barabasi-vespignani-wasserman.isi
branches/tycho/deployment/org.cishell.reference.product/extra-files/sampledata/isi/savedrecs-barabasi.isi
branches/tycho/deployment/org.cishell.reference.product/extra-files/sampledata/isi/savedrecs-garfield.isi
branches/tycho/deployment/org.cishell.reference.product/extra-files/sampledata/isi/savedrecs-vespignani.isi
branches/tycho/deployment/org.cishell.reference.product/extra-files/sampledata/isi/savedrecs-wasserman.isi
branches/tycho/deployment/org.cishell.reference.product/extra-files/sampledata/network/
branches/tycho/deployment/org.cishell.reference.product/extra-files/sampledata/network/TARL/
branches/tycho/deployment/org.cishell.reference.product/extra-files/sampledata/network/TARL/agingfunction.txt
branches/tycho/deployment/org.cishell.reference.product/extra-files/sampledata/network/TARL/iniscript.tarl
branches/tycho/deployment/org.cishell.reference.product/extra-files/sampledata/network/bio/
branches/tycho/deployment/org.cishell.reference.product/extra-files/sampledata/network/bio/FlyMINT.nwb
branches/tycho/deployment/org.cishell.reference.product/extra-files/sampledata/network/bio/TF_DNA_regulonDB.nwb
branches/tycho/deployment/org.cishell.reference.product/extra-files/sampledata/network/bio/WI5.nwb
branches/tycho/deployment/org.cishell.reference.product/extra-files/sampledata/network/bio/WormMint.nwb
branches/tycho/deployment/org.cishell.reference.product/extra-files/sampledata/network/bio/YeastMINT.nwb
branches/tycho/deployment/org.cishell.reference.product/extra-files/sampledata/network/conversionGraph.graphml.xml
branches/tycho/deployment/org.cishell.reference.product/extra-files/sampledata/network/florentine.nwb
branches/tycho/deployment/org.cishell.reference.product/extra-files/sampledata/network/friendster.graphml.xml
branches/tycho/deployment/org.cishell.reference.product/extra-files/sampledata/network/friendster.xgmml.xml
branches/tycho/deployment/org.cishell.reference.product/extra-files/sampledata/network/netsci06-conference.net
branches/tycho/deployment/org.cishell.reference.product/extra-files/sampledata/network/seiyu.graphml.xml
branches/tycho/deployment/org.cishell.reference.product/extra-files/sampledata/network/terror.graphml.xml
branches/tycho/deployment/org.cishell.reference.product/extra-files/sampledata/network/terror.xgmml.xml
branches/tycho/deployment/org.cishell.reference.product/root.properties
branches/tycho/deployment/releng/
Removed Paths:
-------------
branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/extra-files/
branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/about.gif
branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/alt16.gif
branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/alt32.gif
branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/alt64.gif
branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/cishell.icns
branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/cishell.ico
branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/cishell.xpm
branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/database.jpg
branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/datamanager_icon.gif
branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/findandinstall.gif
branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/grace.png
branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/manage.gif
branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/matrix.png
branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/network.png
branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/plot.png
branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/product.ico
branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/r.png
branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/raster_image.jpg
branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/table.png
branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/text.png
branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/tree.png
branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/unknown.png
branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/vector_image.jpg
branches/tycho/deployment/org.cishell.reference.application/cishell.product
Modified: branches/tycho/clients/gui/gui-build/pom.xml
===================================================================
--- branches/tycho/clients/gui/gui-build/pom.xml 2010-11-22 08:29:50 UTC (rev 1176)
+++ branches/tycho/clients/gui/gui-build/pom.xml 2010-11-27 03:47:24 UTC (rev 1177)
@@ -11,6 +11,14 @@
</properties>
+ <parent>
+ <groupId>cishell</groupId>
+ <artifactId>lib-dependencies</artifactId>
+ <version>1.0.0</version>
+ <relativePath>../../../lib-dependencies/pom.xml</relativePath>
+ </parent>
+
+
<modules>
<module>../org.cishell.reference.gui.brand.cishell</module>
<module>../org.cishell.reference.gui.datamanager</module>
@@ -23,59 +31,4 @@
<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>
Deleted: branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/about.gif
===================================================================
(Binary files differ)
Deleted: branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/alt16.gif
===================================================================
(Binary files differ)
Deleted: branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/alt32.gif
===================================================================
(Binary files differ)
Deleted: branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/alt64.gif
===================================================================
(Binary files differ)
Deleted: branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/cishell.icns
===================================================================
(Binary files differ)
Deleted: branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/cishell.ico
===================================================================
(Binary files differ)
Deleted: branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/cishell.xpm
===================================================================
--- branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/cishell.xpm 2010-11-22 08:29:50 UTC (rev 1176)
+++ branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/cishell.xpm 2010-11-27 03:47:24 UTC (rev 1177)
@@ -1,294 +0,0 @@
-/* XPM */
-static char * cishell_xpm[] = {
-"64 64 227 2",
-" c None",
-". c #FEFFFC",
-"+ c #F8FEFF",
-"@ c #F7FDFF",
-"# c #F7F9F6",
-"$ c #EBF1E6",
-"% c #D6E9D4",
-"& c #CEE6CA",
-"* c #CDE5C9",
-"= c #D2E5D0",
-"- c #E2F1E4",
-"; c #FAFCF9",
-"> c #F3F5F2",
-", c #DFEDE0",
-"' c #BDDAB7",
-") c #91C389",
-"! c #70B56C",
-"~ c #5CAD57",
-"{ c #5AAA54",
-"] c #58A64A",
-"^ c #67AF59",
-"/ c #67B262",
-"( c #89C080",
-"_ c #B4D8B3",
-": c #DFEBD8",
-"< c #ECF3E8",
-"[ c #45A04A",
-"} c #3A9A36",
-"| c #3D9C38",
-"1 c #479C39",
-"2 c #51A338",
-"3 c #4DA23E",
-"4 c #54A63B",
-"5 c #53A53A",
-"6 c #60A940",
-"7 c #4CA13D",
-"8 c #379A3D",
-"9 c #6DB472",
-"0 c #E9F3EE",
-"a c #429A3E",
-"b c #50A441",
-"c c #55A73C",
-"d c #56A83D",
-"e c #52A439",
-"f c #469B38",
-"g c #FBFDFA",
-"h c #F9FBF8",
-"i c #D6E6CC",
-"j c #9ACB9E",
-"k c #36993C",
-"l c #389B3E",
-"m c #479F42",
-"n c #57A93E",
-"o c #5BAB39",
-"p c #64AB3A",
-"q c #A5CEA2",
-"r c #F8FAF7",
-"s c #C4DFC9",
-"t c #DBEADD",
-"u c #C4DEB5",
-"v c #88C06C",
-"w c #3E9D39",
-"x c #4FA237",
-"y c #66AD3C",
-"z c #68AF3E",
-"A c #5DAC3A",
-"B c #67AE3D",
-"C c #5DA845",
-"D c #41A13C",
-"E c #D3E6D2",
-"F c #60AD64",
-"G c #F0F3E2",
-"H c #A5D379",
-"I c #7EBD4D",
-"J c #EAF4EF",
-"K c #6DB269",
-"L c #34983B",
-"M c #5AAA38",
-"N c #6CB139",
-"O c #6AB13F",
-"P c #71B63D",
-"Q c #6EB33A",
-"R c #65AC3B",
-"S c #5BAC69",
-"T c #EDF7F1",
-"U c #B0D4B0",
-"V c #DCECD2",
-"W c #9CCE65",
-"X c #84BF40",
-"Y c #A1D17D",
-"Z c #97CBA4",
-"` c #3D9843",
-" . c #459D41",
-".. c #73B83F",
-"+. c #72B73E",
-"@. c #9CCDA0",
-"#. c #7DBC7A",
-"$. c #50A354",
-"%. c #C8DFC4",
-"&. c #CEE3C1",
-"*. c #7CBC53",
-"=. c #76B938",
-"-. c #89C259",
-";. c #E4F0DD",
-">. c #409B45",
-",. c #70B53C",
-"'. c #78BB3A",
-"). c #33973A",
-"!. c #3F9E4E",
-"~. c #C6E1CB",
-"{. c #AED2AE",
-"]. c #C3E0BC",
-"^. c #63AE4B",
-"/. c #2B943E",
-"(. c #329639",
-"_. c #87C039",
-":. c #F4F7F3",
-"<. c #3B9B37",
-"[. c #2F9741",
-"}. c #A6D2AC",
-"|. c #60AB48",
-"1. c #86C072",
-"2. c #A2CEA8",
-"3. c #2F9437",
-"4. c #319538",
-"5. c #7ABD3D",
-"6. c #7BBE3E",
-"7. c #53A844",
-"8. c #2A933D",
-"9. c #ABD2B3",
-"0. c #79B877",
-"a. c #B8D8BA",
-"b. c #E7F1EC",
-"c. c #4AA158",
-"d. c #27913B",
-"e. c #73B44B",
-"f. c #6FB43B",
-"g. c #89C33B",
-"h. c #3B9A4A",
-"i. c #E8EFE4",
-"j. c #C9E4CE",
-"k. c #F6F8F4",
-"l. c #389748",
-"m. c #95C9A2",
-"n. c #90C591",
-"o. c #80BD88",
-"p. c #76B87C",
-"q. c #BDDDBF",
-"r. c #8DC597",
-"s. c #79BC80",
-"t. c #83BD83",
-"u. c #AFD6B7",
-"v. c #DDEBDE",
-"w. c #D4EBDC",
-"x. c #50A74A",
-"y. c #B5DAB5",
-"z. c #72B465",
-"A. c #60AB5C",
-"B. c #EBF5F0",
-"C. c #BADDC5",
-"D. c #C0E0C2",
-"E. c #92C894",
-"F. c #3B9E40",
-"G. c #5EAE3B",
-"H. c #EEF8F3",
-"I. c #69AF53",
-"J. c #BEDEC0",
-"K. c #9BC896",
-"L. c #73B86F",
-"M. c #92C780",
-"N. c #C7E2CC",
-"O. c #63AE5F",
-"P. c #7FBB74",
-"Q. c #74B668",
-"R. c #4DA447",
-"S. c #54A858",
-"T. c #D0E6D8",
-"U. c #79BC3B",
-"V. c #77BA39",
-"W. c #55A650",
-"X. c #BAD9BC",
-"Y. c #B1D9BA",
-"Z. c #B2D6B2",
-"`. c #63B067",
-" + c #A4D0AA",
-".+ c #94C68C",
-"++ c #83C08B",
-"@+ c #499E3A",
-"#+ c #8DC28F",
-"$+ c #94CA96",
-"%+ c #97C79B",
-"&+ c #5EAB4F",
-"*+ c #7FBF90",
-"=+ c #3C9F55",
-"-+ c #429D47",
-";+ c #52A656",
-">+ c #CBE2C7",
-",+ c #D3EADB",
-"'+ c #65AD6B",
-")+ c #64AF73",
-"!+ c #4CA763",
-"~+ c #A7D0A4",
-"{+ c #85BF84",
-"]+ c #5BA94C",
-"^+ c #82BE3E",
-"/+ c #D8EBD6",
-"(+ c #83BF77",
-"_+ c #9AC98A",
-":+ c #95C77A",
-"<+ c #6FB24F",
-"[+ c #69B247",
-"}+ c #A9D192",
-"|+ c #7AB75C",
-"1+ c #4AA44E",
-"2+ c #9ECFA2",
-"3+ c #B2D69E",
-"4+ c #AAD3A7",
-"5+ c #9FC991",
-"6+ c #CAE5CF",
-"7+ c #8AC489",
-"8+ c #A4D18B",
-"9+ c #97C774",
-"0+ c #A0CE9B",
-"a+ c #E3F2E5",
-"b+ c #98CB91",
-"c+ c #70B875",
-"d+ c #88C287",
-". . . . . . . . . . . . . . . . . . . . + @ @ @ @ @ # $ % & * * * * = % - # @ @ @ @ @ + . . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . . . + @ ; ; > , ' ) ! ~ { ] ] ] ] ] ] ] ^ / ( _ : < ; ; @ + . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . @ ; @ @ @ , ! [ } | 1 2 3 4 5 4 6 5 5 7 7 1 1 8 [ 9 , @ ; @ @ + . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . @ @ @ @ @ 0 9 a 1 1 7 b 7 6 6 6 6 c d c 5 e b 7 1 f } 9 0 @ @ ; ; @ g . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . + @ @ h $ i h h j k l m 7 e 5 5 4 n o p p 6 6 6 d 5 e 7 a a a q r @ s t @ @ @ + . . . . . . . . . . . . ",
-". . . . . . . . . . . . g @ # u v $ @ = [ a 1 w x b 6 6 p y z A z z B p p c C D 7 1 f [ E h , F q > ; g . . . . . . . . . . . . ",
-". . . . . . . . . . @ @ ; G H I u ; J K L w 7 3 5 M M 6 N z O P P Q z A R M p 2 3 w l k S T @ U m 9 t @ @ + . . . . . . . . . . ",
-". . . . . . . . . + @ @ V W X Y @ h Z ` 8 .2 2 5 d R N z ........+.P O z p d 4 e 7 1 l a @.h # #.} $.%.h ; + . . . . . . . . . ",
-". . . . . . . . g @ ; &.*.=.-.;.@ = >.a } l D 6 6 n A ,.O X =.X '...I =.z B 6 d 5 7 1 } ).!.~.+ t ^ ).[ {.; @ + . . . . . . . . ",
-". . . . . . . . @ r ].^.R z u r > S /.(.a 1 2 7 M y O O ..+.X X X _.=.,.,.z B d C 2 1 a a (.S :.# U w <.[.}.# ; + . . . . . . . ",
-". . . . . . + @ @ = ~ b |.1.# r 2.3.4.} 1 1 2 b 6 B O ,.=...5.X 6.X 5...,.z R M 2 7.f 8 a ` 8.9.@ @ 0.m .[ a.; @ . . . . . . . ",
-". . . . . . @ ; ; = E $ T g @ b.c.d.4.).w 7 D 6 d A e.f...X X g.g._.I ..f.N p 6 b x w f } 3.d.h.i.r r # b.% j.@ ; @ + . . . . . ",
-". . . . . g @ @ @ @ @ @ h k.h k.9.l.a (.a 7 2 2 6 o z f.P '.X X 6._.X P O N o p b e 1 k ).4.l.m.k.@ # r @ @ r @ @ g g . . . . . ",
-". . . . . @ h , s a.2.n.o.p.q.@ h 2.[.a } 1 1 5 M p B z P ....'.X +.=.P f.y 6 c 5 3 w f L [.r.k.@ i.s.t.n.q u.s v.@ @ + . . . . ",
-". . . + @ @ s !.4.L a | f 8 m {.h @ 9.>.8 w 7 3 4 p B z Q +.+.P +.f.,.O z B 6 4 e 3 a a a j @ @ w.F l k k a k ).` u.; @ + . . . ",
-". . . . ; k.9 a k f | 7 w 7 1 x.y.r r Z . .1 2 6 4 p R z N f.,.,.f.z z A n d 5 3 7 w 8 r.> @ , z.1 1 1 1 <.f a 3.A.B.; . . . . ",
-". . . @ @ C.8 f w 7 7 b 2 b b 3 x.D.. @ E.F.f w 3 b M 6 6 z z z z N G.B R M 6 2 1 1 f s.H.r $ z.e 5 4 5 3 7 1 1 k a {.@ @ . . . ",
-". . . @ > 0.a | 7 2 e p n p p 6 6 I.J.h k.K.l m 2 e 3 d o 6 A y y 6 R 6 e C 7 7 7 l s.$ @ - L.3 b c 6 6 p 4 5 7 1 a F J ; . . . ",
-". . . @ t m .7 b 6 c R A p M M 4 4 ^ E h > 0.a 1 2 2 b c 6 c n o d c 6 2 2 1 w 1 ! 0 ; > M.6 M 6 M o o p n d 4 D .a N.@ + . . ",
-". . . @ @.l 7 e 6 n B z O O N B R 6 4 ^ : h $ ! F. .7 2 2 2 6 6 3 6 C 7 2 w w f O.t @ :.( 3 4 6 N z Q O z z p 6 6 D w ) @ g . . ",
-". . . # P.} 2 e p B Q ......+.f.N p 6 b Q., @ : O. .R.R.] x.R.C x.b b R.] ] .S.= ; k.K.e c o A f.P I =.P N A M 6 7 l O.0 + . . ",
-". . . v.S.1 3 c o z f.I X X X ..z A M 5 7 #.> @ v.~.s N.N.i i = % E E = N.%.~.T.@ @ }.C b 6 R O P ..U...V.P N p M e 1 W.E g . . ",
-". + . N.m w e 6 A z =.=._.X X '.O z n b x w q h ; g ; ; @ @ @ @ @ @ ; @ @ @ ; @ @ : m 7 2 6 z O X X _.X 6...z R 6 c 1 F.X.+ . . ",
-". . . ' .7 e 4 B Q f.X X _.6...+.z R d w ] N.@ b.X.Y._ U Z._ {._ _ Z._ _ ' a.: ; B.`.1 5 n y f.f.X X g.X ..P B c 5 D | @.g . . ",
-". + + +8 .2 c p z Q =.X X X +.O B p 6 1 .+; k.++a 8 1 1 1 2 2 @+7 1 1 } 8 (.S b.+ D.] e n R N =.X 5.X X ,.O y 6 6 1 f #++ . . ",
-". . . r.f 1 1 6 n z G.,.P P f.f.z A 5 3 ! $ @ Y.a } 1 1 7 e 3 3 2 2 e 3 1 w 8 a n.; g $+2 6 6 B z f.+.P ,.f.G.o 5 D 1 8 s.g . . ",
-". . . r.L F.w 2 c 6 z z Q O z z 6 6 5 b D.; i.F a m 3 2 5 4 6 6 c 6 5 b 5 7 | f [ ~.+ b.^ 4 6 p z z Q f.z z p 6 6 3 f a p.+ . . ",
-". . . %+3.f 1 1 6 n n R R z B R o 5 2 ( k.@ n.} | x e 4 6 p M M p n n p C e 7 l f K k.r _ b 2 n n B B B B 6 6 2 2 w 8 3.o.g . . ",
-". + + 2.d.(.a <.2 2 5 c d d d 6 e 3 &+, h = >.f w 2 4 c o y z z N N A M 6 4 e 7 l a +h @ P.2 6 5 d n M n e 2 w 7 | L 3.*++ . . ",
-". . . u.d.` ).a a 1 7 3 e e 2 7 3 w q @ J p.| .b b n p B z f.P ,.e.O z M p 4 7 7 } S.w.h = W.w 2 e 3 C 5 3 7 7 a a 3.d.q g . . ",
-". . + s l.d.d.(.8 <.1 1 1 1 w w 1 `.$ @ +a w 7 e 6 n B ,.P ..I =.'.P Q R 6 c 2 7 f a t.@ r K.a F.1 w 1 1 w f } (.a d.d.a.+ . . ",
-". . . v.=+d.3.3.a a k l m -+] W.;+>+@ , $.k 1 7 b 4 R z ,.P X V._.I X O z A 6 e 7 <.} ` %.@ < S.f f f | <.a ).4.3.d.d.=+N.g . . ",
-". . + > %+*+m.m.2.a.a.J.%.s ~.N.,+@ r #+).k | 2 6 6 p z P =.X _._.'.X ,.O A 6 e 7 a ).3.'+:.h T.u.{.2.@.r.r.o.p.)+'+!+)+b.+ . . ",
-". . . @ @ # > @ @ @ @ + + + @ @ h r B.!.` a 1 w 2 M A O P ..6.6._.X ..P f.B d 5 7 1 a (.h.b.@ r h @ + @ . r @ @ @ @ r @ @ g . . ",
-". . . @ @ ,+T.T.s %.q.' {. +@.j }.# + u.` k 1 7 3 6 B N P X X 5.5.X =.O N R 6 e D f k [ u.h k.s %.>+= T.T.t t t i.b.b.r @ + . . ",
-". . + @ b.'+` d.` 3.a ).} f f } a U h r E.a F.w e 4 n R z f.....'.=...O B 6 c e 7 <.a %+; @ ~+l k .l F.m [ $.c.!+!+)+0 @ g . . ",
-". . g @ @ *+d.3.3.).<. .w 1 1 7 w x.q.@ > t. .1 2 c 6 R z Q +.P f.O P G.B 6 b 2 1 8 t.:.r _ R.1 w 7 7 7 .} f 3.3.d.p.> @ + . . ",
-". . . r > C.` 4.k 1 7 2 b b c 2 5 7 ~ t h $ O.1 1 e 5 6 p B z z O O B B n 4 5 1 m O.0 ; E { 2 e 4 e e 3 2 1 l } 3.a 9.h @ . . . ",
-". . + + r > S.a F.7 2 6 M n n 6 6 6 2 L.T h j.W.1 7 2 4 n A B B B R 6 p 5 e 3 w ] N.@ B.z.7 b 6 6 6 M c d e 7 f ).-+i.; + . . . ",
-". . . + @ @ 2.w 2 e d M R B B o M c e e .+k.@ }.m 1 D 7 6 6 d d 6 d d b 2 7 1 m }.; :.( 3 5 M M p N B R 6 6 5 7 1 ++@ @ . . . . ",
-". . . . ; ; : { e 6 6 B N f.f.e.N R 6 5 x.Z.; :.{+f w w 1 2 e e 5 e 2 3 7 w 1 ) H.@ {.b 6 6 p B z Q f.Q G.6 c b ]+= @ @ . . . . ",
-". . . . + @ @ .+b d A O +.P ^+=.Q z M 6 2 ] /+@ J S.f 1 w 1 7 7 7 7 w 1 <. .S.b.@ % b e e p z ,.......+.N z p 4 (+H.; . . . . . ",
-". . . . . @ + ;.6 B O P X '.X V...O p 6 4 7 ! $ @ w._ ' Y.X.y.' ' ' X.X.y.Z.w.@ i.! 1 b c y O =.X 6.6.X f.B p 6 i @ @ . . . . . ",
-". . . . + g + r _+R f.P '.X X X V.+.A n 5 7 a +r @ @ @ . ; + @ @ + g ; @ @ @ ; @.8 D 5 6 B P ..5.g.X ..=.z M :+:.@ + . . . . . ",
-". . . . . . + + : <+z +.X _.X X ..P N 6 5 D m = ; 0 s a.X.' X.X.q.X.X.X.X.%.b.@ %.R.7 e n A P ..X _._.I =.z [+>+h . . . . . . . ",
-". . . . . . . g @ }+z Q P ..5...+.z 6 4 3 7 K.k.@ #+k -+F.m m 3 m m m . .[.++@ k.) 1 3 p B z ......V.=.f.z M.r @ + . . . . . . ",
-". . . . . + + + + ;.|+z P ,.P ,.f.z p c 2 1+b.; t -+} 1 m 3 7 2 e D 7 1 1 f a ,+@ , ] 7 5 R B ,.+...f.O O <+V @ g . . . . . . . ",
-". . . . . . . . + g u y B z z z y o 4 2 3 {.; > 0.a F.7 2 e 5 4 4 d e b D F.l 0.J + 2+7 3 c p y z z z z B 3+@ ; + . . . . . . . ",
-". . . . . . + . + + # 1.6 p p n 6 6 3 7 Q.$ @ Y.F.1 w e 4 6 6 n p M d 6 e 3 f ._ ; - z.7 3 c 6 p R R 6 |+> @ + . . . . . . . . ",
-". . . . . . . . . @ ; i ^.4 c 6 2 D 7 m J.+ $ K 1 3 4 c p o A z y B p M 6 e 7 1 F 0 @ ' 1 D 3 e 4 c c |.].r @ . . . . . . . . . ",
-". . . . . . . . . + @ + 4+3 x 7 7 1 | s.k.+ j .1 3 4 n y Q ,.O O P B A p c b 1 1 j @ # 0.w w 7 7 3 2 5+h ; . . . . . . . . . . ",
-". . . . . . . . . . + g B.#.l | f l [ % @ , W.| D 4 6 R z O ....'...,.z n 6 5 2 l [ , @ = W.a l a 1 ! b.@ + + . . . . . . . . . ",
-". . . . . . . . . . + g + , F $.$.$.r.@ @ #+a 1 7 e n z P X 5.X X I X f.A o 5 2 1 k #+> @ ++$.S.S.S.6+@ @ + . . . . . . . . . . ",
-". . . . . . . . . . . + g g k.@ h @ r h = >.L 1 2 6 p z f.P X X _.5.=.,.N 6 6 3 1 a ` ~.r @ h k.k.# ; ; . . . . . . . . . . . . ",
-". . . . . . . . . . . + + @ h @ # :.k.@ w.S.l f 7 4 o z ,.=.X 6._.5...O z n c b | l $.,+h # k.# @ @ @ @ . . . . . . . . . . . . ",
-". . . . . . . . . . . . . + @ h D.P.7+> + a.8 .w 5 6 B O ,.V.X X ..X P A p 6 x 1 } u.@ # 8+9+u h @ g . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . g g # ) 3 0+k.k.#.1 7 5 d y z O =.P ^+Q z N n 4 e 7 .0.k.h 3+O :+:.; @ . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . + @ @ T ++W.,+@ ,+W. .D 6 n R z z N O O N R p 4 3 w 1+= @ w.<+M.a+; @ . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . ; . @ q p.< + ~+7 w 2 4 p R y z z y 6 n 6 2 3 1 @.; k.( b+# @ @ + . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . + + @ # k.X.~.@ > 0.1 7 3 b d n o n 6 M 6 2 D .c+$ @ %.' r @ @ . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . . + + + @ > r @ = .1 D 2 e C c 5 3 2 1 7 w a = @ ; b.h ; g + . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . + . + + @ h @ r @ n.a 1 .f 2 7 D 2 w w f a d+@ ; @ + @ + . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . . . . . + + @ @ h a+j `.S.1+] W.W.W.W.1+O.K.i.@ @ ; g + . . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . . . . . . . . g @ + r k.% = = E = E = t > @ @ @ g + + . . . . . . . . . . . . . . . . . . . . . "};
Deleted: branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/database.jpg
===================================================================
(Binary files differ)
Deleted: branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/datamanager_icon.gif
===================================================================
(Binary files differ)
Deleted: branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/findandinstall.gif
===================================================================
(Binary files differ)
Deleted: branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/grace.png
===================================================================
(Binary files differ)
Deleted: branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/manage.gif
===================================================================
(Binary files differ)
Deleted: branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/matrix.png
===================================================================
(Binary files differ)
Deleted: branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/network.png
===================================================================
(Binary files differ)
Deleted: branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/plot.png
===================================================================
(Binary files differ)
Deleted: branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/product.ico
===================================================================
(Binary files differ)
Deleted: branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/r.png
===================================================================
(Binary files differ)
Deleted: branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/raster_image.jpg
===================================================================
(Binary files differ)
Deleted: branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/table.png
===================================================================
(Binary files differ)
Deleted: branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/text.png
===================================================================
(Binary files differ)
Deleted: branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/tree.png
===================================================================
(Binary files differ)
Deleted: branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/unknown.png
===================================================================
(Binary files differ)
Deleted: branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/icons/vector_image.jpg
===================================================================
(Binary files differ)
Modified: branches/tycho/core/core-build/pom.xml
===================================================================
--- branches/tycho/core/core-build/pom.xml 2010-11-22 08:29:50 UTC (rev 1176)
+++ branches/tycho/core/core-build/pom.xml 2010-11-27 03:47:24 UTC (rev 1177)
@@ -20,10 +20,10 @@
</parent>
- <scm>
+<!-- <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>
- </scm>
+ </scm> -->
<properties>
<tycho-version>0.10.0</tycho-version>
@@ -68,14 +68,6 @@
</dependencies> -->
- <repositories>
- <repository>
- <id>ganymede</id>
- <layout>p2</layout>
- <url>http://download.eclipse.org/eclipse/updates/3.4</url>
- </repository>
- </repositories>
-
<build>
<plugins>
<plugin>
Modified: branches/tycho/deployment/deployment-parent/pom.xml
===================================================================
--- branches/tycho/deployment/deployment-parent/pom.xml 2010-11-22 08:29:50 UTC (rev 1176)
+++ branches/tycho/deployment/deployment-parent/pom.xml 2010-11-27 03:47:24 UTC (rev 1177)
@@ -26,20 +26,13 @@
<modules>
<module>../org.cishell.feature</module>
<module>../org.cishell.reference.gui.feature</module>
- <module>../org.cishell.reference.product</module>
+ <module>../org.cishell.reference.brand.feature</module>
+ <module>../org.cishell.reference.application</module>
<module>../../clients/gui/gui-build</module>
<module>../../core/core-build</module>
</modules>
- <repositories>
- <repository>
- <id>ganymede</id>
- <layout>p2</layout>
- <url>http://download.eclipse.org/eclipse/updates/3.4</url>
- </repository>
- </repositories>
-
<build>
<plugins>
<plugin>
Deleted: branches/tycho/deployment/org.cishell.reference.application/cishell.product
===================================================================
--- branches/tycho/deployment/org.cishell.reference.product/cishell.product 2010-11-22 06:03:33 UTC (rev 1175)
+++ branches/tycho/deployment/org.cishell.reference.application/cishell.product 2010-11-27 03:47:24 UTC (rev 1177)
@@ -1,36 +0,0 @@
-<?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.application/extra-files/configuration/config.ini.bak
===================================================================
--- branches/tycho/deployment/org.cishell.reference.application/extra-files/configuration/config.ini.bak (rev 0)
+++ branches/tycho/deployment/org.cishell.reference.application/extra-files/configuration/config.ini.bak 2010-11-27 03:47:24 UTC (rev 1177)
@@ -0,0 +1,6 @@
+#Product Runtime Configuration File
+
+osgi.splashPath=platform:/base/plugins/org.cishell.reference.gui.brand.cishell
+eclipse.product=org.cishell.reference.gui.brand.cishell.cishell
+osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.core.runtime@start,org.eclipse.equinox.ds@3:start,org.eclipse.equinox.log@3:start,org.eclipse.equinox.metatype@3:start,org.eclipse.equinox.cm@3:start,org.eclipse.equinox.event@3:start,org.cishell.service.autostart@4:start
+osgi.bundles.defaultStartLevel=4
\ No newline at end of file
Added: branches/tycho/deployment/org.cishell.reference.application/extra-files/configuration/default_menu.xml
===================================================================
--- branches/tycho/deployment/org.cishell.reference.application/extra-files/configuration/default_menu.xml (rev 0)
+++ branches/tycho/deployment/org.cishell.reference.application/extra-files/configuration/default_menu.xml 2010-11-27 03:47:24 UTC (rev 1177)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- <?xml version="1.0" encoding="ISO-8859-1" ?> -->
+<menu_layout>
+ <top_menu name="File">
+ <menu name="Load..." pid= "org.cishell.reference.gui.persistence.load.FileLoadAlgorithm "/>
+ <menu type="break"/>
+ <menu name="Save..." pid= "org.cishell.reference.gui.persistence.save.Save"/>
+ <menu type="break"/>
+ <menu name="View..." pid= "org.cishell.reference.gui.persistence.view.FileView"/>
+ <menu name="View With..." pid= "org.cishell.reference.gui.persistence.viewwith.FileViewWith"/>
+ <menu type="break"/>
+ <menu type="break"/>
+ <menu name="Exit" type="preserved"/>
+ </top_menu>
+
+ <top_menu name="Tools">
+ <menu name="Scheduler" pid=""/>
+ </top_menu>
+
+ <top_menu name="Help">
+ <menu name="Update" pid=""/>
+ <menu name="Manage Configuration" pid=""/>
+ </top_menu>
+</menu_layout>
Added: branches/tycho/deployment/org.cishell.reference.application/extra-files/licenses/license-apache-commons-collections.txt
===================================================================
--- branches/tycho/deployment/org.cishell.reference.application/extra-files/licenses/license-apache-commons-collections.txt (rev 0)
+++ branches/tycho/deployment/org.cishell.reference.application/extra-files/licenses/license-apache-commons-collections.txt 2010-11-27 03:47:24 UTC (rev 1177)
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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.
Added: branches/tycho/deployment/org.cishell.reference.application/extra-files/licenses/license-cishell.txt
===================================================================
--- branches/tycho/deployment/org.cishell.reference.application/extra-files/licenses/license-cishell.txt (rev 0)
+++ branches/tycho/deployment/org.cishell.reference.application/extra-files/licenses/license-cishell.txt 2010-11-27 03:47:24 UTC (rev 1177)
@@ -0,0 +1,20 @@
+CIShell: Cyberinfrastructure Shell
+Copyright 2005 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...)
Added: branches/tycho/deployment/org.cishell.reference.application/extra-files/licenses/license-colt.txt
===================================================================
--- branches/tycho/deployment/org.cishell.reference.application/extra-files/licenses/license-colt.txt (rev 0)
+++ branches/tycho/deployment/org.cishell.reference.application/extra-files/licenses/license-colt.txt 2010-11-27 03:47:24 UTC (rev 1177)
@@ -0,0 +1,10 @@
+ Packages cern.colt* , cern.jet*, cern.clhep
+
+Copyright (c) 1999 CERN - European Organization for Nuclear Research.
+
+Permission to use, copy, modify, distribute and sell this software and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation. CERN makes no representations about the suitability of this software for any purpose. It is provided "as is" without expressed or implied warranty.
+
+ Packages hep.aida.*
+
+Written by Pavel Binko, Dino Ferrero Merlino, Wolfgang Hoschek, Tony Johnson, Andreas Pfeiffer, and others. Check the FreeHEP home page for more info. Permission to use and/or redistribute this work is granted under the terms of the LGPL License, with the exception that any usage related to military applications is expressly forbidden. The software and documentation made available under the terms of this license are provided with no warranty.
+
Added: branches/tycho/deployment/org.cishell.reference.application/extra-files/licenses/license-jung.txt
===================================================================
--- branches/tycho/deployment/org.cishell.reference.application/extra-files/licenses/license-jung.txt (rev 0)
+++ branches/tycho/deployment/org.cishell.reference.application/extra-files/licenses/license-jung.txt 2010-11-27 03:47:24 UTC (rev 1177)
@@ -0,0 +1 @@
+BSD License
Added: branches/tycho/deployment/org.cishell.reference.application/extra-files/licenses/license-knopflerfish.txt
===================================================================
--- branches/tycho/deployment/org.cishell.reference.application/extra-files/licenses/license-knopflerfish.txt (rev 0)
+++ branches/tycho/deployment/org.cishell.reference.application/extra-files/licenses/license-knopflerfish.txt 2010-11-27 03:47:24 UTC (rev 1177)
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2003-2006, KNOPFLERFISH project
+ * All rights reserved.
+ *
+ * http://www.knopflerfish.org/license.html
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * - Neither the name of the KNOPFLERFISH project nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
Added: branches/tycho/deployment/org.cishell.reference.application/extra-files/licenses/license-prefuse.txt
===================================================================
--- branches/tycho/deployment/org.cishell.reference.application/extra-files/licenses/license-prefuse.txt (rev 0)
+++ branches/tycho/deployment/org.cishell.reference.application/extra-files/licenses/license-prefuse.txt 2010-11-27 03:47:24 UTC (rev 1177)
@@ -0,0 +1,35 @@
+
+ Copyright (c) 2004, 2005 Regents of the University of California.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ 3. All advertising materials mentioning features or use of this software
+ must display the following acknowledgement:
+
+ This product includes software developed by the Group for User
+ Interface Research at the University of California at Berkeley.
+
+ 4. The name of the University may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
Added: branches/tycho/deployment/org.cishell.reference.application/extra-files/sampledata/isi/barabasi-vespignani-wasserman.isi
===================================================================
--- branches/tycho/deployment/org.cishell.reference.application/extra-files/sampledata/isi/barabasi-vespignani-wasserman.isi (rev 0)
+++ branches/tycho/deployment/org.cishell.reference.application/extra-files/sampledata/isi/barabasi-vespignani-wasserman.isi 2010-11-27 03:47:24 UTC (rev 1177)
@@ -0,0 +1,19929 @@
+FN ISI Export Format
+VR 1.0
+PT J
+AU Wuchty, S
+ Barabasi, AL
+ Ferdig, MT
+TI Stable evolutionary signal in a Yeast protein interaction network
+SO BMC EVOLUTIONARY BIOLOGY
+LA English
+DT Article
+ID SACCHAROMYCES-CEREVISIAE; FUNCTIONAL MODULES; INTERACTION MAP; CELLULAR
+ NETWORKS; COMPLEX NETWORKS; IDENTIFICATION; ORGANIZATION; ORTHOLOGS;
+ PATTERNS; DATABASE
+AB Background: The recently emerged protein interaction network paradigm
+ can provide novel and important insights into the innerworkings of a
+ cell. Yet, the heavy burden of both false positive and false negative
+ protein-protein interaction data casts doubt on the broader usefulness
+ of these interaction sets. Approaches focusing on one-protein-at-a-time
+ have been powerfully employed to demonstrate the high degree of
+ conservation of proteins participating in numerous interactions; here,
+ we expand his 'node' focused paradigm to investigate the relative
+ persistence of 'link' based evolutionary signals in a protein
+ interaction network of S. cerevisiae and point out the value of this
+ relatively untapped source of information.
+ Results: The trend for highly connected proteins to be preferably
+ conserved in evolution is stable, even in the context of tremendous
+ noise in the underlying protein interactions as well as in the
+ assignment of orthology among five higher eukaryotes. We find that
+ local clustering around interactions correlates with preferred
+ evolutionary conservation of the participating proteins; furthermore
+ the correlation between high local clustering and evolutionary
+ conservation is accompanied by a stable elevated degree of coexpression
+ of the interacting proteins. We use this conserved interaction data,
+ combined with P. falciparum /Yeast orthologs, as proof-of-principle
+ that high-order network topology can be used comparatively to deduce
+ local network structure in non-model organisms.
+ Conclusion: High local clustering is a criterion for the reliability of
+ an interaction and coincides with preferred evolutionary conservation
+ and significant coexpression. These strong and stable correlations
+ indicate that evolutionary units go beyond a single protein to include
+ the interactions among them. In particular, the stability of these
+ signals in the face of extreme noise suggests that empirical protein
+ interaction data can be integrated with orthologous clustering around
+ these protein interactions to reliably infer local network structures
+ in non-model organisms.
+C1 Northwestern Univ, NW Inst Complex, Evanston, IL 60202 USA.
+ Univ Notre Dame, Dept Phys, Notre Dame, IN 46556 USA.
+ Univ Notre Dame, Dept Biol, Notre Dame, IN 46556 USA.
+RP Wuchty, S, Northwestern Univ, NW Inst Complex, Chambers Hall,600 Foster
+ St, Evanston, IL 60202 USA.
+EM s-w...@no...
+ al...@nd...
+ mf...@nd...
+CR ALBERT R, 2000, NATURE, V406, P378
+ ALBERT R, 2002, REV MOD PHYS, V74, P47
+ BABU MM, 2004, CURR OPIN STRUC BIOL, V14, P283
+ BARABAI A, 2004, NATURE REV GEN, P101
+ BARABASI AL, 1999, SCIENCE, V286, P509
+ BORK P, 2004, CURR OPIN STRUC BIOL, V14, P292
+ BOZDEC...
[truncated message content] |
|
From: <fu...@us...> - 2010-11-22 08:29:57
|
Revision: 1176
http://cishell.svn.sourceforge.net/cishell/?rev=1176&view=rev
Author: fugu13
Date: 2010-11-22 08:29:50 +0000 (Mon, 22 Nov 2010)
Log Message:
-----------
okay, a cishell product now builds, though with exceptions. I think those are from some combination of the wrong INI and lack of other configuration bits, and the autostart not starting. Those should be possible to remedy without too much problem
Modified Paths:
--------------
branches/tycho/core/org.cishell.reference.service.database/pom.xml
branches/tycho/deployment/org.cishell.feature/feature.xml
branches/tycho/deployment/org.cishell.reference.gui.feature/feature.xml
branches/tycho/deployment/org.cishell.reference.product/cishell.product
branches/tycho/lib-dependencies/pom.xml
Modified: branches/tycho/core/org.cishell.reference.service.database/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.reference.service.database/pom.xml 2010-11-22 06:03:33 UTC (rev 1175)
+++ branches/tycho/core/org.cishell.reference.service.database/pom.xml 2010-11-22 08:29:50 UTC (rev 1176)
@@ -13,17 +13,5 @@
<artifactId>org.cishell.reference.service.database</artifactId>
<packaging>eclipse-plugin</packaging>
- <dependencies>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.6.2.1</version>
- </dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.4</version>
- </dependency>
- </dependencies>
</project>
Modified: branches/tycho/deployment/org.cishell.feature/feature.xml
===================================================================
--- branches/tycho/deployment/org.cishell.feature/feature.xml 2010-11-22 06:03:33 UTC (rev 1175)
+++ branches/tycho/deployment/org.cishell.feature/feature.xml 2010-11-22 08:29:50 UTC (rev 1176)
@@ -43,4 +43,75 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.cishell.reference"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.cishell.reference.prefs.admin"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.cishell.service.database"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.cishell.utilities"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.cishell.utility.datastructure"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.cishell.utility.swt"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.cishell.reference.service.database"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.cishell.service.autostart"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.cishell.algorithm.convertergraph"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.cishell.reference.services"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+
</feature>
Modified: branches/tycho/deployment/org.cishell.reference.gui.feature/feature.xml
===================================================================
--- branches/tycho/deployment/org.cishell.reference.gui.feature/feature.xml 2010-11-22 06:03:33 UTC (rev 1175)
+++ branches/tycho/deployment/org.cishell.reference.gui.feature/feature.xml 2010-11-22 08:29:50 UTC (rev 1176)
@@ -98,5 +98,75 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="colt"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+ <plugin
+ id="com.google.collections"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="commons-collections"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="concurrent"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="jung"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.prefuse"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="joda-time"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="derby"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.dbcp"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.pool"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+
</feature>
Modified: branches/tycho/deployment/org.cishell.reference.product/cishell.product
===================================================================
--- branches/tycho/deployment/org.cishell.reference.product/cishell.product 2010-11-22 06:03:33 UTC (rev 1175)
+++ branches/tycho/deployment/org.cishell.reference.product/cishell.product 2010-11-22 08:29:50 UTC (rev 1176)
@@ -1,7 +1,7 @@
<?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">
+<product name="CIShell" uid="cishell.product.id" id="cishell.product" application="org.cishell.reference.gui.workspace.CIShellApplication" version="1.0.0" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
Modified: branches/tycho/lib-dependencies/pom.xml
===================================================================
--- branches/tycho/lib-dependencies/pom.xml 2010-11-22 06:03:33 UTC (rev 1175)
+++ branches/tycho/lib-dependencies/pom.xml 2010-11-22 08:29:50 UTC (rev 1176)
@@ -20,6 +20,16 @@
<dependencies>
<dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.6.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
<groupId>cishell.libs</groupId>
<artifactId>jung</artifactId>
<version>1.7.6-001</version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: <fu...@us...> - 2010-11-21 00:59:40
|
Revision: 1174
http://cishell.svn.sourceforge.net/cishell/?rev=1174&view=rev
Author: fugu13
Date: 2010-11-21 00:59:34 +0000 (Sun, 21 Nov 2010)
Log Message:
-----------
committing some stuff, but there is a weird problem with the osgi log service dependency
Added 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/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/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/clients/gui/pom.xml
Added: branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/pom.xml
===================================================================
--- branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/pom.xml (rev 0)
+++ branches/tycho/clients/gui/org.cishell.reference.gui.brand.cishell/pom.xml 2010-11-21 00:59:34 UTC (rev 1174)
@@ -0,0 +1,14 @@
+<?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>
+ <parent>
+ <artifactId>gui</artifactId>
+ <groupId>cishell</groupId>
+ <version>1.0.0</version>
+ </parent>
+ <groupId>cishell</groupId>
+ <artifactId>org.cishell.reference.gui.brand.cishell</artifactId>
+ <version>0.4.0</version>
+ <packaging>eclipse-plugin</packaging>
+</project>
Added: branches/tycho/clients/gui/org.cishell.reference.gui.datamanager/pom.xml
===================================================================
--- branches/tycho/clients/gui/org.cishell.reference.gui.datamanager/pom.xml (rev 0)
+++ branches/tycho/clients/gui/org.cishell.reference.gui.datamanager/pom.xml 2010-11-21 00:59:34 UTC (rev 1174)
@@ -0,0 +1,14 @@
+<?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>
+ <parent>
+ <artifactId>gui</artifactId>
+ <groupId>cishell</groupId>
+ <version>1.0.0</version>
+ </parent>
+ <groupId>cishell</groupId>
+ <artifactId>org.cishell.reference.gui.datamanager</artifactId>
+ <version>1.0.0</version>
+ <packaging>eclipse-plugin</packaging>
+</project>
Added: branches/tycho/clients/gui/org.cishell.reference.gui.guibuilder.swt/pom.xml
===================================================================
--- branches/tycho/clients/gui/org.cishell.reference.gui.guibuilder.swt/pom.xml (rev 0)
+++ branches/tycho/clients/gui/org.cishell.reference.gui.guibuilder.swt/pom.xml 2010-11-21 00:59:34 UTC (rev 1174)
@@ -0,0 +1,14 @@
+<?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>
+ <parent>
+ <artifactId>gui</artifactId>
+ <groupId>cishell</groupId>
+ <version>1.0.0</version>
+ </parent>
+ <groupId>cishell</groupId>
+ <artifactId>org.cishell.reference.gui.guibuilder.swt</artifactId>
+ <version>1.0.0</version>
+ <packaging>eclipse-plugin</packaging>
+</project>
Added: branches/tycho/clients/gui/org.cishell.reference.gui.log/pom.xml
===================================================================
--- branches/tycho/clients/gui/org.cishell.reference.gui.log/pom.xml (rev 0)
+++ branches/tycho/clients/gui/org.cishell.reference.gui.log/pom.xml 2010-11-21 00:59:34 UTC (rev 1174)
@@ -0,0 +1,14 @@
+<?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>
+ <parent>
+ <artifactId>gui</artifactId>
+ <groupId>cishell</groupId>
+ <version>1.0.0</version>
+ </parent>
+ <groupId>cishell</groupId>
+ <artifactId>org.cishell.reference.gui.log</artifactId>
+ <version>1.0.0</version>
+ <packaging>eclipse-plugin</packaging>
+</project>
Added: branches/tycho/clients/gui/org.cishell.reference.gui.menumanager/pom.xml
===================================================================
--- branches/tycho/clients/gui/org.cishell.reference.gui.menumanager/pom.xml (rev 0)
+++ branches/tycho/clients/gui/org.cishell.reference.gui.menumanager/pom.xml 2010-11-21 00:59:34 UTC (rev 1174)
@@ -0,0 +1,14 @@
+<?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>
+ <parent>
+ <artifactId>gui</artifactId>
+ <groupId>cishell</groupId>
+ <version>1.0.0</version>
+ </parent>
+ <groupId>cishell</groupId>
+ <artifactId>org.cishell.reference.gui.menumanager</artifactId>
+ <version>1.0.0</version>
+ <packaging>eclipse-plugin</packaging>
+</project>
Added: branches/tycho/clients/gui/org.cishell.reference.gui.persistence/pom.xml
===================================================================
--- branches/tycho/clients/gui/org.cishell.reference.gui.persistence/pom.xml (rev 0)
+++ branches/tycho/clients/gui/org.cishell.reference.gui.persistence/pom.xml 2010-11-21 00:59:34 UTC (rev 1174)
@@ -0,0 +1,14 @@
+<?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>
+ <parent>
+ <artifactId>gui</artifactId>
+ <groupId>cishell</groupId>
+ <version>1.0.0</version>
+ </parent>
+ <groupId>cishell</groupId>
+ <artifactId>org.cishell.reference.gui.persistence</artifactId>
+ <version>1.0.0</version>
+ <packaging>eclipse-plugin</packaging>
+</project>
Added: branches/tycho/clients/gui/org.cishell.reference.gui.prefs.swt/pom.xml
===================================================================
--- branches/tycho/clients/gui/org.cishell.reference.gui.prefs.swt/pom.xml (rev 0)
+++ branches/tycho/clients/gui/org.cishell.reference.gui.prefs.swt/pom.xml 2010-11-21 00:59:34 UTC (rev 1174)
@@ -0,0 +1,14 @@
+<?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>
+ <parent>
+ <artifactId>gui</artifactId>
+ <groupId>cishell</groupId>
+ <version>1.0.0</version>
+ </parent>
+ <groupId>cishell</groupId>
+ <artifactId>org.cishell.reference.gui.prefs.swt</artifactId>
+ <version>0.0.1</version>
+ <packaging>eclipse-plugin</packaging>
+</project>
Added: branches/tycho/clients/gui/org.cishell.reference.gui.scheduler/pom.xml
===================================================================
--- branches/tycho/clients/gui/org.cishell.reference.gui.scheduler/pom.xml (rev 0)
+++ branches/tycho/clients/gui/org.cishell.reference.gui.scheduler/pom.xml 2010-11-21 00:59:34 UTC (rev 1174)
@@ -0,0 +1,14 @@
+<?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>
+ <parent>
+ <artifactId>gui</artifactId>
+ <groupId>cishell</groupId>
+ <version>1.0.0</version>
+ </parent>
+ <groupId>cishell</groupId>
+ <artifactId>org.cishell.reference.gui.scheduler</artifactId>
+ <version>1.0.0</version>
+ <packaging>eclipse-plugin</packaging>
+</project>
Added: branches/tycho/clients/gui/org.cishell.reference.gui.workspace/pom.xml
===================================================================
--- branches/tycho/clients/gui/org.cishell.reference.gui.workspace/pom.xml (rev 0)
+++ branches/tycho/clients/gui/org.cishell.reference.gui.workspace/pom.xml 2010-11-21 00:59:34 UTC (rev 1174)
@@ -0,0 +1,14 @@
+<?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>
+ <parent>
+ <artifactId>gui</artifactId>
+ <groupId>cishell</groupId>
+ <version>1.0.0</version>
+ </parent>
+ <groupId>cishell</groupId>
+ <artifactId>org.cishell.reference.gui.workspace</artifactId>
+ <version>1.0.0</version>
+ <packaging>eclipse-plugin</packaging>
+</project>
Added: branches/tycho/clients/gui/pom.xml
===================================================================
--- branches/tycho/clients/gui/pom.xml (rev 0)
+++ branches/tycho/clients/gui/pom.xml 2010-11-21 00:59:34 UTC (rev 1174)
@@ -0,0 +1,57 @@
+<?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>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fu...@us...> - 2010-11-20 19:20:19
|
Revision: 1173
http://cishell.svn.sourceforge.net/cishell/?rev=1173&view=rev
Author: fugu13
Date: 2010-11-20 19:20:11 +0000 (Sat, 20 Nov 2010)
Log Message:
-----------
committing a rearrangement that makes things nicer and more eclipse-y
Modified Paths:
--------------
branches/tycho/core/org.cishell.algorithm.convertergraph/pom.xml
branches/tycho/core/org.cishell.framework/pom.xml
branches/tycho/core/org.cishell.reference/pom.xml
branches/tycho/core/org.cishell.reference.prefs.admin/pom.xml
branches/tycho/core/org.cishell.reference.service.database/pom.xml
branches/tycho/core/org.cishell.reference.services/pom.xml
branches/tycho/core/org.cishell.service.autostart/pom.xml
branches/tycho/core/org.cishell.service.database/pom.xml
branches/tycho/core/org.cishell.utilities/pom.xml
branches/tycho/core/org.cishell.utility.datastructure/pom.xml
branches/tycho/core/org.cishell.utility.swt/pom.xml
branches/tycho/deployment/deployment-parent/pom.xml
Added Paths:
-----------
branches/tycho/core/core-build/
branches/tycho/core/core-build/pom.xml
Removed Paths:
-------------
branches/tycho/core/pom.xml
Copied: branches/tycho/core/core-build/pom.xml (from rev 1169, branches/tycho/core/pom.xml)
===================================================================
--- branches/tycho/core/core-build/pom.xml (rev 0)
+++ branches/tycho/core/core-build/pom.xml 2010-11-20 19:20:11 UTC (rev 1173)
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <prerequisites>
+ <maven>3.0</maven>
+ </prerequisites>
+ <groupId>cishell</groupId>
+ <artifactId>core-build</artifactId>
+ <version>1.0.0</version>
+
+ <packaging>pom</packaging>
+
+ <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>
+ </scm>
+
+ <properties>
+ <tycho-version>0.10.0</tycho-version>
+ </properties>
+
+ <modules>
+ <module>../org.cishell.framework</module>
+ <module>../org.cishell.reference</module>
+ <module>../org.cishell.service.autostart</module>
+ <module>../org.cishell.service.database</module>
+ <module>../org.cishell.algorithm.convertergraph</module>
+ <module>../org.cishell.utilities</module>
+ <module>../org.cishell.utility.datastructure</module>
+ <module>../org.cishell.utility.swt</module>
+ <module>../org.cishell.reference.services</module>
+ <module>../org.cishell.reference.service.database</module>
+ <module>../org.cishell.reference.prefs.admin</module>
+ </modules>
+
+ <dependencies>
+ <dependency>
+ <groupId>cishell.libs</groupId>
+ <artifactId>jung</artifactId>
+ <version>1.7.6-001-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>cishell.libs</groupId>
+ <artifactId>com.google.collections</artifactId>
+ <version>1.0-001-SNAPSHOT</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-SNAPSHOT</version>
+ </dependency>
+
+ </dependencies>
+
+ <repositories>
+ <repository>
+ <id>ganymede</id>
+ <layout>p2</layout>
+ <url>http://download.eclipse.org/releases/ganymede</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>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-plugin</artifactId>
+ <version>1.4</version>
+ <configuration>
+ <connectionType>developerConnection</connectionType>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Modified: branches/tycho/core/org.cishell.algorithm.convertergraph/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.algorithm.convertergraph/pom.xml 2010-11-20 00:24:23 UTC (rev 1172)
+++ branches/tycho/core/org.cishell.algorithm.convertergraph/pom.xml 2010-11-20 19:20:11 UTC (rev 1173)
@@ -7,6 +7,7 @@
<groupId>cishell</groupId>
<artifactId>core-build</artifactId>
<version>1.0.0</version>
+ <relativePath>../core-build/pom.xml</relativePath>
</parent>
<artifactId>org.cishell.algorithm.convertergraph</artifactId>
Modified: branches/tycho/core/org.cishell.framework/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.framework/pom.xml 2010-11-20 00:24:23 UTC (rev 1172)
+++ branches/tycho/core/org.cishell.framework/pom.xml 2010-11-20 19:20:11 UTC (rev 1173)
@@ -7,6 +7,7 @@
<groupId>cishell</groupId>
<artifactId>core-build</artifactId>
<version>1.0.0</version>
+ <relativePath>../core-build/pom.xml</relativePath>
</parent>
<artifactId>org.cishell.framework</artifactId>
Modified: branches/tycho/core/org.cishell.reference/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.reference/pom.xml 2010-11-20 00:24:23 UTC (rev 1172)
+++ branches/tycho/core/org.cishell.reference/pom.xml 2010-11-20 19:20:11 UTC (rev 1173)
@@ -7,6 +7,7 @@
<groupId>cishell</groupId>
<artifactId>core-build</artifactId>
<version>1.0.0</version>
+ <relativePath>../core-build/pom.xml</relativePath>
</parent>
<artifactId>org.cishell.reference</artifactId>
Modified: branches/tycho/core/org.cishell.reference.prefs.admin/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.reference.prefs.admin/pom.xml 2010-11-20 00:24:23 UTC (rev 1172)
+++ branches/tycho/core/org.cishell.reference.prefs.admin/pom.xml 2010-11-20 19:20:11 UTC (rev 1173)
@@ -7,6 +7,7 @@
<groupId>cishell</groupId>
<artifactId>core-build</artifactId>
<version>1.0.0</version>
+ <relativePath>../core-build/pom.xml</relativePath>
</parent>
<artifactId>org.cishell.reference.prefs.admin</artifactId>
Modified: branches/tycho/core/org.cishell.reference.service.database/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.reference.service.database/pom.xml 2010-11-20 00:24:23 UTC (rev 1172)
+++ branches/tycho/core/org.cishell.reference.service.database/pom.xml 2010-11-20 19:20:11 UTC (rev 1173)
@@ -7,6 +7,7 @@
<groupId>cishell</groupId>
<artifactId>core-build</artifactId>
<version>1.0.0</version>
+ <relativePath>../core-build/pom.xml</relativePath>
</parent>
<artifactId>org.cishell.reference.service.database</artifactId>
Modified: branches/tycho/core/org.cishell.reference.services/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.reference.services/pom.xml 2010-11-20 00:24:23 UTC (rev 1172)
+++ branches/tycho/core/org.cishell.reference.services/pom.xml 2010-11-20 19:20:11 UTC (rev 1173)
@@ -7,6 +7,7 @@
<groupId>cishell</groupId>
<artifactId>core-build</artifactId>
<version>1.0.0</version>
+ <relativePath>../core-build/pom.xml</relativePath>
</parent>
<artifactId>org.cishell.reference.services</artifactId>
Modified: branches/tycho/core/org.cishell.service.autostart/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.service.autostart/pom.xml 2010-11-20 00:24:23 UTC (rev 1172)
+++ branches/tycho/core/org.cishell.service.autostart/pom.xml 2010-11-20 19:20:11 UTC (rev 1173)
@@ -7,6 +7,7 @@
<groupId>cishell</groupId>
<artifactId>core-build</artifactId>
<version>1.0.0</version>
+ <relativePath>../core-build/pom.xml</relativePath>
</parent>
<artifactId>org.cishell.service.autostart</artifactId>
Modified: branches/tycho/core/org.cishell.service.database/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.service.database/pom.xml 2010-11-20 00:24:23 UTC (rev 1172)
+++ branches/tycho/core/org.cishell.service.database/pom.xml 2010-11-20 19:20:11 UTC (rev 1173)
@@ -7,6 +7,7 @@
<groupId>cishell</groupId>
<artifactId>core-build</artifactId>
<version>1.0.0</version>
+ <relativePath>../core-build/pom.xml</relativePath>
</parent>
<artifactId>org.cishell.service.database</artifactId>
Modified: branches/tycho/core/org.cishell.utilities/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.utilities/pom.xml 2010-11-20 00:24:23 UTC (rev 1172)
+++ branches/tycho/core/org.cishell.utilities/pom.xml 2010-11-20 19:20:11 UTC (rev 1173)
@@ -7,6 +7,7 @@
<groupId>cishell</groupId>
<artifactId>core-build</artifactId>
<version>1.0.0</version>
+ <relativePath>../core-build/pom.xml</relativePath>
</parent>
<artifactId>org.cishell.utilities</artifactId>
Modified: branches/tycho/core/org.cishell.utility.datastructure/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.utility.datastructure/pom.xml 2010-11-20 00:24:23 UTC (rev 1172)
+++ branches/tycho/core/org.cishell.utility.datastructure/pom.xml 2010-11-20 19:20:11 UTC (rev 1173)
@@ -7,6 +7,7 @@
<groupId>cishell</groupId>
<artifactId>core-build</artifactId>
<version>1.0.0</version>
+ <relativePath>../core-build/pom.xml</relativePath>
</parent>
<artifactId>org.cishell.utility.datastructure</artifactId>
Modified: branches/tycho/core/org.cishell.utility.swt/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.utility.swt/pom.xml 2010-11-20 00:24:23 UTC (rev 1172)
+++ branches/tycho/core/org.cishell.utility.swt/pom.xml 2010-11-20 19:20:11 UTC (rev 1173)
@@ -7,6 +7,7 @@
<groupId>cishell</groupId>
<artifactId>core-build</artifactId>
<version>1.0.0</version>
+ <relativePath>../core-build/pom.xml</relativePath>
</parent>
<artifactId>org.cishell.utility.swt</artifactId>
Deleted: branches/tycho/core/pom.xml
===================================================================
--- branches/tycho/core/pom.xml 2010-11-20 00:24:23 UTC (rev 1172)
+++ branches/tycho/core/pom.xml 2010-11-20 19:20:11 UTC (rev 1173)
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-
- <modelVersion>4.0.0</modelVersion>
-
- <prerequisites>
- <maven>3.0</maven>
- </prerequisites>
- <groupId>cishell</groupId>
- <artifactId>core-build</artifactId>
- <version>1.0.0</version>
-
- <packaging>pom</packaging>
-
- <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>
- </scm>
-
- <properties>
- <tycho-version>0.10.0</tycho-version>
- </properties>
-
- <modules>
- <module>org.cishell.framework</module>
- <module>org.cishell.reference</module>
- <module>org.cishell.service.autostart</module>
- <module>org.cishell.service.database</module>
- <module>org.cishell.algorithm.convertergraph</module>
- <module>org.cishell.utilities</module>
- <module>org.cishell.utility.datastructure</module>
- <module>org.cishell.utility.swt</module>
- <module>org.cishell.reference.services</module>
- <module>org.cishell.reference.service.database</module>
- <module>org.cishell.reference.prefs.admin</module>
- </modules>
-
- <dependencies>
- <dependency>
- <groupId>cishell.libs</groupId>
- <artifactId>jung</artifactId>
- <version>1.7.6-001-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>cishell.libs</groupId>
- <artifactId>com.google.collections</artifactId>
- <version>1.0-001-SNAPSHOT</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-SNAPSHOT</version>
- </dependency>
-
- </dependencies>
-
- <repositories>
- <repository>
- <id>ganymede</id>
- <layout>p2</layout>
- <url>http://download.eclipse.org/releases/ganymede</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>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-plugin</artifactId>
- <version>1.4</version>
- <configuration>
- <connectionType>developerConnection</connectionType>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
Modified: branches/tycho/deployment/deployment-parent/pom.xml
===================================================================
--- branches/tycho/deployment/deployment-parent/pom.xml 2010-11-20 00:24:23 UTC (rev 1172)
+++ branches/tycho/deployment/deployment-parent/pom.xml 2010-11-20 19:20:11 UTC (rev 1173)
@@ -17,7 +17,7 @@
<modules>
<module>../org.cishell.feature</module>
- <module>../../core</module>
+ <module>../../core/core-build</module>
</modules>
<repositories>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fu...@us...> - 2010-11-20 00:24:29
|
Revision: 1172
http://cishell.svn.sourceforge.net/cishell/?rev=1172&view=rev
Author: fugu13
Date: 2010-11-20 00:24:23 +0000 (Sat, 20 Nov 2010)
Log Message:
-----------
committing a simple feature before I forget. Real Features (TM) coming later
Added Paths:
-----------
branches/tycho/deployment/
branches/tycho/deployment/deployment-parent/
branches/tycho/deployment/deployment-parent/pom.xml
branches/tycho/deployment/org.cishell.feature/
branches/tycho/deployment/org.cishell.feature/build.properties
branches/tycho/deployment/org.cishell.feature/feature.xml
branches/tycho/deployment/org.cishell.feature/pom.xml
Added: branches/tycho/deployment/deployment-parent/pom.xml
===================================================================
--- branches/tycho/deployment/deployment-parent/pom.xml (rev 0)
+++ branches/tycho/deployment/deployment-parent/pom.xml 2010-11-20 00:24:23 UTC (rev 1172)
@@ -0,0 +1,52 @@
+<?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>
+ <groupId>org.cishell</groupId>
+ <artifactId>deployment-parent</artifactId>
+ <packaging>pom</packaging>
+ <name>CIShell Deployment Parent</name>
+
+ <properties>
+ <tycho-version>0.10.0</tycho-version>
+ <tycho-groupid>org.sonatype.tycho</tycho-groupid>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <modules>
+ <module>../org.cishell.feature</module>
+ <module>../../core</module>
+ </modules>
+
+ <repositories>
+ <repository>
+ <id>ganymede</id>
+ <layout>p2</layout>
+ <url>http://download.eclipse.org/releases/ganymede</url>
+ </repository>
+ </repositories>
+
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>${tycho-groupid}</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>
Added: branches/tycho/deployment/org.cishell.feature/build.properties
===================================================================
--- branches/tycho/deployment/org.cishell.feature/build.properties (rev 0)
+++ branches/tycho/deployment/org.cishell.feature/build.properties 2010-11-20 00:24:23 UTC (rev 1172)
@@ -0,0 +1 @@
+bin.includes = feature.xml
Added: branches/tycho/deployment/org.cishell.feature/feature.xml
===================================================================
--- branches/tycho/deployment/org.cishell.feature/feature.xml (rev 0)
+++ branches/tycho/deployment/org.cishell.feature/feature.xml 2010-11-20 00:24:23 UTC (rev 1172)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.cishell.feature"
+ label="CIShell Framework API Feature"
+ version="1.0.0">
+
+ <description url="http://cishell.org">
+ CIShell Framework API
+ </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.framework"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
Added: branches/tycho/deployment/org.cishell.feature/pom.xml
===================================================================
--- branches/tycho/deployment/org.cishell.feature/pom.xml (rev 0)
+++ branches/tycho/deployment/org.cishell.feature/pom.xml 2010-11-20 00:24:23 UTC (rev 1172)
@@ -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>1.0.0</version>
+ <artifactId>org.cishell.feature</artifactId>
+ <packaging>eclipse-feature</packaging>
+ <name>CIShell Framework API Feature</name>
+
+ <parent>
+ <version>1.0.0</version>
+ <groupId>org.cishell</groupId>
+ <artifactId>deployment-parent</artifactId>
+ <relativePath>../deployment-parent/pom.xml</relativePath>
+ </parent>
+
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2010-11-18 17:15:43
|
Revision: 1171
http://cishell.svn.sourceforge.net/cishell/?rev=1171&view=rev
Author: pataphil
Date: 2010-11-18 17:15:36 +0000 (Thu, 18 Nov 2010)
Log Message:
-----------
* Hack NPE fix.
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/SWTGuiBuilderService.java
trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/LabelingComponent.java
Modified: trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/SWTGuiBuilderService.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/SWTGuiBuilderService.java 2010-11-17 23:23:34 UTC (rev 1170)
+++ trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/SWTGuiBuilderService.java 2010-11-18 17:15:36 UTC (rev 1171)
@@ -69,7 +69,7 @@
if (validParams) {
GUICreator creator = new GUICreator(id, parameters);
- display.syncExec(creator);
+ this.display.syncExec(creator);
return creator.gui;
} else {
@@ -96,7 +96,7 @@
shell.setImage(activeShell.getImage());
}
- gui = new SWTGui(shell,SWT.NONE,id,parameters);
+ gui = new SWTGui(shell, SWT.NONE, id, parameters);
} catch (IllegalArgumentException e) {}
}
}
Modified: trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/LabelingComponent.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/LabelingComponent.java 2010-11-17 23:23:34 UTC (rev 1170)
+++ trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/LabelingComponent.java 2010-11-18 17:15:36 UTC (rev 1171)
@@ -158,11 +158,14 @@
public String validate() {
String valid = childComponent.validate();
- // If valid is a string then the string is the error message.
- if ((valid != null) && (valid.length() > 0)) {
- label.setForeground(ERROR_COLOR);
- } else {
- label.setForeground(null);
+ // TODO: HACK: label may not have been created yet.
+ if (this.label != null) {
+ // If valid is a string then the string is the error message.
+ if ((valid != null) && (valid.length() > 0)) {
+ label.setForeground(ERROR_COLOR);
+ } else {
+ label.setForeground(null);
+ }
}
return valid;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fu...@us...> - 2010-11-17 23:23:41
|
Revision: 1170
http://cishell.svn.sourceforge.net/cishell/?rev=1170&view=rev
Author: fugu13
Date: 2010-11-17 23:23:34 +0000 (Wed, 17 Nov 2010)
Log Message:
-----------
making it clear that, at least right now, this pom is not to be used
Added Paths:
-----------
branches/tycho/pom.xml.bak
Removed Paths:
-------------
branches/tycho/pom.xml
Deleted: branches/tycho/pom.xml
===================================================================
--- branches/tycho/pom.xml 2010-11-17 23:13:22 UTC (rev 1169)
+++ branches/tycho/pom.xml 2010-11-17 23:23:34 UTC (rev 1170)
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-
- <modelVersion>4.0.0</modelVersion>
-
- <prerequisites>
- <maven>3.0</maven>
- </prerequisites>
- <groupId>cishell</groupId>
- <artifactId>build</artifactId>
- <version>1.0.0</version>
-
- <packaging>pom</packaging>
-
- <properties>
- <tycho-version>0.10.0</tycho-version>
- </properties>
-
- <modules>
- <module>libs</module>
- <module>core</module>
- <!-- <module>tycho.demo.itp02.bundle.tests</module> -->
- </modules>
-
- <repositories>
- <repository>
- <id>ganymede</id>
- <layout>p2</layout>
- <url>http://download.eclipse.org/releases/ganymede</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>
Copied: branches/tycho/pom.xml.bak (from rev 1168, branches/tycho/pom.xml)
===================================================================
--- branches/tycho/pom.xml.bak (rev 0)
+++ branches/tycho/pom.xml.bak 2010-11-17 23:23:34 UTC (rev 1170)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <prerequisites>
+ <maven>3.0</maven>
+ </prerequisites>
+ <groupId>cishell</groupId>
+ <artifactId>build</artifactId>
+ <version>1.0.0</version>
+
+ <packaging>pom</packaging>
+
+ <properties>
+ <tycho-version>0.10.0</tycho-version>
+ </properties>
+
+ <modules>
+ <module>libs</module>
+ <module>core</module>
+ <!-- <module>tycho.demo.itp02.bundle.tests</module> -->
+ </modules>
+
+ <repositories>
+ <repository>
+ <id>ganymede</id>
+ <layout>p2</layout>
+ <url>http://download.eclipse.org/releases/ganymede</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>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fu...@us...> - 2010-11-17 23:13:29
|
Revision: 1169
http://cishell.svn.sourceforge.net/cishell/?rev=1169&view=rev
Author: fugu13
Date: 2010-11-17 23:13:22 +0000 (Wed, 17 Nov 2010)
Log Message:
-----------
start adding scm support. This was committed using maven itself
Modified Paths:
--------------
branches/tycho/core/pom.xml
Modified: branches/tycho/core/pom.xml
===================================================================
--- branches/tycho/core/pom.xml 2010-11-16 06:16:16 UTC (rev 1168)
+++ branches/tycho/core/pom.xml 2010-11-17 23:13:22 UTC (rev 1169)
@@ -12,6 +12,11 @@
<packaging>pom</packaging>
+ <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>
+ </scm>
+
<properties>
<tycho-version>0.10.0</tycho-version>
</properties>
@@ -79,6 +84,14 @@
<pomDependencies>consider</pomDependencies>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-plugin</artifactId>
+ <version>1.4</version>
+ <configuration>
+ <connectionType>developerConnection</connectionType>
+ </configuration>
+ </plugin>
</plugins>
</build>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fu...@us...> - 2010-11-16 06:16:22
|
Revision: 1168
http://cishell.svn.sourceforge.net/cishell/?rev=1168&view=rev
Author: fugu13
Date: 2010-11-16 06:16:16 +0000 (Tue, 16 Nov 2010)
Log Message:
-----------
add prefs admin bundle, since I see it is built into the tool
Modified Paths:
--------------
branches/tycho/core/org.cishell.reference.prefs.admin/META-INF/MANIFEST.MF
branches/tycho/core/pom.xml
branches/tycho/pom.xml
Modified: branches/tycho/core/org.cishell.reference.prefs.admin/META-INF/MANIFEST.MF
===================================================================
--- branches/tycho/core/org.cishell.reference.prefs.admin/META-INF/MANIFEST.MF 2010-11-16 02:23:29 UTC (rev 1167)
+++ branches/tycho/core/org.cishell.reference.prefs.admin/META-INF/MANIFEST.MF 2010-11-16 06:16:16 UTC (rev 1168)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: CIShell Pref Admin
Bundle-SymbolicName: org.cishell.reference.prefs.admin
-Bundle-Version: 0.0.1
+Bundle-Version: 1.0.0
Bundle-ClassPath: .
Import-Package: org.cishell.framework,
org.cishell.framework.algorithm,
Modified: branches/tycho/core/pom.xml
===================================================================
--- branches/tycho/core/pom.xml 2010-11-16 02:23:29 UTC (rev 1167)
+++ branches/tycho/core/pom.xml 2010-11-16 06:16:16 UTC (rev 1168)
@@ -27,6 +27,7 @@
<module>org.cishell.utility.swt</module>
<module>org.cishell.reference.services</module>
<module>org.cishell.reference.service.database</module>
+ <module>org.cishell.reference.prefs.admin</module>
</modules>
<dependencies>
Modified: branches/tycho/pom.xml
===================================================================
--- branches/tycho/pom.xml 2010-11-16 02:23:29 UTC (rev 1167)
+++ branches/tycho/pom.xml 2010-11-16 06:16:16 UTC (rev 1168)
@@ -17,9 +17,9 @@
</properties>
<modules>
+ <module>libs</module>
<module>core</module>
<!-- <module>tycho.demo.itp02.bundle.tests</module> -->
- <module>libs</module>
</modules>
<repositories>
@@ -50,4 +50,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fu...@us...> - 2010-11-16 02:23:36
|
Revision: 1167
http://cishell.svn.sourceforge.net/cishell/?rev=1167&view=rev
Author: fugu13
Date: 2010-11-16 02:23:29 +0000 (Tue, 16 Nov 2010)
Log Message:
-----------
these should not have been bundled in our own jars anyways. They will be their own jars from now on, automatically packaged in
Modified Paths:
--------------
branches/tycho/core/org.cishell.reference/META-INF/MANIFEST.MF
Removed Paths:
-------------
branches/tycho/core/org.cishell.framework/lib/
Modified: branches/tycho/core/org.cishell.reference/META-INF/MANIFEST.MF
===================================================================
--- branches/tycho/core/org.cishell.reference/META-INF/MANIFEST.MF 2010-11-14 18:38:40 UTC (rev 1166)
+++ branches/tycho/core/org.cishell.reference/META-INF/MANIFEST.MF 2010-11-16 02:23:29 UTC (rev 1167)
@@ -12,12 +12,16 @@
org.osgi.framework,
org.osgi.service.log,
org.osgi.service.metatype;version="1.1.0",
- org.osgi.service.prefs
+ org.osgi.service.prefs,
+ edu.uci.ics.jung.algorithms.shortestpath,
+ edu.uci.ics.jung.graph,
+ edu.uci.ics.jung.graph.impl,
+ edu.uci.ics.jung.io,
+ edu.uci.ics.jung.utils
Export-Package: org.cishell.reference.app.service.algorithminvocation,
org.cishell.reference.app.service.datamanager,
org.cishell.reference.app.service.scheduler,
org.cishell.reference.service.conversion,
org.cishell.reference.service.metatype
Eclipse-LazyStart: true
-Require-Bundle: jung
Bundle-RequiredExecutionEnvironment: J2SE-1.5
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fu...@us...> - 2010-11-14 18:38:46
|
Revision: 1166
http://cishell.svn.sourceforge.net/cishell/?rev=1166&view=rev
Author: fugu13
Date: 2010-11-14 18:38:40 +0000 (Sun, 14 Nov 2010)
Log Message:
-----------
the build moves along; it should be pretty much complete now
Modified Paths:
--------------
branches/tycho/core/org.cishell.reference.service.database/META-INF/MANIFEST.MF
branches/tycho/core/org.cishell.reference.service.database/pom.xml
branches/tycho/core/org.cishell.utilities/pom.xml
branches/tycho/core/pom.xml
Modified: branches/tycho/core/org.cishell.reference.service.database/META-INF/MANIFEST.MF
===================================================================
--- branches/tycho/core/org.cishell.reference.service.database/META-INF/MANIFEST.MF 2010-11-14 18:24:50 UTC (rev 1165)
+++ branches/tycho/core/org.cishell.reference.service.database/META-INF/MANIFEST.MF 2010-11-14 18:38:40 UTC (rev 1166)
@@ -13,7 +13,6 @@
org.cishell.service.database,
org.cishell.utilities,
org.cishell.utilities.database,
- org.eclipse.core.internal.runtime,
org.osgi.framework;version="1.4.0",
org.osgi.service.cm;version="1.2.0",
org.osgi.service.component;version="1.0.0",
Modified: branches/tycho/core/org.cishell.reference.service.database/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.reference.service.database/pom.xml 2010-11-14 18:24:50 UTC (rev 1165)
+++ branches/tycho/core/org.cishell.reference.service.database/pom.xml 2010-11-14 18:38:40 UTC (rev 1166)
@@ -18,6 +18,11 @@
<artifactId>derby</artifactId>
<version>10.6.2.1</version>
</dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.4</version>
+ </dependency>
</dependencies>
</project>
Modified: branches/tycho/core/org.cishell.utilities/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.utilities/pom.xml 2010-11-14 18:24:50 UTC (rev 1165)
+++ branches/tycho/core/org.cishell.utilities/pom.xml 2010-11-14 18:38:40 UTC (rev 1166)
@@ -12,4 +12,5 @@
<artifactId>org.cishell.utilities</artifactId>
<packaging>eclipse-plugin</packaging>
+
</project>
Modified: branches/tycho/core/pom.xml
===================================================================
--- branches/tycho/core/pom.xml 2010-11-14 18:24:50 UTC (rev 1165)
+++ branches/tycho/core/pom.xml 2010-11-14 18:38:40 UTC (rev 1166)
@@ -50,6 +50,7 @@
<artifactId>org.prefuse</artifactId>
<version>beta-20071021-001-SNAPSHOT</version>
</dependency>
+
</dependencies>
<repositories>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fu...@us...> - 2010-11-14 18:24:57
|
Revision: 1165
http://cishell.svn.sourceforge.net/cishell/?rev=1165&view=rev
Author: fugu13
Date: 2010-11-14 18:24:50 +0000 (Sun, 14 Nov 2010)
Log Message:
-----------
organize all the src folders
Modified Paths:
--------------
branches/tycho/core/org.cishell.reference.service.database/pom.xml
branches/tycho/core/pom.xml
Added Paths:
-----------
branches/tycho/core/org.cishell.reference.prefs.admin/src/main/
branches/tycho/core/org.cishell.reference.prefs.admin/src/main/java/
branches/tycho/core/org.cishell.reference.prefs.admin/src/main/java/org/
branches/tycho/core/org.cishell.reference.service.database/src/main/
branches/tycho/core/org.cishell.reference.service.database/src/main/java/
branches/tycho/core/org.cishell.reference.service.database/src/main/java/org/
branches/tycho/core/org.cishell.reference.services/src/main/
branches/tycho/core/org.cishell.reference.services/src/main/java/
branches/tycho/core/org.cishell.reference.services/src/main/java/org/
branches/tycho/core/org.cishell.service.autostart/src/main/
branches/tycho/core/org.cishell.service.autostart/src/main/java/
branches/tycho/core/org.cishell.service.autostart/src/main/java/org/
branches/tycho/core/org.cishell.service.database/src/main/
branches/tycho/core/org.cishell.service.database/src/main/java/
branches/tycho/core/org.cishell.service.database/src/main/java/org/
branches/tycho/core/org.cishell.utilities/src/main/
branches/tycho/core/org.cishell.utilities/src/main/java/
branches/tycho/core/org.cishell.utilities/src/main/java/org/
branches/tycho/core/org.cishell.utility.datastructure/src/main/
branches/tycho/core/org.cishell.utility.datastructure/src/main/java/
branches/tycho/core/org.cishell.utility.datastructure/src/main/java/org/
branches/tycho/core/org.cishell.utility.swt/src/main/
branches/tycho/core/org.cishell.utility.swt/src/main/java/
branches/tycho/core/org.cishell.utility.swt/src/main/java/org/
Removed Paths:
-------------
branches/tycho/core/org.cishell.reference.prefs.admin/src/org/
branches/tycho/core/org.cishell.reference.service.database/src/org/
branches/tycho/core/org.cishell.reference.services/src/org/
branches/tycho/core/org.cishell.service.autostart/src/org/
branches/tycho/core/org.cishell.service.database/src/org/
branches/tycho/core/org.cishell.utilities/src/org/
branches/tycho/core/org.cishell.utility.datastructure/src/org/
branches/tycho/core/org.cishell.utility.swt/src/org/
Modified: branches/tycho/core/org.cishell.reference.service.database/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.reference.service.database/pom.xml 2010-11-14 18:21:09 UTC (rev 1164)
+++ branches/tycho/core/org.cishell.reference.service.database/pom.xml 2010-11-14 18:24:50 UTC (rev 1165)
@@ -12,4 +12,12 @@
<artifactId>org.cishell.reference.service.database</artifactId>
<packaging>eclipse-plugin</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.6.2.1</version>
+ </dependency>
+ </dependencies>
+
</project>
Modified: branches/tycho/core/pom.xml
===================================================================
--- branches/tycho/core/pom.xml 2010-11-14 18:21:09 UTC (rev 1164)
+++ branches/tycho/core/pom.xml 2010-11-14 18:24:50 UTC (rev 1165)
@@ -24,6 +24,9 @@
<module>org.cishell.algorithm.convertergraph</module>
<module>org.cishell.utilities</module>
<module>org.cishell.utility.datastructure</module>
+ <module>org.cishell.utility.swt</module>
+ <module>org.cishell.reference.services</module>
+ <module>org.cishell.reference.service.database</module>
</modules>
<dependencies>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fu...@us...> - 2010-11-14 18:21:15
|
Revision: 1164
http://cishell.svn.sourceforge.net/cishell/?rev=1164&view=rev
Author: fugu13
Date: 2010-11-14 18:21:09 +0000 (Sun, 14 Nov 2010)
Log Message:
-----------
making src be osgi-y
Added Paths:
-----------
branches/tycho/core/org.cishell.algorithm.convertergraph/src/main/
branches/tycho/core/org.cishell.algorithm.convertergraph/src/main/java/
branches/tycho/core/org.cishell.algorithm.convertergraph/src/main/java/org/
Removed Paths:
-------------
branches/tycho/core/org.cishell.algorithm.convertergraph/src/org/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fu...@us...> - 2010-11-14 18:11:13
|
Revision: 1163
http://cishell.svn.sourceforge.net/cishell/?rev=1163&view=rev
Author: fugu13
Date: 2010-11-14 18:11:03 +0000 (Sun, 14 Nov 2010)
Log Message:
-----------
add new prefuse, everything so far works now
Modified Paths:
--------------
branches/tycho/core/pom.xml
Added Paths:
-----------
branches/tycho/libs/org.prefuse/
branches/tycho/libs/org.prefuse/osgi.bnd
branches/tycho/libs/org.prefuse/pom.xml
Modified: branches/tycho/core/pom.xml
===================================================================
--- branches/tycho/core/pom.xml 2010-11-14 18:10:14 UTC (rev 1162)
+++ branches/tycho/core/pom.xml 2010-11-14 18:11:03 UTC (rev 1163)
@@ -45,7 +45,7 @@
<dependency>
<groupId>cishell.libs</groupId>
<artifactId>org.prefuse</artifactId>
- <version>beta-20060220-001-SNAPSHOT</version>
+ <version>beta-20071021-001-SNAPSHOT</version>
</dependency>
</dependencies>
Added: branches/tycho/libs/org.prefuse/osgi.bnd
===================================================================
--- branches/tycho/libs/org.prefuse/osgi.bnd (rev 0)
+++ branches/tycho/libs/org.prefuse/osgi.bnd 2010-11-14 18:11:03 UTC (rev 1163)
@@ -0,0 +1,9 @@
+#--------------------------------------------------------------------------
+# Use this file to add customized Bnd instructions for the wrapped library
+#--------------------------------------------------------------------------
+
+#
+# this unpacks the contents of the wrapped jar artifact inside the bundle
+# to also inline dependencies of this artifact add Embed-Transitive: true
+#
+Embed-Dependency: *;scope=compile|runtime;type=!pom;inline=true
Added: branches/tycho/libs/org.prefuse/pom.xml
===================================================================
--- branches/tycho/libs/org.prefuse/pom.xml (rev 0)
+++ branches/tycho/libs/org.prefuse/pom.xml 2010-11-14 18:11:03 UTC (rev 1163)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <relativePath>../poms/wrappers/</relativePath>
+ <groupId>cishell.libs.build</groupId>
+ <artifactId>wrapper-bundle-settings</artifactId>
+ <version>1.0.0</version>
+ </parent>
+
+ <properties>
+ <bundle.symbolicName>org.prefuse</bundle.symbolicName>
+ <wrapped.groupId>org.prefuse</wrapped.groupId>
+ <wrapped.artifactId>prefuse</wrapped.artifactId>
+ <wrapped.version>beta-20071021</wrapped.version>
+ <bundle.version>2007.10.21</bundle.version>
+ </properties>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>cishell.libs</groupId>
+ <artifactId>org.prefuse</artifactId>
+ <version>beta-20071021-001-SNAPSHOT</version>
+
+ <name>${bundle.symbolicName} ${wrapped.version} [osgi]</name>
+
+ <packaging>bundle</packaging>
+
+ <repositories>
+ <repository>
+ <id>java.net</id>
+ <name>Java.net Repository</name>
+ <layout>default</layout>
+ <url>http://download.java.net/maven/2</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>${wrapped.groupId}</groupId>
+ <artifactId>${wrapped.artifactId}</artifactId>
+ <version>${wrapped.version}</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fu...@us...> - 2010-11-14 18:10:20
|
Revision: 1162
http://cishell.svn.sourceforge.net/cishell/?rev=1162&view=rev
Author: fugu13
Date: 2010-11-14 18:10:14 +0000 (Sun, 14 Nov 2010)
Log Message:
-----------
remove old prefuse
Modified Paths:
--------------
branches/tycho/libs/pom.xml
Removed Paths:
-------------
branches/tycho/libs/org.prefuse/
Modified: branches/tycho/libs/pom.xml
===================================================================
--- branches/tycho/libs/pom.xml 2010-11-14 10:49:19 UTC (rev 1161)
+++ branches/tycho/libs/pom.xml 2010-11-14 18:10:14 UTC (rev 1162)
@@ -84,4 +84,4 @@
</plugins>
</build>
-</project>
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fu...@us...> - 2010-11-14 10:49:30
|
Revision: 1161
http://cishell.svn.sourceforge.net/cishell/?rev=1161&view=rev
Author: fugu13
Date: 2010-11-14 10:49:19 +0000 (Sun, 14 Nov 2010)
Log Message:
-----------
okay, moving right along. The prefuse version in maven repositories is not what we need, so this will not build, but everything else is going well
Modified Paths:
--------------
branches/tycho/core/pom.xml
branches/tycho/libs/pom.xml
branches/tycho/libs/poms/wrappers/pom.xml
Added Paths:
-----------
branches/tycho/core/org.cishell.algorithm.convertergraph/pom.xml
branches/tycho/core/org.cishell.reference.prefs.admin/pom.xml
branches/tycho/core/org.cishell.reference.service.database/pom.xml
branches/tycho/core/org.cishell.reference.services/pom.xml
branches/tycho/core/org.cishell.service.autostart/pom.xml
branches/tycho/core/org.cishell.service.database/pom.xml
branches/tycho/core/org.cishell.utilities/pom.xml
branches/tycho/core/org.cishell.utility.datastructure/pom.xml
branches/tycho/core/org.cishell.utility.swt/pom.xml
branches/tycho/libs/com.google.collections/
branches/tycho/libs/com.google.collections/osgi.bnd
branches/tycho/libs/com.google.collections/pom.xml
branches/tycho/libs/org.prefuse/
branches/tycho/libs/org.prefuse/osgi.bnd
branches/tycho/libs/org.prefuse/pom.xml
Added: branches/tycho/core/org.cishell.algorithm.convertergraph/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.algorithm.convertergraph/pom.xml (rev 0)
+++ branches/tycho/core/org.cishell.algorithm.convertergraph/pom.xml 2010-11-14 10:49:19 UTC (rev 1161)
@@ -0,0 +1,15 @@
+<?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>
+
+ <parent>
+ <groupId>cishell</groupId>
+ <artifactId>core-build</artifactId>
+ <version>1.0.0</version>
+ </parent>
+
+ <artifactId>org.cishell.algorithm.convertergraph</artifactId>
+ <packaging>eclipse-plugin</packaging>
+
+</project>
Added: branches/tycho/core/org.cishell.reference.prefs.admin/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.reference.prefs.admin/pom.xml (rev 0)
+++ branches/tycho/core/org.cishell.reference.prefs.admin/pom.xml 2010-11-14 10:49:19 UTC (rev 1161)
@@ -0,0 +1,15 @@
+<?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>
+
+ <parent>
+ <groupId>cishell</groupId>
+ <artifactId>core-build</artifactId>
+ <version>1.0.0</version>
+ </parent>
+
+ <artifactId>org.cishell.reference.prefs.admin</artifactId>
+ <packaging>eclipse-plugin</packaging>
+
+</project>
Added: branches/tycho/core/org.cishell.reference.service.database/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.reference.service.database/pom.xml (rev 0)
+++ branches/tycho/core/org.cishell.reference.service.database/pom.xml 2010-11-14 10:49:19 UTC (rev 1161)
@@ -0,0 +1,15 @@
+<?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>
+
+ <parent>
+ <groupId>cishell</groupId>
+ <artifactId>core-build</artifactId>
+ <version>1.0.0</version>
+ </parent>
+
+ <artifactId>org.cishell.reference.service.database</artifactId>
+ <packaging>eclipse-plugin</packaging>
+
+</project>
Added: branches/tycho/core/org.cishell.reference.services/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.reference.services/pom.xml (rev 0)
+++ branches/tycho/core/org.cishell.reference.services/pom.xml 2010-11-14 10:49:19 UTC (rev 1161)
@@ -0,0 +1,15 @@
+<?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>
+
+ <parent>
+ <groupId>cishell</groupId>
+ <artifactId>core-build</artifactId>
+ <version>1.0.0</version>
+ </parent>
+
+ <artifactId>org.cishell.reference.services</artifactId>
+ <packaging>eclipse-plugin</packaging>
+
+</project>
Added: branches/tycho/core/org.cishell.service.autostart/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.service.autostart/pom.xml (rev 0)
+++ branches/tycho/core/org.cishell.service.autostart/pom.xml 2010-11-14 10:49:19 UTC (rev 1161)
@@ -0,0 +1,15 @@
+<?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>
+
+ <parent>
+ <groupId>cishell</groupId>
+ <artifactId>core-build</artifactId>
+ <version>1.0.0</version>
+ </parent>
+
+ <artifactId>org.cishell.service.autostart</artifactId>
+ <packaging>eclipse-plugin</packaging>
+
+</project>
Added: branches/tycho/core/org.cishell.service.database/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.service.database/pom.xml (rev 0)
+++ branches/tycho/core/org.cishell.service.database/pom.xml 2010-11-14 10:49:19 UTC (rev 1161)
@@ -0,0 +1,15 @@
+<?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>
+
+ <parent>
+ <groupId>cishell</groupId>
+ <artifactId>core-build</artifactId>
+ <version>1.0.0</version>
+ </parent>
+
+ <artifactId>org.cishell.service.database</artifactId>
+ <packaging>eclipse-plugin</packaging>
+
+</project>
Added: branches/tycho/core/org.cishell.utilities/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.utilities/pom.xml (rev 0)
+++ branches/tycho/core/org.cishell.utilities/pom.xml 2010-11-14 10:49:19 UTC (rev 1161)
@@ -0,0 +1,15 @@
+<?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>
+
+ <parent>
+ <groupId>cishell</groupId>
+ <artifactId>core-build</artifactId>
+ <version>1.0.0</version>
+ </parent>
+
+ <artifactId>org.cishell.utilities</artifactId>
+ <packaging>eclipse-plugin</packaging>
+
+</project>
Added: branches/tycho/core/org.cishell.utility.datastructure/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.utility.datastructure/pom.xml (rev 0)
+++ branches/tycho/core/org.cishell.utility.datastructure/pom.xml 2010-11-14 10:49:19 UTC (rev 1161)
@@ -0,0 +1,15 @@
+<?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>
+
+ <parent>
+ <groupId>cishell</groupId>
+ <artifactId>core-build</artifactId>
+ <version>1.0.0</version>
+ </parent>
+
+ <artifactId>org.cishell.utility.datastructure</artifactId>
+ <packaging>eclipse-plugin</packaging>
+
+</project>
Added: branches/tycho/core/org.cishell.utility.swt/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.utility.swt/pom.xml (rev 0)
+++ branches/tycho/core/org.cishell.utility.swt/pom.xml 2010-11-14 10:49:19 UTC (rev 1161)
@@ -0,0 +1,15 @@
+<?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>
+
+ <parent>
+ <groupId>cishell</groupId>
+ <artifactId>core-build</artifactId>
+ <version>1.0.0</version>
+ </parent>
+
+ <artifactId>org.cishell.utility.swt</artifactId>
+ <packaging>eclipse-plugin</packaging>
+
+</project>
Modified: branches/tycho/core/pom.xml
===================================================================
--- branches/tycho/core/pom.xml 2010-11-14 09:49:25 UTC (rev 1160)
+++ branches/tycho/core/pom.xml 2010-11-14 10:49:19 UTC (rev 1161)
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
+
<modelVersion>4.0.0</modelVersion>
<prerequisites>
<maven>3.0</maven>
</prerequisites>
-
<groupId>cishell</groupId>
<artifactId>core-build</artifactId>
<version>1.0.0</version>
+
<packaging>pom</packaging>
<properties>
@@ -18,7 +19,11 @@
<modules>
<module>org.cishell.framework</module>
<module>org.cishell.reference</module>
-<!-- <module>tycho.demo.itp02.bundle.tests</module> -->
+ <module>org.cishell.service.autostart</module>
+ <module>org.cishell.service.database</module>
+ <module>org.cishell.algorithm.convertergraph</module>
+ <module>org.cishell.utilities</module>
+ <module>org.cishell.utility.datastructure</module>
</modules>
<dependencies>
@@ -27,14 +32,29 @@
<artifactId>jung</artifactId>
<version>1.7.6-001-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>cishell.libs</groupId>
+ <artifactId>com.google.collections</artifactId>
+ <version>1.0-001-SNAPSHOT</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-20060220-001-SNAPSHOT</version>
+ </dependency>
</dependencies>
<repositories>
- <repository>
- <id>ganymede</id>
- <layout>p2</layout>
- <url>http://download.eclipse.org/releases/ganymede</url>
- </repository>
+ <repository>
+ <id>ganymede</id>
+ <layout>p2</layout>
+ <url>http://download.eclipse.org/releases/ganymede</url>
+ </repository>
</repositories>
<build>
@@ -56,4 +76,5 @@
</plugin>
</plugins>
</build>
+
</project>
Added: branches/tycho/libs/com.google.collections/osgi.bnd
===================================================================
--- branches/tycho/libs/com.google.collections/osgi.bnd (rev 0)
+++ branches/tycho/libs/com.google.collections/osgi.bnd 2010-11-14 10:49:19 UTC (rev 1161)
@@ -0,0 +1,9 @@
+#--------------------------------------------------------------------------
+# Use this file to add customized Bnd instructions for the wrapped library
+#--------------------------------------------------------------------------
+
+#
+# this unpacks the contents of the wrapped jar artifact inside the bundle
+# to also inline dependencies of this artifact add Embed-Transitive: true
+#
+Embed-Dependency: *;scope=compile|runtime;type=!pom;inline=true
Added: branches/tycho/libs/com.google.collections/pom.xml
===================================================================
--- branches/tycho/libs/com.google.collections/pom.xml (rev 0)
+++ branches/tycho/libs/com.google.collections/pom.xml 2010-11-14 10:49:19 UTC (rev 1161)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <relativePath>../poms/wrappers/</relativePath>
+ <groupId>cishell.libs.build</groupId>
+ <artifactId>wrapper-bundle-settings</artifactId>
+ <version>1.0.0</version>
+ </parent>
+
+ <properties>
+ <bundle.symbolicName>com.google.collections</bundle.symbolicName>
+ <wrapped.groupId>com.google.collections</wrapped.groupId>
+ <wrapped.artifactId>google-collections</wrapped.artifactId>
+ <wrapped.version>1.0</wrapped.version>
+ </properties>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>cishell.libs</groupId>
+ <artifactId>com.google.collections</artifactId>
+ <version>1.0-001-SNAPSHOT</version>
+
+ <name>${bundle.symbolicName} ${wrapped.version} [osgi]</name>
+
+ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>${wrapped.groupId}</groupId>
+ <artifactId>${wrapped.artifactId}</artifactId>
+ <version>${wrapped.version}</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Added: branches/tycho/libs/org.prefuse/osgi.bnd
===================================================================
--- branches/tycho/libs/org.prefuse/osgi.bnd (rev 0)
+++ branches/tycho/libs/org.prefuse/osgi.bnd 2010-11-14 10:49:19 UTC (rev 1161)
@@ -0,0 +1,9 @@
+#--------------------------------------------------------------------------
+# Use this file to add customized Bnd instructions for the wrapped library
+#--------------------------------------------------------------------------
+
+#
+# this unpacks the contents of the wrapped jar artifact inside the bundle
+# to also inline dependencies of this artifact add Embed-Transitive: true
+#
+Embed-Dependency: *;scope=compile|runtime;type=!pom;inline=true
Added: branches/tycho/libs/org.prefuse/pom.xml
===================================================================
--- branches/tycho/libs/org.prefuse/pom.xml (rev 0)
+++ branches/tycho/libs/org.prefuse/pom.xml 2010-11-14 10:49:19 UTC (rev 1161)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <relativePath>../poms/wrappers/</relativePath>
+ <groupId>cishell.libs.build</groupId>
+ <artifactId>wrapper-bundle-settings</artifactId>
+ <version>1.0.0</version>
+ </parent>
+
+ <properties>
+ <bundle.symbolicName>org.prefuse</bundle.symbolicName>
+ <wrapped.groupId>org.prefuse</wrapped.groupId>
+ <wrapped.artifactId>prefuse</wrapped.artifactId>
+ <wrapped.version>beta-20060220</wrapped.version>
+ <bundle.version>2006.02.20</bundle.version>
+ </properties>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>cishell.libs</groupId>
+ <artifactId>org.prefuse</artifactId>
+ <version>beta-20060220-001-SNAPSHOT</version>
+
+ <name>${bundle.symbolicName} ${wrapped.version} [osgi]</name>
+
+ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>${wrapped.groupId}</groupId>
+ <artifactId>${wrapped.artifactId}</artifactId>
+ <version>${wrapped.version}</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+
+</project>
Modified: branches/tycho/libs/pom.xml
===================================================================
--- branches/tycho/libs/pom.xml 2010-11-14 09:49:25 UTC (rev 1160)
+++ branches/tycho/libs/pom.xml 2010-11-14 10:49:19 UTC (rev 1161)
@@ -51,6 +51,8 @@
<module>commons-collections</module>
<module>colt</module>
<module>concurrent</module>
+ <module>com.google.collections</module>
+ <module>org.prefuse</module>
</modules>
<build>
@@ -82,4 +84,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: branches/tycho/libs/poms/wrappers/pom.xml
===================================================================
--- branches/tycho/libs/poms/wrappers/pom.xml 2010-11-14 09:49:25 UTC (rev 1160)
+++ branches/tycho/libs/poms/wrappers/pom.xml 2010-11-14 10:49:19 UTC (rev 1161)
@@ -13,6 +13,10 @@
<name>libs - wrapper instructions</name>
+ <properties>
+ <bundle.version>${wrapped.version}</bundle.version>
+ </properties>
+
<!--
| don't apply project details to wrapped jars
-->
@@ -37,7 +41,7 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
- <Bundle-Version>${wrapped.version}</Bundle-Version>
+ <Bundle-Version>${bundle.version}</Bundle-Version>
<!--
| export wrapped contents: don't use Export-Package:* as this bundles everything on the classpath
-->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fu...@us...> - 2010-11-14 09:49:31
|
Revision: 1160
http://cishell.svn.sourceforge.net/cishell/?rev=1160&view=rev
Author: fugu13
Date: 2010-11-14 09:49:25 +0000 (Sun, 14 Nov 2010)
Log Message:
-----------
library dependency problem licked, the only wart is a two-step maven process
Modified Paths:
--------------
branches/tycho/libs/colt/pom.xml
branches/tycho/libs/jung/pom.xml
Modified: branches/tycho/libs/colt/pom.xml
===================================================================
--- branches/tycho/libs/colt/pom.xml 2010-11-14 09:28:26 UTC (rev 1159)
+++ branches/tycho/libs/colt/pom.xml 2010-11-14 09:49:25 UTC (rev 1160)
@@ -35,8 +35,7 @@
<groupId>cishell.libs</groupId>
<artifactId>concurrent</artifactId>
<version>1.3.4-001-SNAPSHOT</version>
- <scope>provided</scope>
</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-14 09:28:26 UTC (rev 1159)
+++ branches/tycho/libs/jung/pom.xml 2010-11-14 09:49:25 UTC (rev 1160)
@@ -35,14 +35,12 @@
<groupId>cishell.libs</groupId>
<artifactId>commons-collections</artifactId>
<version>3.1-001-SNAPSHOT</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>cishell.libs</groupId>
<artifactId>colt</artifactId>
<version>1.2.0-001-SNAPSHOT</version>
- <scope>provided</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fu...@us...> - 2010-11-14 09:28:36
|
Revision: 1159
http://cishell.svn.sourceforge.net/cishell/?rev=1159&view=rev
Author: fugu13
Date: 2010-11-14 09:28:26 +0000 (Sun, 14 Nov 2010)
Log Message:
-----------
I still haven't quite got the library system worked out; it might turn out to be best to continue with our current practice of making our own wrapped jars and storing them, but I think it should be possible to have that become part of the build process instead.
Modified Paths:
--------------
branches/tycho/core/org.cishell.reference/META-INF/MANIFEST.MF
Added Paths:
-----------
branches/tycho/core/org.cishell.framework/pom.xml
branches/tycho/core/org.cishell.framework/src/main/
branches/tycho/core/org.cishell.framework/src/main/java/
branches/tycho/core/org.cishell.framework/src/main/java/org/
branches/tycho/core/org.cishell.reference/pom.xml
branches/tycho/core/org.cishell.reference/src/main/
branches/tycho/core/org.cishell.reference/src/main/java/
branches/tycho/core/org.cishell.reference/src/main/java/org/
branches/tycho/core/pom.xml
branches/tycho/libs/
branches/tycho/libs/colt/
branches/tycho/libs/colt/osgi.bnd
branches/tycho/libs/colt/pom.xml
branches/tycho/libs/commons-collections/
branches/tycho/libs/commons-collections/osgi.bnd
branches/tycho/libs/commons-collections/pom.xml
branches/tycho/libs/concurrent/
branches/tycho/libs/concurrent/osgi.bnd
branches/tycho/libs/concurrent/pom.xml
branches/tycho/libs/jung/
branches/tycho/libs/jung/osgi.bnd
branches/tycho/libs/jung/pom.xml
branches/tycho/libs/pom.xml
branches/tycho/libs/poms/
branches/tycho/libs/poms/compiled/
branches/tycho/libs/poms/compiled/pom.xml
branches/tycho/libs/poms/pom.xml
branches/tycho/libs/poms/wrappers/
branches/tycho/libs/poms/wrappers/pom.xml
branches/tycho/libs/provision/
branches/tycho/libs/provision/pom.xml
branches/tycho/pom.xml
Removed Paths:
-------------
branches/tycho/core/org.cishell.framework/src/org/
branches/tycho/core/org.cishell.reference/src/org/
Added: branches/tycho/core/org.cishell.framework/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.framework/pom.xml (rev 0)
+++ branches/tycho/core/org.cishell.framework/pom.xml 2010-11-14 09:28:26 UTC (rev 1159)
@@ -0,0 +1,15 @@
+<?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>
+
+ <parent>
+ <groupId>cishell</groupId>
+ <artifactId>core-build</artifactId>
+ <version>1.0.0</version>
+ </parent>
+
+ <artifactId>org.cishell.framework</artifactId>
+ <packaging>eclipse-plugin</packaging>
+
+</project>
Modified: branches/tycho/core/org.cishell.reference/META-INF/MANIFEST.MF
===================================================================
--- branches/tycho/core/org.cishell.reference/META-INF/MANIFEST.MF 2010-11-14 09:06:07 UTC (rev 1158)
+++ branches/tycho/core/org.cishell.reference/META-INF/MANIFEST.MF 2010-11-14 09:28:26 UTC (rev 1159)
@@ -19,5 +19,5 @@
org.cishell.reference.service.conversion,
org.cishell.reference.service.metatype
Eclipse-LazyStart: true
-Require-Bundle: edu.uci.ics.jung
+Require-Bundle: jung
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Added: branches/tycho/core/org.cishell.reference/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.reference/pom.xml (rev 0)
+++ branches/tycho/core/org.cishell.reference/pom.xml 2010-11-14 09:28:26 UTC (rev 1159)
@@ -0,0 +1,15 @@
+<?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>
+
+ <parent>
+ <groupId>cishell</groupId>
+ <artifactId>core-build</artifactId>
+ <version>1.0.0</version>
+ </parent>
+
+ <artifactId>org.cishell.reference</artifactId>
+ <packaging>eclipse-plugin</packaging>
+
+</project>
Added: branches/tycho/core/pom.xml
===================================================================
--- branches/tycho/core/pom.xml (rev 0)
+++ branches/tycho/core/pom.xml 2010-11-14 09:28:26 UTC (rev 1159)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <prerequisites>
+ <maven>3.0</maven>
+ </prerequisites>
+
+ <groupId>cishell</groupId>
+ <artifactId>core-build</artifactId>
+ <version>1.0.0</version>
+ <packaging>pom</packaging>
+
+ <properties>
+ <tycho-version>0.10.0</tycho-version>
+ </properties>
+
+ <modules>
+ <module>org.cishell.framework</module>
+ <module>org.cishell.reference</module>
+<!-- <module>tycho.demo.itp02.bundle.tests</module> -->
+ </modules>
+
+ <dependencies>
+ <dependency>
+ <groupId>cishell.libs</groupId>
+ <artifactId>jung</artifactId>
+ <version>1.7.6-001-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <repositories>
+ <repository>
+ <id>ganymede</id>
+ <layout>p2</layout>
+ <url>http://download.eclipse.org/releases/ganymede</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>
Added: branches/tycho/libs/colt/osgi.bnd
===================================================================
--- branches/tycho/libs/colt/osgi.bnd (rev 0)
+++ branches/tycho/libs/colt/osgi.bnd 2010-11-14 09:28:26 UTC (rev 1159)
@@ -0,0 +1,9 @@
+#--------------------------------------------------------------------------
+# Use this file to add customized Bnd instructions for the wrapped library
+#--------------------------------------------------------------------------
+
+#
+# this unpacks the contents of the wrapped jar artifact inside the bundle
+# to also inline dependencies of this artifact add Embed-Transitive: true
+#
+Embed-Dependency: *;scope=compile|runtime;type=!pom;inline=true
Added: branches/tycho/libs/colt/pom.xml
===================================================================
--- branches/tycho/libs/colt/pom.xml (rev 0)
+++ branches/tycho/libs/colt/pom.xml 2010-11-14 09:28:26 UTC (rev 1159)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <relativePath>../poms/wrappers/</relativePath>
+ <groupId>cishell.libs.build</groupId>
+ <artifactId>wrapper-bundle-settings</artifactId>
+ <version>1.0.0</version>
+ </parent>
+
+ <properties>
+ <bundle.symbolicName>colt</bundle.symbolicName>
+ <wrapped.groupId>colt</wrapped.groupId>
+ <wrapped.artifactId>colt</wrapped.artifactId>
+ <wrapped.version>1.2.0</wrapped.version>
+ </properties>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>cishell.libs</groupId>
+ <artifactId>colt</artifactId>
+ <version>1.2.0-001-SNAPSHOT</version>
+
+ <name>${bundle.symbolicName} ${wrapped.version} [osgi]</name>
+
+ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>${wrapped.groupId}</groupId>
+ <artifactId>${wrapped.artifactId}</artifactId>
+ <version>${wrapped.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>cishell.libs</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>1.3.4-001-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Added: branches/tycho/libs/commons-collections/osgi.bnd
===================================================================
--- branches/tycho/libs/commons-collections/osgi.bnd (rev 0)
+++ branches/tycho/libs/commons-collections/osgi.bnd 2010-11-14 09:28:26 UTC (rev 1159)
@@ -0,0 +1,9 @@
+#--------------------------------------------------------------------------
+# Use this file to add customized Bnd instructions for the wrapped library
+#--------------------------------------------------------------------------
+
+#
+# this unpacks the contents of the wrapped jar artifact inside the bundle
+# to also inline dependencies of this artifact add Embed-Transitive: true
+#
+Embed-Dependency: *;scope=compile|runtime;type=!pom;inline=true
Added: branches/tycho/libs/commons-collections/pom.xml
===================================================================
--- branches/tycho/libs/commons-collections/pom.xml (rev 0)
+++ branches/tycho/libs/commons-collections/pom.xml 2010-11-14 09:28:26 UTC (rev 1159)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <relativePath>../poms/wrappers/</relativePath>
+ <groupId>cishell.libs.build</groupId>
+ <artifactId>wrapper-bundle-settings</artifactId>
+ <version>1.0.0</version>
+ </parent>
+
+ <properties>
+ <bundle.symbolicName>commons-collections</bundle.symbolicName>
+ <wrapped.groupId>commons-collections</wrapped.groupId>
+ <wrapped.artifactId>commons-collections</wrapped.artifactId>
+ <wrapped.version>3.1</wrapped.version>
+ </properties>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>cishell.libs</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.1-001-SNAPSHOT</version>
+
+ <name>${bundle.symbolicName} ${wrapped.version} [osgi]</name>
+
+ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>${wrapped.groupId}</groupId>
+ <artifactId>${wrapped.artifactId}</artifactId>
+ <version>${wrapped.version}</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Added: branches/tycho/libs/concurrent/osgi.bnd
===================================================================
--- branches/tycho/libs/concurrent/osgi.bnd (rev 0)
+++ branches/tycho/libs/concurrent/osgi.bnd 2010-11-14 09:28:26 UTC (rev 1159)
@@ -0,0 +1,9 @@
+#--------------------------------------------------------------------------
+# Use this file to add customized Bnd instructions for the wrapped library
+#--------------------------------------------------------------------------
+
+#
+# this unpacks the contents of the wrapped jar artifact inside the bundle
+# to also inline dependencies of this artifact add Embed-Transitive: true
+#
+Embed-Dependency: *;scope=compile|runtime;type=!pom;inline=true
Added: branches/tycho/libs/concurrent/pom.xml
===================================================================
--- branches/tycho/libs/concurrent/pom.xml (rev 0)
+++ branches/tycho/libs/concurrent/pom.xml 2010-11-14 09:28:26 UTC (rev 1159)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <relativePath>../poms/wrappers/</relativePath>
+ <groupId>cishell.libs.build</groupId>
+ <artifactId>wrapper-bundle-settings</artifactId>
+ <version>1.0.0</version>
+ </parent>
+
+ <properties>
+ <bundle.symbolicName>concurrent</bundle.symbolicName>
+ <wrapped.groupId>concurrent</wrapped.groupId>
+ <wrapped.artifactId>concurrent</wrapped.artifactId>
+ <wrapped.version>1.3.4</wrapped.version>
+ </properties>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>cishell.libs</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>1.3.4-001-SNAPSHOT</version>
+
+ <name>${bundle.symbolicName} ${wrapped.version} [osgi]</name>
+
+ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>${wrapped.groupId}</groupId>
+ <artifactId>${wrapped.artifactId}</artifactId>
+ <version>${wrapped.version}</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Added: branches/tycho/libs/jung/osgi.bnd
===================================================================
--- branches/tycho/libs/jung/osgi.bnd (rev 0)
+++ branches/tycho/libs/jung/osgi.bnd 2010-11-14 09:28:26 UTC (rev 1159)
@@ -0,0 +1,9 @@
+#--------------------------------------------------------------------------
+# Use this file to add customized Bnd instructions for the wrapped library
+#--------------------------------------------------------------------------
+
+#
+# this unpacks the contents of the wrapped jar artifact inside the bundle
+# to also inline dependencies of this artifact add Embed-Transitive: true
+#
+Embed-Dependency: *;scope=compile|runtime;type=!pom;inline=true
Added: branches/tycho/libs/jung/pom.xml
===================================================================
--- branches/tycho/libs/jung/pom.xml (rev 0)
+++ branches/tycho/libs/jung/pom.xml 2010-11-14 09:28:26 UTC (rev 1159)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <relativePath>../poms/wrappers/</relativePath>
+ <groupId>cishell.libs.build</groupId>
+ <artifactId>wrapper-bundle-settings</artifactId>
+ <version>1.0.0</version>
+ </parent>
+
+ <properties>
+ <bundle.symbolicName>jung</bundle.symbolicName>
+ <wrapped.groupId>jung</wrapped.groupId>
+ <wrapped.artifactId>jung</wrapped.artifactId>
+ <wrapped.version>1.7.6</wrapped.version>
+ </properties>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>cishell.libs</groupId>
+ <artifactId>jung</artifactId>
+ <version>1.7.6-001-SNAPSHOT</version>
+
+ <name>${bundle.symbolicName} ${wrapped.version} [osgi]</name>
+
+ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>${wrapped.groupId}</groupId>
+ <artifactId>${wrapped.artifactId}</artifactId>
+ <version>${wrapped.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>cishell.libs</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.1-001-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>cishell.libs</groupId>
+ <artifactId>colt</artifactId>
+ <version>1.2.0-001-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Added: branches/tycho/libs/pom.xml
===================================================================
--- branches/tycho/libs/pom.xml (rev 0)
+++ branches/tycho/libs/pom.xml 2010-11-14 09:28:26 UTC (rev 1159)
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <!--
+ | put company details here
+ <organization>
+ <name>...</name>
+ <url>http://...</url>
+ </organization>
+ -->
+
+ <!--
+ | put license details here
+ <licenses>
+ <license>
+ <name>...</name>
+ <url>http://...</url>
+ <comments>
+ </comments>
+ </license>
+ </licenses>
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>cishell</groupId>
+ <artifactId>libs</artifactId>
+ <version>1.0.0</version>
+
+ <name>cishell.libs (OSGi project)</name>
+
+ <!--
+ | describe your project here
+ -->
+
+ <description>Generated using Pax-Construct</description>
+
+ <properties>
+ <!--
+ | some example OSGi runtime properties
+ -->
+ <org.osgi.service.http.port>8080</org.osgi.service.http.port>
+ <org.osgi.service.http.port.secure>8443</org.osgi.service.http.port.secure>
+ </properties>
+
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>poms</module>
+ <module>provision</module>
+ <module>jung</module>
+ <module>commons-collections</module>
+ <module>colt</module>
+ <module>concurrent</module>
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.ops4j</groupId>
+ <artifactId>maven-pax-plugin</artifactId>
+ <version>1.4</version>
+ <configuration>
+ <!--
+ | some example Pax-Runner settings
+ -->
+ <provision>
+ <param>--platform=felix</param>
+ </provision>
+ </configuration>
+ <executions>
+ <!--
+ | uncomment to auto-generate IDE files
+ <execution>
+ <id>ide-support</id>
+ <goals>
+ <goal>eclipse</goal>
+ </goals>
+ </execution>
+ -->
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
Added: branches/tycho/libs/poms/compiled/pom.xml
===================================================================
--- branches/tycho/libs/poms/compiled/pom.xml (rev 0)
+++ branches/tycho/libs/poms/compiled/pom.xml 2010-11-14 09:28:26 UTC (rev 1159)
@@ -0,0 +1,61 @@
+<?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">
+
+ <parent>
+ <groupId>cishell.libs.build</groupId>
+ <artifactId>shared-plugin-settings</artifactId>
+ <version>1.0.0</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>compiled-bundle-settings</artifactId>
+
+ <name>libs - bundle instructions</name>
+
+ <packaging>pom</packaging>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <!--
+ | example additional resource entries, useful when building Eclipse RCP applications
+ -->
+ <resource>
+ <directory>.</directory>
+ <includes>
+ <include>plugin.xml</include>
+ <include>plugin.properties</include>
+ <include>icons/**</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <!--
+ | the following instructions build a simple set of public/private classes into an OSGi bundle
+ -->
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
+ <Bundle-Version>${pom.version}</Bundle-Version>
+ <!--
+ | assume public classes are in the top package, and private classes are under ".internal"
+ -->
+ <Export-Package>!${bundle.namespace}.internal.*,${bundle.namespace}.*;version="${pom.version}"</Export-Package>
+ <Private-Package>${bundle.namespace}.internal.*</Private-Package>
+ <!--
+ | each module can override these defaults in their osgi.bnd file
+ -->
+ <_include>-osgi.bnd</_include>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: branches/tycho/libs/poms/pom.xml
===================================================================
--- branches/tycho/libs/poms/pom.xml (rev 0)
+++ branches/tycho/libs/poms/pom.xml 2010-11-14 09:28:26 UTC (rev 1159)
@@ -0,0 +1,76 @@
+<?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">
+
+ <parent>
+ <groupId>cishell</groupId>
+ <artifactId>libs</artifactId>
+ <version>1.0.0</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>cishell.libs.build</groupId>
+ <artifactId>shared-plugin-settings</artifactId>
+
+ <name>libs - plugin configuration</name>
+
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>wrappers</module>
+ <module>compiled</module>
+ </modules>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.ops4j</groupId>
+ <artifactId>maven-pax-plugin</artifactId>
+ <!--
+ | enable improved OSGi compilation support for the bundle life-cycle.
+ | to switch back to the standard bundle life-cycle, move this setting
+ | down to the maven-bundle-plugin section
+ -->
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.4.3</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <!--
+ | dependency pom representing the global classpath of imported bundles
+ -->
+ <type>pom</type>
+ <groupId>cishell.libs.build</groupId>
+ <artifactId>provision</artifactId>
+ <version>1.0.0</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi_R4_core</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi_R4_compendium</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+</project>
Added: branches/tycho/libs/poms/wrappers/pom.xml
===================================================================
--- branches/tycho/libs/poms/wrappers/pom.xml (rev 0)
+++ branches/tycho/libs/poms/wrappers/pom.xml 2010-11-14 09:28:26 UTC (rev 1159)
@@ -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">
+
+ <parent>
+ <groupId>cishell.libs.build</groupId>
+ <artifactId>shared-plugin-settings</artifactId>
+ <version>1.0.0</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>wrapper-bundle-settings</artifactId>
+
+ <name>libs - wrapper instructions</name>
+
+ <!--
+ | don't apply project details to wrapped jars
+ -->
+ <organization/>
+ <description>
+ Simple OSGi wrapper around third-party jar(s)
+ </description>
+ <licenses>
+ <license/>
+ </licenses>
+
+ <packaging>pom</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <!--
+ | the following instructions are optimized for wrapping third-party libraries as OSGi bundles
+ -->
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
+ <Bundle-Version>${wrapped.version}</Bundle-Version>
+ <!--
+ | export wrapped contents: don't use Export-Package:* as this bundles everything on the classpath
+ -->
+ <_exportcontents>*</_exportcontents>
+ <Private-Package>!*</Private-Package>
+ <!--
+ | each module can override these defaults in their osgi.bnd file
+ -->
+ <_include>-osgi.bnd</_include>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: branches/tycho/libs/provision/pom.xml
===================================================================
--- branches/tycho/libs/provision/pom.xml (rev 0)
+++ branches/tycho/libs/provision/pom.xml 2010-11-14 09:28:26 UTC (rev 1159)
@@ -0,0 +1,25 @@
+<?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">
+
+ <parent>
+ <groupId>cishell</groupId>
+ <artifactId>libs</artifactId>
+ <version>1.0.0</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>cishell.libs.build</groupId>
+ <artifactId>provision</artifactId>
+
+ <name>libs - imported bundles</name>
+
+ <packaging>pom</packaging>
+
+ <!--
+ | imported (non-local) bundles are listed here as dependencies
+ | and will be deployed by pax:provision unless they are marked
+ | with <optional>true</optional>
+ -->
+
+</project>
Added: branches/tycho/pom.xml
===================================================================
--- branches/tycho/pom.xml (rev 0)
+++ branches/tycho/pom.xml 2010-11-14 09:28:26 UTC (rev 1159)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <prerequisites>
+ <maven>3.0</maven>
+ </prerequisites>
+ <groupId>cishell</groupId>
+ <artifactId>build</artifactId>
+ <version>1.0.0</version>
+
+ <packaging>pom</packaging>
+
+ <properties>
+ <tycho-version>0.10.0</tycho-version>
+ </properties>
+
+ <modules>
+ <module>core</module>
+ <!-- <module>tycho.demo.itp02.bundle.tests</module> -->
+ <module>libs</module>
+ </modules>
+
+ <repositories>
+ <repository>
+ <id>ganymede</id>
+ <layout>p2</layout>
+ <url>http://download.eclipse.org/releases/ganymede</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>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fu...@us...> - 2010-11-14 09:06:13
|
Revision: 1158
http://cishell.svn.sourceforge.net/cishell/?rev=1158&view=rev
Author: fugu13
Date: 2010-11-14 09:06:07 +0000 (Sun, 14 Nov 2010)
Log Message:
-----------
prepare to move new lib infrastructure in
Removed Paths:
-------------
branches/tycho/libs/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fu...@us...> - 2010-11-14 08:59:10
|
Revision: 1157
http://cishell.svn.sourceforge.net/cishell/?rev=1157&view=rev
Author: fugu13
Date: 2010-11-14 08:59:03 +0000 (Sun, 14 Nov 2010)
Log Message:
-----------
Get rid of excessive stuff.
Removed Paths:
-------------
branches/tycho/deployment/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fu...@us...> - 2010-11-14 08:40:38
|
Revision: 1156
http://cishell.svn.sourceforge.net/cishell/?rev=1156&view=rev
Author: fugu13
Date: 2010-11-14 08:40:32 +0000 (Sun, 14 Nov 2010)
Log Message:
-----------
Still reorganizing.
Added Paths:
-----------
branches/tycho/
Removed Paths:
-------------
branches/core_tycho/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fu...@us...> - 2010-11-14 08:37:33
|
Revision: 1155
http://cishell.svn.sourceforge.net/cishell/?rev=1155&view=rev
Author: fugu13
Date: 2010-11-14 08:37:27 +0000 (Sun, 14 Nov 2010)
Log Message:
-----------
Now branching everything.
Added Paths:
-----------
branches/core_tycho/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fu...@us...> - 2010-11-14 08:36:43
|
Revision: 1154
http://cishell.svn.sourceforge.net/cishell/?rev=1154&view=rev
Author: fugu13
Date: 2010-11-14 08:36:37 +0000 (Sun, 14 Nov 2010)
Log Message:
-----------
Reorganizing a bit.
Removed Paths:
-------------
branches/core_tycho/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fu...@us...> - 2010-11-14 06:29:27
|
Revision: 1153
http://cishell.svn.sourceforge.net/cishell/?rev=1153&view=rev
Author: fugu13
Date: 2010-11-14 06:29:20 +0000 (Sun, 14 Nov 2010)
Log Message:
-----------
Starting CIShell Core branch for Tycho migration.
Added Paths:
-----------
branches/core_tycho/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
