bug 370153: Use Tycho for Gemini Naming build.
diff --git a/framework/META-INF/MANIFEST.MF b/framework/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..344269a
--- /dev/null
+++ b/framework/META-INF/MANIFEST.MF
@@ -0,0 +1,18 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Gemini Naming (Incubation)
+Bundle-SymbolicName: org.eclipse.gemini.naming
+Bundle-Vendor: Oracle
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.eclipse.gemini.naming.Activator
+Bundle-Description: Gemini Naming bundle (Incubation)
+Bundle-Category: jndi
+Export-Package: org.eclipse.gemini.naming,
+ org.osgi.service.jndi
+Import-Package: javax.naming,
+ javax.naming.directory,
+ javax.naming.spi,
+ org.osgi.framework,
+ org.osgi.service.jndi,
+ org.osgi.util.tracker
+
diff --git a/framework/build.properties b/framework/build.properties
new file mode 100644
index 0000000..60212e4
--- /dev/null
+++ b/framework/build.properties
@@ -0,0 +1,3 @@
+source.. = src/main/java/
+output.. = target/
+bin.includes = META-INF/,.
diff --git a/framework/pom.xml b/framework/pom.xml
index 21f29d9..c476512 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.gemini.naming</groupId>
<artifactId>org.eclipse.gemini.naming</artifactId>
- <packaging>bundle</packaging>
+ <packaging>eclipse-plugin</packaging>
<version>1.0.0-SNAPSHOT</version>
<name>Gemini Naming Bundle</name>
<url>http://maven.apache.org</url>
@@ -14,44 +14,4 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
- <dependencies>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
- <version>3.5.0.v20090520</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <!--
- this is the BND plugin which generates the actual OSGi bundle for
- this project. You can find the documentation for this plugin at
- http://is.gd/hL7p
- -->
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Include-Resource>{maven-resources}</Include-Resource>
- <obrRepository>NONE</obrRepository>
- <Bundle-Name>Gemini Naming (Incubation)</Bundle-Name>
- <Bundle-SymbolicName>org.eclipse.gemini.naming</Bundle-SymbolicName>
- <Bundle-Vendor>Oracle</Bundle-Vendor>
- <Bundle-Version>1.0.0</Bundle-Version>
- <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
- <Bundle-Activator>org.eclipse.gemini.naming.Activator</Bundle-Activator>
- <Bundle-Description>Gemini Naming bundle (Incubation)</Bundle-Description>
- <Bundle-Category>jndi</Bundle-Category>
- <Import-Package>org.osgi.service.jndi,*</Import-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-
-
</project>
diff --git a/integration-testing/pom.xml b/integration-testing/pom.xml
index 39c5603..53ac7c7 100644
--- a/integration-testing/pom.xml
+++ b/integration-testing/pom.xml
@@ -52,9 +52,9 @@
<!-- Dependency on the Gemini Naming Bundle -->
<dependency>
- <groupId>org.eclipse.gemini.naming</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>org.eclipse.gemini.naming</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>jar</type>
<scope>provided</scope>
</dependency>
diff --git a/org.eclipse.gemini.naming.feature/.project b/org.eclipse.gemini.naming.feature/.project
new file mode 100644
index 0000000..4d04f35
--- /dev/null
+++ b/org.eclipse.gemini.naming.feature/.project
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.gemini.naming.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>
diff --git a/org.eclipse.gemini.naming.feature/build.properties b/org.eclipse.gemini.naming.feature/build.properties
new file mode 100644
index 0000000..7ee5b74
--- /dev/null
+++ b/org.eclipse.gemini.naming.feature/build.properties
@@ -0,0 +1,5 @@
+bin.includes = feature.xml,\
+ eclipse_update_120.jpg,\
+ epl-v10.html,\
+ feature.properties,\
+ license.html
\ No newline at end of file
diff --git a/org.eclipse.gemini.naming.feature/eclipse_update_120.jpg b/org.eclipse.gemini.naming.feature/eclipse_update_120.jpg
new file mode 100644
index 0000000..bfdf708
--- /dev/null
+++ b/org.eclipse.gemini.naming.feature/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.gemini.naming.feature/epl-v10.html b/org.eclipse.gemini.naming.feature/epl-v10.html
new file mode 100644
index 0000000..eecc800
--- /dev/null
+++ b/org.eclipse.gemini.naming.feature/epl-v10.html
@@ -0,0 +1,258 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
+<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+<TITLE>Eclipse Public License - Version 1.0</TITLE>
+<STYLE type="text/css">
+ body {
+ size: 8.5in 11.0in;
+ margin: 0.25in 0.5in 0.25in 0.5in;
+ tab-interval: 0.5in;
+ }
+ p {
+ margin-left: auto;
+ margin-top: 0.5em;
+ margin-bottom: 0.5em;
+ }
+ p.list {
+ margin-left: 0.5in;
+ margin-top: 0.05em;
+ margin-bottom: 0.05em;
+ }
+ </STYLE>
+
+</HEAD><BODY lang="EN-US">
+
+<H2>Eclipse Public License - v 1.0</H2>
+
+<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</P>
+
+<P><B>1. DEFINITIONS</B></P>
+
+<P>"Contribution" means:</P>
+
+<P class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</P>
+<P class="list">b) in the case of each subsequent Contributor:</P>
+<P class="list">i) changes to the Program, and</P>
+<P class="list">ii) additions to the Program;</P>
+<P class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</P>
+
+<P>"Contributor" means any person or entity that distributes
+the Program.</P>
+
+<P>"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</P>
+
+<P>"Program" means the Contributions distributed in accordance
+with this Agreement.</P>
+
+<P>"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.</P>
+
+<P><B>2. GRANT OF RIGHTS</B></P>
+
+<P class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</P>
+
+<P class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</P>
+
+<P class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</P>
+
+<P class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</P>
+
+<P><B>3. REQUIREMENTS</B></P>
+
+<P>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</P>
+
+<P class="list">a) it complies with the terms and conditions of this
+Agreement; and</P>
+
+<P class="list">b) its license agreement:</P>
+
+<P class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</P>
+
+<P class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</P>
+
+<P class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</P>
+
+<P class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</P>
+
+<P>When the Program is made available in source code form:</P>
+
+<P class="list">a) it must be made available under this Agreement; and</P>
+
+<P class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</P>
+
+<P>Contributors may not remove or alter any copyright notices contained
+within the Program.</P>
+
+<P>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</P>
+
+<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
+
+<P>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</P>
+
+<P>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</P>
+
+<P><B>5. NO WARRANTY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED 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. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</P>
+
+<P><B>6. DISCLAIMER OF LIABILITY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), 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 OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
+
+<P><B>7. GENERAL</B></P>
+
+<P>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</P>
+
+<P>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</P>
+
+<P>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</P>
+
+<P>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</P>
+
+<P>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</P>
+
+
+
+
+</BODY></HTML>
\ No newline at end of file
diff --git a/org.eclipse.gemini.naming.feature/feature.properties b/org.eclipse.gemini.naming.feature/feature.properties
new file mode 100644
index 0000000..9d800e8
--- /dev/null
+++ b/org.eclipse.gemini.naming.feature/feature.properties
@@ -0,0 +1,182 @@
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse Gemini Naming
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+
+# "description" property - description of the feature
+description=Eclipse Gemini Naming project implements support for using\n\
+the Java Naming and Directory Interface (also known as JNDI) within an\n\
+OSGi environment. This project provides the following:\n\
+a standard mechanism for publishing and locating JNDI Service Provider\n\
+implementations within an OSGi framework, support for the existing\n\
+traditional model of JNDI clients, a new service-based model for\n\
+interacting with JNDI providers, and the ability to access OSGi services\n\
+using osgi-based URL lookups.\n\
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2010-2012 Oracle.\n\
+\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+and Apache License v2.0 which accompanies this distribution.\n\
+The Eclipse Public License is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+and the Apache License v2.0 is available at\n\
+http://www.opensource.org/licenses/apache2.0.php.\n\
+You may elect to redistribute this code under either of these\n\
+licenses.\n\
+\n\
+Contributors:\n\
+Oracle - Initial Reference Implementation\n\
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+April 14, 2010\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,\n\
+INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS\n\
+(COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS\n\
+AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF\n\
+LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.\n\
+BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS\n\
+GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY\n\
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\
+AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY\n\
+NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+- Content may be structured and packaged into modules to facilitate delivering,\n\
+extending, and upgrading the Content. Typical modules may include plug-ins\n\
+("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").\n\
+- Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\
+(Java tm ARchive) in a directory named "plugins".\n\
+- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated\n\
+material. Each Feature may be packaged as a sub-directory in a directory named\n\
+"features". Within a Feature, files named "feature.xml" may contain a list\n\
+of the names and version numbers of the Plug-ins and/or Fragments associated\n\
+with that Feature.\n\
+- Features may also include other Features ("Included Features").\n\
+Within a Feature, files named "feature.xml" may contain a list of the\n\
+names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+- The top-level (root) directory\n\
+- Plug-in and Fragment directories\n\
+- Inside Plug-ins and Fragments packaged as JARs\n\
+- Sub-directories of the directory named "src" of certain Plug-ins\n\
+- Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed\n\
+using the Provisioning Technology (as defined below), you must agree to a\n\
+license ("Feature Update License") during the installation process.\n\
+If the Feature contains\n\
+Included Features, the Feature Update License should either provide\n\
+you with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms\n\
+and conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+- Common Public License Version 1.0 (available at\n\
+http://www.eclipse.org/legal/cpl-v10.html)\n\
+- Apache Software License 1.1 (available at\n\
+http://www.apache.org/licenses/LICENSE)\n\
+- Apache Software License 2.0 (available at\n\
+http://www.apache.org/licenses/LICENSE-2.0)\n\
+- Metro Link Public License 1.00 (available at\n\
+http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+- Mozilla Public License Version 1.1 (available at\n\
+http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS\n\
+PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature\n\
+Update License is provided, please contact the Eclipse Foundation to\n\
+determine what terms and conditions govern that particular Content.\n\
+\n\
+Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples\n\
+of which include, but are not limited to, p2 and the Eclipse Update Manager\n\
+("Provisioning Technology") for the purpose of allowing users to install software,\n\
+documentation, information and/or other materials (collectively "Installable Software").\n\
+This capability is provided with the intent of allowing such users to install,\n\
+extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating\n\
+to the Installable Software to be presented to, and accepted by,\n\
+the users of the Provisioning Technology in accordance with the Specification.\n\
+By using Provisioning Technology in such a manner and making it available in accordance\n\
+with the Specification, you further acknowledge your agreement to,\n\
+and the acquisition of all necessary rights to permit the following:\n\
+\n\
+- A series of actions may occur ("Provisioning Process") in which a user may execute the\n\
+Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+extending or updating the functionality of an Eclipse-based product.\n\
+- During the Provisioning Process, the Provisioning Technology may cause third party\n\
+Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+- Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+govern the use of the Installable Software ("Installable Software Agreement")\n\
+and such Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+with the Specification. Such Installable Software Agreement must inform the user of the terms and\n\
+conditions that govern the Installable Software and must solicit acceptance by the end user in\n\
+the manner prescribed in such Installable Software Agreement.\n\
+Upon such indication of agreement by the user, the provisioning Technology\n\
+will complete installation of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n\
+
diff --git a/org.eclipse.gemini.naming.feature/feature.xml b/org.eclipse.gemini.naming.feature/feature.xml
new file mode 100644
index 0000000..ca3ae71
--- /dev/null
+++ b/org.eclipse.gemini.naming.feature/feature.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.gemini.naming.feature"
+ label="%featureName"
+ version="1.0.0.qualifier"
+ provider-name="%providerName"
+ image="eclipse_update_120.jpg">
+
+ <description url="http://eclipse.org/gemini/naming">
+ %description
+ </description>
+
+ <copyright url="http://eclipse.org/gemini/naming">
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <plugin
+ id="org.eclipse.gemini.naming"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/org.eclipse.gemini.naming.feature/license.html b/org.eclipse.gemini.naming.feature/license.html
new file mode 100644
index 0000000..0ee73f4
--- /dev/null
+++ b/org.eclipse.gemini.naming.feature/license.html
@@ -0,0 +1,104 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
+<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+<TITLE>Eclipse Foundation Software User Agreement</TITLE>
+</HEAD><BODY lang="EN-US">
+<H2>Eclipse Foundation Software User Agreement</H2>
+<P>April 14, 2010</P>
+
+<H3>Usage Of Content</H3>
+
+<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+ (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+ CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+ OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+ NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+ CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</P>
+
+<H3>Applicable Licenses</H3>
+
+<P>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+ ("EPL"). A copy of the EPL is provided with this Content and is also available at <A href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
+ For purposes of the EPL, "Program" will mean the Content.</P>
+
+<P>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</P>
+
+<UL>
+ <LI>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</LI>
+ <LI>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java ARchive) in a directory named "plugins".</LI>
+ <LI>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+ and/or Fragments associated with that Feature.</LI>
+ <LI>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</LI>
+</UL>
+
+<P>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
+Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</P>
+
+<UL>
+ <LI>The top-level (root) directory</LI>
+ <LI>Plug-in and Fragment directories</LI>
+ <LI>Inside Plug-ins and Fragments packaged as JARs</LI>
+ <LI>Sub-directories of the directory named "src" of certain Plug-ins</LI>
+ <LI>Feature directories</LI>
+</UL>
+
+<P>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
+installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</P>
+
+<P>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
+
+<UL>
+ <LI>Common Public License Version 1.0 (available at <A href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)</LI>
+ <LI>Apache Software License 1.1 (available at <A href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)</LI>
+ <LI>Apache Software License 2.0 (available at <A href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)</LI>
+ <LI>Metro Link Public License 1.00 (available at <A href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)</LI>
+ <LI>Mozilla Public License Version 1.1 (available at <A href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>)</LI>
+</UL>
+
+<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</P>
+
+
+<H3>Use of Provisioning Technology</H3>
+
+<P>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <A href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</A>
+ ("Specification").</P>
+
+<P>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</P>
+
+<OL>
+ <LI>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+ on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.</LI>
+ <LI>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.</LI>
+ <LI>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</LI>
+</OL>
+
+<H3>Cryptography</H3>
+
+<P>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+ another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+ possession, or use, and re-export of encryption software, to see if this is permitted.</P>
+
+<P><SMALL>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</SMALL></P>
+
+
+</BODY></HTML>
\ No newline at end of file
diff --git a/org.eclipse.gemini.naming.feature/pom.xml b/org.eclipse.gemini.naming.feature/pom.xml
new file mode 100644
index 0000000..ee90e17
--- /dev/null
+++ b/org.eclipse.gemini.naming.feature/pom.xml
@@ -0,0 +1,14 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.gemini.naming</groupId>
+ <artifactId>org.eclipse.gemini.naming.parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.gemini.naming.feature</artifactId>
+ <packaging>eclipse-feature</packaging>
+ <name>Gemini Naming Feature</name>
+
+</project>
\ No newline at end of file
diff --git a/org.eclipse.gemini.naming.repository/.project b/org.eclipse.gemini.naming.repository/.project
new file mode 100644
index 0000000..f7eb1f1
--- /dev/null
+++ b/org.eclipse.gemini.naming.repository/.project
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.gemini.naming.repository</name>
+ <comment></comment>
+ <projects></projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.UpdateSiteBuilder</name>
+ <arguments></arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.UpdateSiteNature</nature>
+ </natures>
+</projectDescription>
diff --git a/org.eclipse.gemini.naming.repository/category.xml b/org.eclipse.gemini.naming.repository/category.xml
new file mode 100644
index 0000000..d7f65b0
--- /dev/null
+++ b/org.eclipse.gemini.naming.repository/category.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <feature url="features/org.eclipse.gemini.naming.feature_1.0.0.qualifier.jar" id="org.eclipse.gemini.naming.feature" version="1.0.0.qualifier">
+ <category name="gemini.naming"/>
+ </feature>
+ <category-def name="gemini.naming" label="Gemini Naming"/>
+</site>
diff --git a/org.eclipse.gemini.naming.repository/pom.xml b/org.eclipse.gemini.naming.repository/pom.xml
new file mode 100644
index 0000000..4dd2f24
--- /dev/null
+++ b/org.eclipse.gemini.naming.repository/pom.xml
@@ -0,0 +1,26 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.gemini.naming</groupId>
+ <artifactId>org.eclipse.gemini.naming.parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.gemini.naming.repository</artifactId>
+ <packaging>eclipse-repository</packaging>
+ <name>Gemini Naming Update Site</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-publisher-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <publishArtifacts>true</publishArtifacts>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/org.eclipse.gemini.naming.target/gemini-naming.target b/org.eclipse.gemini.naming.target/gemini-naming.target
new file mode 100644
index 0000000..6806617
--- /dev/null
+++ b/org.eclipse.gemini.naming.target/gemini-naming.target
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.6"?>
+
+<target name="gemini-naming" sequenceNumber="60">
+ <locations>
+ <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+ <unit id="org.eclipse.osgi" version="3.5.2.R35x_v20100126"/>
+ <repository location="http://download.eclipse.org/eclipse/updates/3.5/"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" includeSource="false" type="InstallableUnit">
+ <unit id="osgi.enterprise" version="4.2.0.v201108120515"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20111018035124/repository/"/>
+ </location>
+ </locations>
+</target>
diff --git a/org.eclipse.gemini.naming.target/pom.xml b/org.eclipse.gemini.naming.target/pom.xml
new file mode 100644
index 0000000..44b0770
--- /dev/null
+++ b/org.eclipse.gemini.naming.target/pom.xml
@@ -0,0 +1,42 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.gemini.naming</groupId>
+ <artifactId>org.eclipse.gemini.naming.parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>target-platform</artifactId>
+ <packaging>pom</packaging>
+ <name>Gemini Naming Target Platform</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>gemini-naming.target</file>
+ <type>target</type>
+ <classifier>gemini-naming</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/org.eclipse.gemini.naming.utests/pom.xml b/org.eclipse.gemini.naming.utests/pom.xml
new file mode 100644
index 0000000..19b77a8
--- /dev/null
+++ b/org.eclipse.gemini.naming.utests/pom.xml
@@ -0,0 +1,52 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.gemini.naming</groupId>
+ <artifactId>org.eclipse.gemini.naming.parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.gemini.naming.utests</artifactId>
+ <packaging>jar</packaging>
+ <name>Gemini Naming Unit Tests</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.11</version>
+ <configuration>
+ <includes>
+ <include>**/*TestCase.class</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy gemini naming classes</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>org.eclipse.gemini.naming</artifactId>
+ <version>${project.version}</version>
+ <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/framework/src/test/java/org/eclipse/gemini/naming/ActivatorTestCase.java b/org.eclipse.gemini.naming.utests/src/test/java/org/eclipse/gemini/naming/ActivatorTestCase.java
similarity index 100%
rename from framework/src/test/java/org/eclipse/gemini/naming/ActivatorTestCase.java
rename to org.eclipse.gemini.naming.utests/src/test/java/org/eclipse/gemini/naming/ActivatorTestCase.java
diff --git a/framework/src/test/java/org/eclipse/gemini/naming/BuilderUtilsTestCase.java b/org.eclipse.gemini.naming.utests/src/test/java/org/eclipse/gemini/naming/BuilderUtilsTestCase.java
similarity index 100%
rename from framework/src/test/java/org/eclipse/gemini/naming/BuilderUtilsTestCase.java
rename to org.eclipse.gemini.naming.utests/src/test/java/org/eclipse/gemini/naming/BuilderUtilsTestCase.java
diff --git a/framework/src/test/java/org/eclipse/gemini/naming/ContextWrapperImplTestCase.java b/org.eclipse.gemini.naming.utests/src/test/java/org/eclipse/gemini/naming/ContextWrapperImplTestCase.java
similarity index 100%
rename from framework/src/test/java/org/eclipse/gemini/naming/ContextWrapperImplTestCase.java
rename to org.eclipse.gemini.naming.utests/src/test/java/org/eclipse/gemini/naming/ContextWrapperImplTestCase.java
diff --git a/framework/src/test/java/org/eclipse/gemini/naming/DefaultInitialContextFactoryTestCase.java b/org.eclipse.gemini.naming.utests/src/test/java/org/eclipse/gemini/naming/DefaultInitialContextFactoryTestCase.java
similarity index 100%
rename from framework/src/test/java/org/eclipse/gemini/naming/DefaultInitialContextFactoryTestCase.java
rename to org.eclipse.gemini.naming.utests/src/test/java/org/eclipse/gemini/naming/DefaultInitialContextFactoryTestCase.java
diff --git a/framework/src/test/java/org/eclipse/gemini/naming/DefaultRuntimeInitialContextFactoryBuilderTestCase.java b/org.eclipse.gemini.naming.utests/src/test/java/org/eclipse/gemini/naming/DefaultRuntimeInitialContextFactoryBuilderTestCase.java
similarity index 100%
rename from framework/src/test/java/org/eclipse/gemini/naming/DefaultRuntimeInitialContextFactoryBuilderTestCase.java
rename to org.eclipse.gemini.naming.utests/src/test/java/org/eclipse/gemini/naming/DefaultRuntimeInitialContextFactoryBuilderTestCase.java
diff --git a/framework/src/test/java/org/eclipse/gemini/naming/DirContextWrapperImplTestCase.java b/org.eclipse.gemini.naming.utests/src/test/java/org/eclipse/gemini/naming/DirContextWrapperImplTestCase.java
similarity index 100%
rename from framework/src/test/java/org/eclipse/gemini/naming/DirContextWrapperImplTestCase.java
rename to org.eclipse.gemini.naming.utests/src/test/java/org/eclipse/gemini/naming/DirContextWrapperImplTestCase.java
diff --git a/framework/src/test/java/org/eclipse/gemini/naming/InitialContextFactoryWrapperTestCase.java b/org.eclipse.gemini.naming.utests/src/test/java/org/eclipse/gemini/naming/InitialContextFactoryWrapperTestCase.java
similarity index 100%
rename from framework/src/test/java/org/eclipse/gemini/naming/InitialContextFactoryWrapperTestCase.java
rename to org.eclipse.gemini.naming.utests/src/test/java/org/eclipse/gemini/naming/InitialContextFactoryWrapperTestCase.java
diff --git a/framework/src/test/java/org/eclipse/gemini/naming/NotSupportedContextTestCase.java b/org.eclipse.gemini.naming.utests/src/test/java/org/eclipse/gemini/naming/NotSupportedContextTestCase.java
similarity index 100%
rename from framework/src/test/java/org/eclipse/gemini/naming/NotSupportedContextTestCase.java
rename to org.eclipse.gemini.naming.utests/src/test/java/org/eclipse/gemini/naming/NotSupportedContextTestCase.java
diff --git a/framework/src/test/java/org/eclipse/gemini/naming/OSGiServiceListContextTestCase.java b/org.eclipse.gemini.naming.utests/src/test/java/org/eclipse/gemini/naming/OSGiServiceListContextTestCase.java
similarity index 100%
rename from framework/src/test/java/org/eclipse/gemini/naming/OSGiServiceListContextTestCase.java
rename to org.eclipse.gemini.naming.utests/src/test/java/org/eclipse/gemini/naming/OSGiServiceListContextTestCase.java
diff --git a/framework/src/test/java/org/eclipse/gemini/naming/OSGiURLContextFactoryTestCase.java b/org.eclipse.gemini.naming.utests/src/test/java/org/eclipse/gemini/naming/OSGiURLContextFactoryTestCase.java
similarity index 100%
rename from framework/src/test/java/org/eclipse/gemini/naming/OSGiURLContextFactoryTestCase.java
rename to org.eclipse.gemini.naming.utests/src/test/java/org/eclipse/gemini/naming/OSGiURLContextFactoryTestCase.java
diff --git a/framework/src/test/java/org/eclipse/gemini/naming/OSGiURLParserTestCase.java b/org.eclipse.gemini.naming.utests/src/test/java/org/eclipse/gemini/naming/OSGiURLParserTestCase.java
similarity index 100%
rename from framework/src/test/java/org/eclipse/gemini/naming/OSGiURLParserTestCase.java
rename to org.eclipse.gemini.naming.utests/src/test/java/org/eclipse/gemini/naming/OSGiURLParserTestCase.java
diff --git a/framework/src/test/java/org/eclipse/gemini/naming/ReflectionUtilsTestCase.java b/org.eclipse.gemini.naming.utests/src/test/java/org/eclipse/gemini/naming/ReflectionUtilsTestCase.java
similarity index 100%
rename from framework/src/test/java/org/eclipse/gemini/naming/ReflectionUtilsTestCase.java
rename to org.eclipse.gemini.naming.utests/src/test/java/org/eclipse/gemini/naming/ReflectionUtilsTestCase.java
diff --git a/framework/src/test/java/org/eclipse/gemini/naming/ServiceProxyInfoTestCase.java b/org.eclipse.gemini.naming.utests/src/test/java/org/eclipse/gemini/naming/ServiceProxyInfoTestCase.java
similarity index 100%
rename from framework/src/test/java/org/eclipse/gemini/naming/ServiceProxyInfoTestCase.java
rename to org.eclipse.gemini.naming.utests/src/test/java/org/eclipse/gemini/naming/ServiceProxyInfoTestCase.java
diff --git a/pom.xml b/pom.xml
index 5b0539a..43e69c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,6 +5,8 @@
<equinox.version>3.5.0.v20090520</equinox.version>
<spring.version>2.5.6.A</spring.version>
<spring.osgi.version>1.2.0</spring.osgi.version>
+ <tycho-version>0.13.0</tycho-version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<modelVersion>4.0.0</modelVersion>
@@ -17,7 +19,11 @@
<modules>
<module>framework</module>
+ <module>org.eclipse.gemini.naming.utests</module>
<module>integration-testing</module>
+ <module>org.eclipse.gemini.naming.target</module>
+ <module>org.eclipse.gemini.naming.feature</module>
+ <module>org.eclipse.gemini.naming.repository</module>
</modules>
<repositories>
@@ -67,14 +73,70 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>osgi</artifactId>
+ <version>3.5.0.v20090520</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-maven-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <resolver>p2</resolver>
+ <target>
+ <artifact>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>target-platform</artifactId>
+ <version>${project.version}</version>
+ <classifier>gemini-naming</classifier>
+ </artifact>
+ </target>
+ <environments>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86_64</arch>
+ </environment>
+ </environments>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-compiler-plugin </artifactId>
+ <version>${tycho-version}</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
