diff options
6 files changed, 236 insertions, 219 deletions
diff --git a/features/org.eclipse.osee.external.feature/feature.xml b/features/org.eclipse.osee.external.feature/feature.xml index adaf9f0e4f4..c0c816b1f62 100644 --- a/features/org.eclipse.osee.external.feature/feature.xml +++ b/features/org.eclipse.osee.external.feature/feature.xml @@ -1,212 +1,211 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.eclipse.osee.external.feature" - label="%featureName" - version="0.9.7.qualifier" - provider-name="%providerName"> - - <description> - %description - </description> - - <copyright> - %copyright - </copyright> - - <license url="%licenseURL"> - %license - </license> - - <requires> - <import plugin="org.eclipse.equinox.registry" version="3.4.0" match="compatible"/> - <import plugin="org.eclipse.equinox.common" version="3.2.0" match="compatible"/> - <import plugin="org.eclipse.osgi"/> - <import plugin="org.eclipse.osgi.services"/> - <import plugin="org.apache.oro" version="2.0.8" match="equivalent"/> - <import plugin="org.eclipse.core.runtime"/> - <import plugin="javax.xml" version="1.3.4" match="compatible"/> - <import plugin="org.apache.xml.resolver" version="1.2.0" match="compatible"/> - <import plugin="org.apache.xml.serializer" version="2.7.1" match="compatible"/> - <import feature="org.eclipse.team.svn" version="0.7.8.I20091023-1300" match="greaterOrEqual"/> - <import feature="org.polarion.eclipse.team.svn.connector" version="2.2.1.I20091009-1900" match="greaterOrEqual"/> - <import feature="org.polarion.eclipse.team.svn.connector.svnkit16" version="2.2.1.I20091009-1900" match="greaterOrEqual"/> - <import feature="org.eclipse.nebula.cwt.feature" version="0.0.0" match="greaterOrEqual"/> - <import feature="org.eclipse.nebula.widgets.calendarcombo.feature" version="0.0.0" match="greaterOrEqual"/> - <import feature="org.eclipse.nebula.widgets.cdatetime.feature" version="0.0.0" match="greaterOrEqual"/> - <import feature="org.eclipse.nebula.widgets.xviewer.feature" version="0.0.0" match="greaterOrEqual"/> - </requires> - - <plugin - id="javax.servlet" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.commons.logging" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.commons.lang" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.equinox.app" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.equinox.ds" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.equinox.util" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="javax.mail.glassfish" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="javax.activation" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.commons.net" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.oro" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.commons.httpclient" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.commons.codec" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.derby" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="com.lowagie.text" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="jms.activemq.launch" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="jms.libraries" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="javax.xml" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.xml.resolver" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.xml.serializer" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.xerces" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="net.jini" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="com.jcraft.jsch" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="com.google.inject" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.aopalliance" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <!--<plugin - id="org.h2" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/>--> - -</feature> +<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.osee.external.feature"
+ label="%featureName"
+ version="0.9.7.qualifier"
+ provider-name="%providerName">
+
+ <description>
+ %description
+ </description>
+
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <requires>
+ <import plugin="org.eclipse.equinox.registry" version="3.4.0" match="compatible"/>
+ <import plugin="org.eclipse.equinox.common" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.osgi"/>
+ <import plugin="org.eclipse.osgi.services"/>
+ <import plugin="org.eclipse.core.runtime"/>
+ <import plugin="javax.xml" version="1.3.4" match="compatible"/>
+ <import plugin="org.apache.xml.resolver" version="1.2.0" match="compatible"/>
+ <import plugin="org.apache.xml.serializer" version="2.7.1" match="compatible"/>
+ <import feature="org.eclipse.team.svn" version="0.7.8.I20091023-1300" match="greaterOrEqual"/>
+ <import feature="org.polarion.eclipse.team.svn.connector" version="2.2.1.I20091009-1900" match="greaterOrEqual"/>
+ <import feature="org.polarion.eclipse.team.svn.connector.svnkit16" version="2.2.1.I20091009-1900" match="greaterOrEqual"/>
+ <import feature="org.eclipse.nebula.cwt.feature" version="0.0.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.nebula.widgets.calendarcombo.feature" version="0.0.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.nebula.widgets.cdatetime.feature" version="0.0.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.nebula.widgets.xviewer.feature" version="0.0.0" match="greaterOrEqual"/>
+ </requires>
+
+ <plugin
+ id="javax.servlet"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.logging"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.lang"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.equinox.app"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.equinox.ds"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.equinox.util"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="javax.mail.glassfish"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="javax.activation"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.net"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.oro"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.httpclient"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.codec"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.derby"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="com.lowagie.text"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="jms.activemq.launch"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="jms.libraries"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="javax.xml"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.xml.resolver"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.xml.serializer"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.xerces"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="net.jini"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="com.jcraft.jsch"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="com.google.inject"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.aopalliance"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.h2"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/features/org.eclipse.osee.framework.feature/feature.xml b/features/org.eclipse.osee.framework.feature/feature.xml index 8f3c7d04f28..91a8c05b531 100644 --- a/features/org.eclipse.osee.framework.feature/feature.xml +++ b/features/org.eclipse.osee.framework.feature/feature.xml @@ -18,6 +18,8 @@ </license>
<requires>
+ <import feature="org.eclipse.emf.ecore" version="2.5.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.emf.common" version="2.5.0" match="greaterOrEqual"/>
<import feature="de.itemis.xtext.antlr.feature" version="1.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.xtext.sdk" version="1.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.xtext.ui" version="1.0.0" match="greaterOrEqual"/>
@@ -129,11 +131,11 @@ version="0.0.0"
unpack="false"/>
- <!--<plugin
+ <plugin
id="org.eclipse.osee.framework.h2"
download-size="0"
install-size="0"
version="0.0.0"
- unpack="false"/>-->
+ unpack="false"/>
</feature>
diff --git a/features/org.eclipse.osee.framework.server.external.feature/feature.xml b/features/org.eclipse.osee.framework.server.external.feature/feature.xml index 931f81ef751..177782e30fe 100644 --- a/features/org.eclipse.osee.framework.server.external.feature/feature.xml +++ b/features/org.eclipse.osee.framework.server.external.feature/feature.xml @@ -37,7 +37,11 @@ <import plugin="com.google.inject" version="2.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.ecore" version="2.5.0" match="greaterOrEqual"/>
<import plugin="org.antlr.runtime" version="3.0.0" match="greaterOrEqual"/>
- <!--<import plugin="org.h2" version="1.1.117" match="greaterOrEqual" />-->
+ <import plugin="org.eclipse.equinox.preferences" version="3.3.0" match="compatible"/>
+ <import plugin="org.eclipse.core.runtime" version="3.6.0" match="compatible"/>
+ <import plugin="org.eclipse.emf.common" version="2.6.0" match="compatible"/>
+ <import plugin="org.eclipse.emf.ecore" version="2.6.0" match="compatible"/>
+ <import plugin="org.eclipse.xtext.util" version="1.0.1" match="greaterOrEqual"/>
</requires>
<plugin
@@ -334,11 +338,11 @@ version="0.0.0"
unpack="false"/>
- <!-- <plugin
+ <plugin
id="org.h2"
download-size="0"
install-size="0"
version="0.0.0"
- unpack="false"/>-->
+ unpack="false"/>
</feature>
diff --git a/features/org.eclipse.osee.framework.server.feature/feature.xml b/features/org.eclipse.osee.framework.server.feature/feature.xml index 16ade73a451..e6adb55ceea 100644 --- a/features/org.eclipse.osee.framework.server.feature/feature.xml +++ b/features/org.eclipse.osee.framework.server.feature/feature.xml @@ -34,6 +34,16 @@ <import plugin="org.apache.log4j" version="1.2.15" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.compare.diff" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.compare.match" version="1.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.osee.framework.core"/>
+ <import plugin="org.eclipse.osee.framework.core.message"/>
+ <import plugin="org.eclipse.osee.framework.core.model"/>
+ <import plugin="org.eclipse.osee.framework.jdk.core"/>
+ <import plugin="org.eclipse.osee.framework.logging"/>
+ <import plugin="org.junit"/>
+ <import plugin="org.apache.commons.codec"/>
+ <import plugin="org.eclipse.equinox.ds"/>
+ <import plugin="org.apache.commons.lang"/>
+ <import plugin="org.h2"/>
</requires>
<plugin
@@ -127,11 +137,11 @@ version="0.0.0"
unpack="false"/>
- <!-- <plugin
+ <plugin
id="org.eclipse.osee.framework.h2"
download-size="0"
install-size="0"
version="0.0.0"
- unpack="false"/> -->
+ unpack="false"/>
</feature>
diff --git a/releng/org.eclipse.osee.client.releng/maps/osee_client.map b/releng/org.eclipse.osee.client.releng/maps/osee_client.map index 561464a3f8d..57e5c485e11 100755 --- a/releng/org.eclipse.osee.client.releng/maps/osee_client.map +++ b/releng/org.eclipse.osee.client.releng/maps/osee_client.map @@ -6,6 +6,7 @@ plugin@org.eclipse.osee.framework.core.client=SVN,,http://dev.eclipse.org/svnroo plugin@org.eclipse.osee.framework.database=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.database plugin@org.eclipse.osee.framework.database.init=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.database.init plugin@org.eclipse.osee.framework.derby=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.derby +plugin@org.eclipse.osee.framework.h2=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.h2 plugin@org.eclipse.osee.framework.jdbcodbc=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.jdbcodbc plugin@org.eclipse.osee.framework.messaging.event.skynet=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.messaging.event.skynet plugin@org.eclipse.osee.framework.messaging.event.res=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.messaging.event.res diff --git a/releng/org.eclipse.osee.server.releng/maps/osee_app_server.map b/releng/org.eclipse.osee.server.releng/maps/osee_app_server.map index a1df5b94a45..92032f74b01 100644 --- a/releng/org.eclipse.osee.server.releng/maps/osee_app_server.map +++ b/releng/org.eclipse.osee.server.releng/maps/osee_app_server.map @@ -7,6 +7,7 @@ plugin@org.eclipse.osee.framework.core.datastore=SVN,,http://dev.eclipse.org/svn plugin@org.eclipse.osee.framework.core.server=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.core.server
plugin@org.eclipse.osee.framework.database=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.database
plugin@org.eclipse.osee.framework.derby=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.derby
+plugin@org.eclipse.osee.framework.h2=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.h2
plugin@org.eclipse.osee.framework.manager.servlet=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.manager.servlet
plugin@org.eclipse.osee.framework.resource.locator.attribute=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.resource.locator.attribute
plugin@org.eclipse.osee.framework.resource.management=SVN,,http://dev.eclipse.org/svnroot/technology/org.eclipse.osee/trunk,,plugins/org.eclipse.osee.framework.resource.management
|