[CIShell-SVN] SF.net SVN: cishell:[1176] branches/tycho

[<fu...@us...>]

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.