Merge pull request #173 from phantomjinx/master

Set of commits addressing TP issues
Teiid-Designer · May 31, 2013 · c4aa6bc · c4aa6bc
2 parents 3f77517 + 3cc2974
commit c4aa6bc
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 36 deletions.
diff --git a/features/org.teiid.designer.feature/feature.properties b/features/org.teiid.designer.feature/feature.properties
@@ -3,15 +3,6 @@
 # See the LEGAL.txt file distributed with this work for information regarding copyright ownership and licensing.
 # 
 # See the AUTHORS.txt file distributed with this work for a full listing of individual contributors.
-copyright = \
-Teiid Designer (http://www.jboss.org/teiiddesigner.html) is copyright 2000-2013 MetaMatrix, Inc. and Red Hat, Inc.
-
-license = \
-This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which is \
-available at http://www.eclipse.org/legal/epl-v10.html.\
-\n\n\
-Some portions may be licensed to Red Hat, Inc. under one or more contributor license agreements. 
-
 # "description" property - description of the feature
 description = The Designer application enables you to create metadata models that describe your enterprise information systems. 
 
@@ -42,6 +33,8 @@ in a particular case may include the Eclipse Public License, the GNU \
 Lesser General Public License, and/or certain other open source \
 licenses. For precise licensing details, consult the corresponding \
 source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, \
-Raleigh NC 27606 USA.
+Raleigh NC 27606 USA. \
+In addition, plugins contain work credited to Brian Goetz and Tim Peierls \
+(http://www.jcip.net) (c) 2005, released under the Creative Commons Attribution License.
 # END NON-TRANSLATABLE
 ########### end of license property ##########################################
diff --git a/features/org.teiid.designer.feature/feature.xml b/features/org.teiid.designer.feature/feature.xml
@@ -76,7 +76,7 @@
       <import plugin="org.eclipse.emf.ecore" version="2.8.0" match="compatible"/>
       <import plugin="org.eclipse.emf.edit" version="2.8.0" match="compatible"/>
       <import plugin="org.eclipse.emf.common" version="2.8.0" match="compatible"/>
-      <import plugin="org.jboss.tools.locus.apache.poi" version="2.5.1" match="compatible"/>
+      <import plugin="org.apache.poi" version="3.9.0" match="compatible"/>
       <import plugin="org.eclipse.datatools.connectivity" version="1.2.5" match="compatible"/>
       <import plugin="org.teiid.designer.compare.ui" version="8.1.0" match="compatible"/>
       <import plugin="org.teiid.designer.ui" version="8.1.0" match="compatible"/>
@@ -591,7 +591,7 @@
          unpack="false"/>
 
    <plugin
-         id="org.jboss.tools.locus.apache.poi"
+         id="org.apache.poi"
          download-size="0"
          install-size="0"
          version="0.0.0"

diff --git a/features/org.teiid.designer.feature/license.html b/features/org.teiid.designer.feature/license.html
@@ -10,5 +10,9 @@
 source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
 Raleigh NC 27606 USA.
 </p>
+<p>
+In addition, plugins contain work credited to Brian Goetz and Tim Peierls \
+(http://www.jcip.net) (c) 2005, released under the Creative Commons Attribution License.
+</p>
 </body>
 </html>
diff --git a/plugins/org.teiid.designer.jdbc/META-INF/MANIFEST.MF b/plugins/org.teiid.designer.jdbc/META-INF/MANIFEST.MF
@@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.core.resources;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.8.0,3.0.0)",
  org.teiid.designer.core;bundle-version="[8.1.0,9.0.0)",
- org.jboss.tools.locus.apache.poi;bundle-version="[2.5.1,3.0.0)",
+ org.apache.poi;bundle-version="[3.9.0,4.0.0)",
  org.teiid.core.designer;bundle-version="[8.1.0,9.0.0)",
  org.eclipse.datatools.connectivity;bundle-version="[1.2.5,2.0.0)"
 Bundle-ActivationPolicy: lazy

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools</groupId>
 		<artifactId>parent</artifactId>
-		<version>4.1.0.Beta1-SNAPSHOT</version>
+		<version>4.1.0.Beta2-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools</groupId>
 	<artifactId>teiid</artifactId>

diff --git a/target-platform/locus.target b/target-platform/locus.target
@@ -2,14 +2,13 @@
 <?pde version="3.8"?>
 
 <target name="locus" sequenceNumber="4">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="http://download.jboss.org/jbosstools/updates/integration/kepler/core/locus/0.0.1.v20130507-2028-B7"/>
-  <unit id="org.jboss.tools.locus.apache.poi" version="2.5.1.Final-v20130507-2028-B7"/>
-  <unit id="org.jboss.tools.locus.jcip.annotations" version="1.0.0.Final-v20130507-2028-B7"/>
-  <unit id="org.jboss.tools.locus.mockito" version="1.9.5.Final_patched_TEIIDDES-1681-v20130507-2028-B7"/>
-  <unit id="org.jboss.tools.locus.sf.saxon" version="9.2.1.5j-Final-v20130507-2028-B7"/>
-</location>
-</locations>
-<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+  <locations>
+    <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+      <repository location="http://download.jboss.org/jbosstools/updates/integration/kepler/core/locus/0.0.1.v20130507-2028-B7"/>
+      <unit id="org.jboss.tools.locus.jcip.annotations" version="1.0.0.Final-v20130507-2028-B7"/>
+      <unit id="org.jboss.tools.locus.mockito" version="1.9.5.Final_patched_TEIIDDES-1681-v20130507-2028-B7"/>
+      <unit id="org.jboss.tools.locus.sf.saxon" version="9.2.1.5j-Final-v20130507-2028-B7"/>
+    </location>
+  </locations>
+  <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 </target>
diff --git a/target-platform/orbit.target b/target-platform/orbit.target
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+
+<target name="jbt-orbit" sequenceNumber="4">
+  <locations>
+    <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+      <repository location="http://download.jboss.org/jbosstools/updates/requirements/orbit/S20130427215344/"/>
+      <unit id="org.apache.poi" version="3.9.0.v201303080712"/>
+    </location>
+  </locations>
+  <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+</target>
diff --git a/target-platform/pom.xml b/target-platform/pom.xml
@@ -51,7 +51,7 @@
 					<plugin>
 						<groupId>org.jboss.tools.tycho-plugins</groupId>
 						<artifactId>target-platform-utils</artifactId>
-						<version>0.16.0.CR1</version>
+						<version>0.16.0.CR2</version>
 						<executions>
 							<execution>
 								<phase>generate-resources</phase>
@@ -69,6 +69,7 @@
 									</sourceTargetArtifacts>
 									<sourceTargetFiles>
 										<item>locus.target</item>
+										<item>orbit.target</item>
 									</sourceTargetFiles>
 									<outputFile>teiid-designer.target</outputFile>
 								</configuration>

diff --git a/target-platform/teiid-designer.target b/target-platform/teiid-designer.target
@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?>
 <target name="locus" sequenceNumber="4">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="http://download.jboss.org/jbosstools/updates/integration/kepler/core/locus/0.0.1.v20130507-2028-B7"/>
-  <unit id="org.jboss.tools.locus.apache.poi" version="2.5.1.Final-v20130507-2028-B7"/>
-  <unit id="org.jboss.tools.locus.jcip.annotations" version="1.0.0.Final-v20130507-2028-B7"/>
-  <unit id="org.jboss.tools.locus.mockito" version="1.9.5.Final_patched_TEIIDDES-1681-v20130507-2028-B7"/>
-  <unit id="org.jboss.tools.locus.sf.saxon" version="9.2.1.5j-Final-v20130507-2028-B7"/>
-</location>
-
+  <locations>
+    <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+      <repository location="http://download.jboss.org/jbosstools/updates/integration/kepler/core/locus/0.0.1.v20130507-2028-B7"/>
+      <unit id="org.jboss.tools.locus.jcip.annotations" version="1.0.0.Final-v20130507-2028-B7"/>
+      <unit id="org.jboss.tools.locus.mockito" version="1.9.5.Final_patched_TEIIDDES-1681-v20130507-2028-B7"/>
+      <unit id="org.jboss.tools.locus.sf.saxon" version="9.2.1.5j-Final-v20130507-2028-B7"/>
+    </location>
+
+    <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+      <repository location="http://download.jboss.org/jbosstools/updates/requirements/orbit/S20130427215344/"/>
+      <unit id="org.apache.poi" version="3.9.0.v201303080712"/>
+    </location>
+
 
     <!-- Eclipse Graphiti -->
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -591,5 +595,5 @@
 
 
   </locations>
-<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
+  <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+</target>