Skip to content

Commit

Permalink
TEIIDDES-1518: Fix building with maven
Browse files Browse the repository at this point in the history
* org.teiid.designer.feature
 * Remove org.teiid8 client plugin from this feature

* org.teiid.designer.runtime.feature
 * Remove org.teiid8 client plugin from this feature
 * Include the teiid.client feature

* org.teiid.designer.teiid.client.feature
 * Feature encapsulating teiid client plugins
 * It may be that in the future some clients are distributed separately
   but at the moment group them in this feature

* features/pom.xml
 * Add client.feature to feature pom

* org.teiid.designer.spi
 * Fix bundle version to include qualifier
 * Add the pom.xml for building this plugin

* FunctionPlugin
 * Remove superfluous import statement

* plugins/pom.xml
 * Add spi plugin
 * Add teiid sub-directory as a module

* plugins/teiid/pom.xml
 * Makes this sub-directory a maven module for its plugins

* org.teiid8/pom.xml
 * Fix its id and parent id

* pom.xml
 * Update the codebase to use JBT 4.0.0 Final

* tests/pom.xml
 * Add the teiid8 test plugin for testing

* org.teiid.designer.query.ui.test/META-INF/MANIFEST.MF
* org.teiid.designer.schema.tools.test/META-INF/MANIFEST.MF
 * Need to add org.teiid8 to these test plugins so that a client
   implementation is available to test against
  • Loading branch information
blafond authored and Paul Richardson committed Dec 11, 2012
1 parent a71e14b commit 42b3a31
Show file tree
Hide file tree
Showing 30 changed files with 253 additions and 39 deletions.
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
John Doyle (jdoyle@redhat.com)
Barry LaFond (blafond@redhat.com) - Project Lead
John Verhaeg (jverhaeg@redhat.com)
Dan Florian (dflorian@redhat.com)
John Doyle (jdoyle@redhat.com)
Paul Richardson (p.g.richardson@redhat.com)
2 changes: 1 addition & 1 deletion features/org.teiid.designer.feature/AUTHORS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ Barry LaFond (blafond@redhat.com) - Project Lead
John Verhaeg (jverhaeg@redhat.com)
Dan Florian (dflorian@redhat.com)
John Doyle (jdoyle@redhat.com)
Ted JOnes (tejones@redhat.com)
Paul Richardson (p.g.richardson@redhat.com)
5 changes: 3 additions & 2 deletions features/org.teiid.designer.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -508,9 +508,10 @@
unpack="false"/>

<plugin
id="org.teiid.8-2"
id="org.teiid.designer.spi"
download-size="0"
install-size="0"
version="0.0.0"/>
version="0.0.0"
unpack="false"/>

</feature>
3 changes: 2 additions & 1 deletion features/org.teiid.designer.runtime.feature/AUTHORS.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Barry LaFond (blafond@redhat.com) - Project Lead
John Verhaeg (jverhaeg@redhat.com)
Dan Florian (dflorian@redhat.com)
John Doyle (jdoyle@redhat.com)
John Doyle (jdoyle@redhat.com)
Paul Richardson (p.g.richardson@redhat.com)
5 changes: 4 additions & 1 deletion features/org.teiid.designer.runtime.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ Including: Connection management, VDB creation and management and Data Preview/V
version="0.0.0"
name="Teiid Designer Design-time"/>

<includes
id="org.teiid.designer.teiid.client.feature"
version="0.0.0"/>

<requires>
<import plugin="org.eclipse.core.runtime" version="3.8.0" match="compatible"/>
<import plugin="org.jdom" version="1.1.1" match="compatible"/>
Expand Down Expand Up @@ -121,7 +125,6 @@ Including: Connection management, VDB creation and management and Data Preview/V
<import feature="org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature" version="1.7.0" match="greaterOrEqual"/>
<import feature="org.eclipse.datatools.sqldevtools.sqlbuilder.feature" version="1.7.0" match="greaterOrEqual"/>
<import feature="org.eclipse.datatools.sqltools.doc.user" version="1.7.0" match="greaterOrEqual"/>
<import plugin="org.teiid.8-2" version="8.0.0" match="compatible"/>
<import plugin="org.teiid.designer.relational" version="8.0.0" match="compatible"/>
</requires>

Expand Down
17 changes: 17 additions & 0 deletions features/org.teiid.designer.teiid.client.feature/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.teiid.designer.teiid.client.feature</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.pde.FeatureBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>
5 changes: 5 additions & 0 deletions features/org.teiid.designer.teiid.client.feature/AUTHORS.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Barry LaFond (blafond@redhat.com) - Project Lead
John Verhaeg (jverhaeg@redhat.com)
Dan Florian (dflorian@redhat.com)
John Doyle (jdoyle@redhat.com)
Paul Richardson (p.g.richardson@redhat.com)
6 changes: 6 additions & 0 deletions features/org.teiid.designer.teiid.client.feature/LEGAL.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Teiid Designer (http://www.jboss.org/projects/teiiddesigner.html) is copyright 2000-2012 MetaMatrix, Inc. and Red Hat, Inc.

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.

Some portions may be licensed to Red Hat, Inc. under one or more contributor license agreements.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
bin.includes = feature.xml,\
feature.gif,\
designer32.png,\
LEGAL.txt,\
AUTHORS.txt,\
license.html
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
#
# Teiid (http://www.teiid.org)
# See the COPYRIGHT.txt file distributed with this work for information
# regarding copyright ownership.
#
# Distributed under license by Red Hat, Inc. All rights reserved.
# This program is made available under the terms of the
# Eclipse Public License v1.0 which accompanies this distribution, and is
# available at http://www.eclipse.org/legal/epl-v10.html.
#
# See the AUTHORS.txt file in the distribution for a full listing of
# individual contributors.
#


# Feature Information Page properties
description = The Teiid DataTools Connectivity Feature provides connectivity to Teiid to browse metadata and execute SQL in a DataTools context.

# "featureName" property - name of the feature
featureName=Teiid DataTools Connectivity Feature

# "providerName" property - name of the company that provides the feature
providerName=JBoss by Red Hat

# "copyright" property - text of the "Feature Update Copyright"
copyright=Copyright (c) 2008-2012 Red Hat, Inc. and others.\nAll rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\nwhich accompanies this distribution, and is available at\nhttp\://www.eclipse.org/legal/epl-v10.html\n\nContributors\:\nJBoss by Red Hat - Initial implementation.\n
############### end of copyright property ####################################

# "licenseURL" property - URL of the "Feature License"
# do not translate value - just change to point to a locale-specific HTML page
licenseURL=license.html

# START NON-TRANSLATABLE
# "license" property - text of the "Feature Update License"
# should be plain text version of license agreement pointed to be "licenseURL"
license=Red Hat, Inc. licenses these features and plugins to you under \
certain open source licenses (or aggregations of such licenses), which \
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.
# END NON-TRANSLATABLE
########### end of license property ##########################################
27 changes: 27 additions & 0 deletions features/org.teiid.designer.teiid.client.feature/feature.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.teiid.designer.teiid.client.feature"
label="teiid client"
version="8.0.0.qualifier"
provider-name="%providerName">

<description url="www.jboss.org/projects/teiiddesigner">
Teiid Designer Teiid Client plugins
</description>

<copyright url="http://www.example.com/copyright">
[Enter Copyright Description here.]
</copyright>

<license url="http://www.example.com/license">
[Enter License Description here.]
</license>

<plugin
id="org.teiid8"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

</feature>
14 changes: 14 additions & 0 deletions features/org.teiid.designer.teiid.client.feature/license.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
<html>

<body>
<p>Red Hat, Inc. licenses these features and plugins to you under
certain open source licenses (or aggregations of such licenses), which
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.
</p>
</body>
</html>
13 changes: 13 additions & 0 deletions features/org.teiid.designer.teiid.client.feature/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<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>
<groupId>org.jboss.tools.teiid</groupId>
<artifactId>features</artifactId>
<version>0.0.4-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.teiid.designer.teiid.client.feature</artifactId>
<version>8.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
3 changes: 2 additions & 1 deletion features/org.teiid.designer.test.feature/AUTHORS.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Barry LaFond (blafond@redhat.com) - Project Lead
John Verhaeg (jverhaeg@redhat.com)
Dan Florian (dflorian@redhat.com)
John Doyle (jdoyle@redhat.com)
John Doyle (jdoyle@redhat.com)
Paul Richardson (p.g.richardson@redhat.com)
57 changes: 38 additions & 19 deletions features/org.teiid.designer.test.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,25 @@
</license>

<requires>
<import plugin="org.mockito" version="1.9.0" match="compatible"/>
<import plugin="org.eclipse.core.resources" version="3.8.0" match="compatible"/>
<import plugin="org.eclipse.core.runtime" version="3.8.0" match="compatible"/>
<import plugin="org.teiid.core.designer" version="8.0.0" match="compatible"/>
<import plugin="org.junit4" version="4.8.1" match="compatible"/>
<import plugin="org.teiid.designer.core" version="8.0.0" match="compatible"/>
<import plugin="org.teiid.core.designer.test.framework" version="8.0.0" match="compatible"/>
<import plugin="org.teiid.designer.sdt" version="8.0.0" match="compatible"/>
<import plugin="org.teiid.designer.compare"/>
<import plugin="org.eclipse.emf.ecore" version="2.8.0" match="compatible"/>
<import plugin="org.eclipse.emf.mapping" version="2.7.0" match="compatible"/>
<import plugin="org.teiid.designer.metamodels.core" version="8.0.0" match="compatible"/>
<import plugin="org.eclipse.xsd" version="2.8.0" match="compatible"/>
<import plugin="org.teiid.designer.legacy" version="8.0.0" match="compatible"/>
<import plugin="org.teiid.designer.core.xslt"/>
<import plugin="org.eclipse.emf.ecore.xmi" version="2.8.0" match="compatible"/>
<import plugin="org.teiid.designer.jdbc" version="8.0.0" match="compatible"/>
<import plugin="org.teiid.designer.mapping.ui"/>
<import plugin="org.teiid.designer.core.test.framework" version="8.0.0" match="compatible"/>
<import plugin="org.teiid.designer.metamodels.relational"/>
<import plugin="org.teiid.designer.metamodels.transformation"/>
<import plugin="org.teiid.designer.metamodels.wsdl"/>
Expand All @@ -39,29 +55,17 @@
<import plugin="org.teiid.designer.webservice.ui"/>
<import plugin="org.teiid.designer.xml.ui"/>
<import plugin="org.teiid.designer.xsd.ui"/>
<import plugin="org.teiid.designer.extension"/>
<import plugin="org.teiid.designer.ddl.importer"/>
<import plugin="org.teiid.designer.dqp"/>
<import plugin="org.teiid.designer.jdbc.test.framework" version="8.0.0" match="compatible"/>
<import plugin="org.teiid.designer.jdbc.relational"/>
<import plugin="org.teiid.designer.vdb"/>
<import plugin="org.mockito" version="1.9.0" match="compatible"/>
<import plugin="org.eclipse.core.resources" version="3.8.0" match="compatible"/>
<import plugin="org.eclipse.core.runtime" version="3.8.0" match="compatible"/>
<import plugin="org.teiid.core.designer" version="8.0.0" match="compatible"/>
<import plugin="org.junit4" version="4.8.1" match="compatible"/>
<import plugin="org.teiid.designer.core" version="8.0.0" match="compatible"/>
<import plugin="org.teiid.core.designer.test.framework" version="8.0.0" match="compatible"/>
<import plugin="org.teiid.designer.sdt" version="8.0.0" match="compatible"/>
<import plugin="org.eclipse.emf.ecore" version="2.8.0" match="compatible"/>
<import plugin="org.eclipse.emf.mapping" version="2.7.0" match="compatible"/>
<import plugin="org.teiid.8-2" version="8.0.0" match="compatible"/>
<import plugin="org.teiid.designer.metamodels.core" version="8.0.0" match="compatible"/>
<import plugin="org.eclipse.xsd" version="2.8.0" match="compatible"/>
<import plugin="org.teiid.designer.legacy" version="8.0.0" match="compatible"/>
<import plugin="org.eclipse.emf.ecore.xmi" version="2.8.0" match="compatible"/>
<import plugin="org.teiid.designer.jdbc" version="8.0.0" match="compatible"/>
<import plugin="org.teiid.designer.core.test.framework" version="8.0.0" match="compatible"/>
<import plugin="org.teiid.designer.extension"/>
<import plugin="org.teiid.designer.jdbc.test.framework" version="8.0.0" match="compatible"/>
<import plugin="org.teiid8" version="8.0.0" match="compatible"/>
<import plugin="org.mockito" version="1.9.0" match="greaterOrEqual"/>
<import plugin="org.junit4" version="4.8.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui" version="3.103.0" match="compatible"/>
<import plugin="org.teiid.designer.ui.common" version="8.0.0" match="compatible"/>
</requires>

<plugin
Expand Down Expand Up @@ -317,4 +321,19 @@
fragment="true"
unpack="false"/>

<plugin
id="org.teiid8.test"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>

<plugin
id="org.teiid.designer.test"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

</feature>
1 change: 1 addition & 0 deletions features/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<version>0.0.4-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<module>org.teiid.designer.teiid.client.feature</module>
<module>org.teiid.designer.feature</module>
<module>org.teiid.designer.test.feature</module>
<module>org.teiid.designer.runtime.feature</module>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import java.net.URL;
import java.util.MissingResourceException;
import java.util.ResourceBundle;

import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Plugin;
Expand All @@ -22,7 +21,6 @@
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.common.util.WrappedException;
import org.osgi.framework.BundleContext;
import org.teiid.api.exception.query.FunctionExecutionException;
import org.teiid.core.designer.PluginUtil;
import org.teiid.core.designer.util.PluginUtilImpl;
import org.teiid.designer.core.workspace.ModelWorkspaceManager;
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.teiid.designer.spi/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.teiid.designer.spi;singleton:=true
Bundle-Version: 8.0.0
Bundle-Version: 8.0.0.qualifier
Bundle-Vendor: %pluginProvider
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Localization: plugin
Expand Down
28 changes: 28 additions & 0 deletions plugins/org.teiid.designer.spi/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<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>
<groupId>org.jboss.tools.teiid</groupId>
<artifactId>plugins</artifactId>
<version>0.0.4-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.teiid.designer.spi</artifactId>
<version>8.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
<version>${tychoVersion}</version>
<!-- not strictly needed but this suppresses warnings when compiling
that the default value (1.5) is being overwritten by the value in the MANIFEST.MF -->
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
</plugins>
</build>
</project>
3 changes: 2 additions & 1 deletion plugins/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<version>0.0.4-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<module>teiid</module>
<module>net.jcip.annotations</module>
<module>net.sf.saxon</module>
<module>org.apache.poi</module>
Expand Down Expand Up @@ -75,6 +76,7 @@
<module>org.teiid.designer.roles.ui</module>
<module>org.teiid.designer.schema.tools</module>
<module>org.teiid.designer.sdt</module>
<module>org.teiid.designer.spi</module>
<module>org.teiid.designer.tools.textimport.ui</module>
<module>org.teiid.designer.transformation</module>
<module>org.teiid.designer.transformation.ui</module>
Expand All @@ -91,7 +93,6 @@
<module>org.teiid.designer.xsd</module>
<module>org.teiid.designer.xsd.ui</module>
<module>org.wsdl4j</module>
<module>teiid_embedded_query</module>
</modules>
</project>

2 changes: 1 addition & 1 deletion plugins/teiid/org.teiid8/plugin.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
#
# See the AUTHORS.txt file distributed with this work for a full listing of individual contributors.
pluginProvider= JBoss by Red Hat
pluginName=Teiid Embedded Query Plug-in
pluginName=Teiid 8 Client Plug-in

0 comments on commit 42b3a31

Please sign in to comment.