diff options
| author | Roberto E. Escobar | 2011-11-18 23:44:51 +0000 |
|---|---|---|
| committer | Roberto E. Escobar | 2011-11-18 23:44:51 +0000 |
| commit | 653a11938dd999b62203217ab42b5db2d3c4bd9c (patch) | |
| tree | dc628b63fa47cdb199f3c8e1397bc15530339771 | |
| parent | 3d61fad8658f4e6d2e2e948d2440585628aa08aa (diff) | |
| download | org.eclipse.osee-653a11938dd999b62203217ab42b5db2d3c4bd9c.tar.gz org.eclipse.osee-653a11938dd999b62203217ab42b5db2d3c4bd9c.tar.xz org.eclipse.osee-653a11938dd999b62203217ab42b5db2d3c4bd9c.zip | |
refactor: Separate ORCS into its own feature
58 files changed, 1334 insertions, 370 deletions
diff --git a/features/org.eclipse.osee.orcs.feature.source/.project b/features/org.eclipse.osee.orcs.feature.source/.project new file mode 100644 index 00000000000..880d8170fe7 --- /dev/null +++ b/features/org.eclipse.osee.orcs.feature.source/.project @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.osee.orcs.feature.source</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/features/org.eclipse.osee.orcs.feature.source/build.properties b/features/org.eclipse.osee.orcs.feature.source/build.properties new file mode 100644 index 00000000000..34dfbf491c0 --- /dev/null +++ b/features/org.eclipse.osee.orcs.feature.source/build.properties @@ -0,0 +1,4 @@ +bin.includes = feature.xml,\ + build.properties,\ + feature.properties,\ + license.html diff --git a/features/org.eclipse.osee.orcs.feature.source/feature.properties b/features/org.eclipse.osee.orcs.feature.source/feature.properties new file mode 100644 index 00000000000..8e5caad4b7d --- /dev/null +++ b/features/org.eclipse.osee.orcs.feature.source/feature.properties @@ -0,0 +1,141 @@ +############################################################################### +# Copyright (c) 2004, 2007 Boeing and others. +# All rights reserved. This program and the accompanying materials +# are 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 +# +# Contributors: +# Boeing - initial API and implementation +############################################################################### +# 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 OSEE ORCS Feature Source (Incubation) + +# "providerName" property - name of the company that provides the feature +providerName=Eclipse.org + +# "description" property - description of the feature +description=Open System Engineering Environment ORCS Feature Source + +# "copyright" property - text of the "Feature Update Copyright" +copyright=\ +Copyright (c) 2004, 2009 Boeing and others.\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\ +which accompanies this distribution, and is available at\n\ +http://www.eclipse.org/legal/epl-v10.html\n\ +\n\ +Contributors:\n\ + Boeing - initial API and 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 + +# "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\ +March 17, 2005\n\ +\n\ +Usage Of Content\n\ +\n\ +THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\ +OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\ +USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\ +AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\ +NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\ +AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\ +AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\ +OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\ +TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\ +OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ +BELOW, THEN YOU MAY 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.org CVS\n\ +repository ("Repository") in CVS 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 ("Plug-ins"),\n\ + plug-in fragments ("Fragments"), and features ("Features").\n\ + - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\ + in a directory named "plugins".\n\ + - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\ + Each Feature may be packaged as a sub-directory in a directory named "features".\n\ + Within a Feature, files named "feature.xml" may contain a list of the names and version\n\ + numbers of the Plug-ins and/or Fragments associated with that Feature.\n\ + - Features may also include other Features ("Included Features"). Within a Feature, files\n\ + named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\ +\n\ +Features may also include other Features ("Included Features"). Files named\n\ +"feature.xml" may contain a list of the names and version numbers of\n\ +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 using the\n\ +Eclipse Update Manager, you must agree to a license ("Feature Update\n\ +License") during the installation process. If the Feature contains\n\ +Included Features, the Feature Update License should either provide you\n\ +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". Such Abouts,\n\ +Feature Licenses and Feature Update Licenses contain the terms and\n\ +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 http://www.eclipse.org/legal/cpl-v10.html)\n\ + - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ + - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ + - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\ + - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ + - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\ +\n\ +IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\ +TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\ +is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\ +govern that particular Content.\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 Sun Microsystems, Inc. in the United States, other countries, or both.\n +########### end of license property ########################################## diff --git a/features/org.eclipse.osee.orcs.feature.source/feature.xml b/features/org.eclipse.osee.orcs.feature.source/feature.xml new file mode 100644 index 00000000000..0eb494ed66d --- /dev/null +++ b/features/org.eclipse.osee.orcs.feature.source/feature.xml @@ -0,0 +1,104 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.eclipse.osee.orcs.feature.source" + label="%featureName" + version="0.9.9.qualifier" + provider-name="%providerName"> + + <description> + %description + </description> + + <copyright> + %copyright + </copyright> + + <license url="%licenseURL"> + %license + </license> + + <plugin + id="org.eclipse.osee.orcs.source" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.osee.orcs.core.source" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.osee.orcs.db.source" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.osee.framework.core.source" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.osee.framework.core.model.source" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.osee.framework.resource.management.source" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.osee.framework.database.source" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.osee.database.source" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.osee.orcs.rest.source" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.osee.framework.core.dsl.source" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.osee.framework.core.dsl.integration.source" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.osee.framework.h2.source" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> diff --git a/features/org.eclipse.osee.orcs.feature.source/license.html b/features/org.eclipse.osee.orcs.feature.source/license.html new file mode 100644 index 00000000000..c6af966b61e --- /dev/null +++ b/features/org.eclipse.osee.orcs.feature.source/license.html @@ -0,0 +1,79 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> +<html> +<head> +<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1"> +<title>Eclipse.org Software User Agreement</title> +</head> + +<body lang="EN-US" link=blue vlink=purple> +<h2>Eclipse Foundation Software User Agreement</h2> +<p>March 17, 2005</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.org CVS repository ("Repository") in CVS + 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 Eclipse Update Manager, 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>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</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>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> + +<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small> +</body> +</html> diff --git a/features/org.eclipse.osee.orcs.feature.source/pom.xml b/features/org.eclipse.osee.orcs.feature.source/pom.xml new file mode 100644 index 00000000000..93a36c18ace --- /dev/null +++ b/features/org.eclipse.osee.orcs.feature.source/pom.xml @@ -0,0 +1,13 @@ +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.osee</groupId> + <artifactId>org.eclipse.osee.orcs.parent</artifactId> + <version>0.9.9-SNAPSHOT</version> + <relativePath>../../plugins/org.eclipse.osee.orcs.parent</relativePath> + </parent> + <artifactId>org.eclipse.osee.orcs.feature.source</artifactId> + <packaging>eclipse-feature</packaging> + <name>OSEE ORCS Feature Source - (Incubation)</name> +</project>
\ No newline at end of file diff --git a/features/org.eclipse.osee.orcs.feature/.project b/features/org.eclipse.osee.orcs.feature/.project new file mode 100644 index 00000000000..64493ff0a05 --- /dev/null +++ b/features/org.eclipse.osee.orcs.feature/.project @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.osee.orcs.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/features/org.eclipse.osee.orcs.feature/build.properties b/features/org.eclipse.osee.orcs.feature/build.properties new file mode 100644 index 00000000000..34dfbf491c0 --- /dev/null +++ b/features/org.eclipse.osee.orcs.feature/build.properties @@ -0,0 +1,4 @@ +bin.includes = feature.xml,\ + build.properties,\ + feature.properties,\ + license.html diff --git a/features/org.eclipse.osee.orcs.feature/feature.properties b/features/org.eclipse.osee.orcs.feature/feature.properties new file mode 100644 index 00000000000..64f56280641 --- /dev/null +++ b/features/org.eclipse.osee.orcs.feature/feature.properties @@ -0,0 +1,141 @@ +############################################################################### +# Copyright (c) 2004, 2007 Boeing and others. +# All rights reserved. This program and the accompanying materials +# are 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 +# +# Contributors: +# Boeing - initial API and implementation +############################################################################### +# 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 OSEE ORCS Feature (Incubation) + +# "providerName" property - name of the company that provides the feature +providerName=Eclipse.org + +# "description" property - description of the feature +description=Open System Engineering Environment ORCS + +# "copyright" property - text of the "Feature Update Copyright" +copyright=\ +Copyright (c) 2004, 2009 Boeing and others.\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\ +which accompanies this distribution, and is available at\n\ +http://www.eclipse.org/legal/epl-v10.html\n\ +\n\ +Contributors:\n\ + Boeing - initial API and 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 + +# "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\ +March 17, 2005\n\ +\n\ +Usage Of Content\n\ +\n\ +THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\ +OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\ +USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\ +AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\ +NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\ +AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\ +AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\ +OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\ +TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\ +OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ +BELOW, THEN YOU MAY 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.org CVS\n\ +repository ("Repository") in CVS 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 ("Plug-ins"),\n\ + plug-in fragments ("Fragments"), and features ("Features").\n\ + - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\ + in a directory named "plugins".\n\ + - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\ + Each Feature may be packaged as a sub-directory in a directory named "features".\n\ + Within a Feature, files named "feature.xml" may contain a list of the names and version\n\ + numbers of the Plug-ins and/or Fragments associated with that Feature.\n\ + - Features may also include other Features ("Included Features"). Within a Feature, files\n\ + named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\ +\n\ +Features may also include other Features ("Included Features"). Files named\n\ +"feature.xml" may contain a list of the names and version numbers of\n\ +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 using the\n\ +Eclipse Update Manager, you must agree to a license ("Feature Update\n\ +License") during the installation process. If the Feature contains\n\ +Included Features, the Feature Update License should either provide you\n\ +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". Such Abouts,\n\ +Feature Licenses and Feature Update Licenses contain the terms and\n\ +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 http://www.eclipse.org/legal/cpl-v10.html)\n\ + - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ + - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ + - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\ + - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ + - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\ +\n\ +IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\ +TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\ +is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\ +govern that particular Content.\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 Sun Microsystems, Inc. in the United States, other countries, or both.\n +########### end of license property ########################################## diff --git a/features/org.eclipse.osee.orcs.feature/feature.xml b/features/org.eclipse.osee.orcs.feature/feature.xml new file mode 100644 index 00000000000..68bd47e1032 --- /dev/null +++ b/features/org.eclipse.osee.orcs.feature/feature.xml @@ -0,0 +1,104 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.eclipse.osee.orcs.feature" + label="%featureName" + version="0.9.9.qualifier" + provider-name="%providerName"> + + <description> + %description + </description> + + <copyright> + %copyright + </copyright> + + <license url="%licenseURL"> + %license + </license> + + <plugin + id="org.eclipse.osee.orcs" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.osee.orcs.core" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.osee.orcs.db" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.osee.framework.core" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.osee.framework.core.model" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.osee.framework.resource.management" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.osee.framework.database" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.osee.database" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.osee.orcs.rest" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.osee.framework.core.dsl" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.osee.framework.core.dsl.integration" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.osee.framework.h2" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> diff --git a/features/org.eclipse.osee.orcs.feature/license.html b/features/org.eclipse.osee.orcs.feature/license.html new file mode 100644 index 00000000000..c6af966b61e --- /dev/null +++ b/features/org.eclipse.osee.orcs.feature/license.html @@ -0,0 +1,79 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> +<html> +<head> +<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1"> +<title>Eclipse.org Software User Agreement</title> +</head> + +<body lang="EN-US" link=blue vlink=purple> +<h2>Eclipse Foundation Software User Agreement</h2> +<p>March 17, 2005</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.org CVS repository ("Repository") in CVS + 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 Eclipse Update Manager, 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>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</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>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> + +<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small> +</body> +</html> diff --git a/features/org.eclipse.osee.orcs.feature/pom.xml b/features/org.eclipse.osee.orcs.feature/pom.xml new file mode 100644 index 00000000000..b6194429951 --- /dev/null +++ b/features/org.eclipse.osee.orcs.feature/pom.xml @@ -0,0 +1,13 @@ +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.osee</groupId> + <artifactId>org.eclipse.osee.orcs.parent</artifactId> + <version>0.9.9-SNAPSHOT</version> + <relativePath>../../plugins/org.eclipse.osee.orcs.parent</relativePath> + </parent> + <artifactId>org.eclipse.osee.orcs.feature</artifactId> + <packaging>eclipse-feature</packaging> + <name>OSEE ORCS Feature - (Incubation)</name> +</project>
\ No newline at end of file diff --git a/features/org.eclipse.osee.x.server.feature.source/feature.xml b/features/org.eclipse.osee.x.server.feature.source/feature.xml index a26734f0189..8d01e0a1903 100644 --- a/features/org.eclipse.osee.x.server.feature.source/feature.xml +++ b/features/org.eclipse.osee.x.server.feature.source/feature.xml @@ -21,6 +21,10 @@ id="org.eclipse.osee.x.core.feature.source" version="0.0.0"/> + <includes + id="org.eclipse.osee.orcs.feature.source" + version="0.0.0"/> + <plugin id="org.eclipse.osee.display.presenter.source" download-size="0" @@ -36,55 +40,6 @@ unpack="false"/> <plugin - id="org.eclipse.osee.orcs.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.osee.orcs.core.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.osee.orcs.db.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.osee.framework.core.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.osee.framework.core.model.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.osee.framework.resource.management.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.osee.framework.database.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.eclipse.osee.display.api.source" download-size="0" install-size="0" @@ -92,20 +47,6 @@ unpack="false"/> <plugin - id="org.eclipse.osee.database.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.osee.orcs.rest.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.eclipse.osee.ats.presenter.source" download-size="0" install-size="0" @@ -126,25 +67,4 @@ version="0.0.0" unpack="false"/> - <plugin - id="org.eclipse.osee.framework.core.dsl.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.osee.framework.core.dsl.integration.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.osee.framework.h2.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - </feature> diff --git a/features/org.eclipse.osee.x.server.feature/feature.xml b/features/org.eclipse.osee.x.server.feature/feature.xml index 92bbfe16d79..91eec01c864 100644 --- a/features/org.eclipse.osee.x.server.feature/feature.xml +++ b/features/org.eclipse.osee.x.server.feature/feature.xml @@ -25,6 +25,10 @@ id="org.eclipse.osee.x.server.external.feature" version="0.0.0"/> + <includes + id="org.eclipse.osee.orcs.feature" + version="0.0.0"/> + <requires> <import plugin="com.vaadin" version="6.6.6" match="greaterOrEqual"/> <import plugin="javax.servlet"/> @@ -48,55 +52,6 @@ unpack="false"/> <plugin - id="org.eclipse.osee.orcs" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.osee.orcs.core" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.osee.orcs.db" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.osee.framework.core" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.osee.framework.core.model" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.osee.framework.resource.management" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.osee.framework.database" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.eclipse.osee.display.api" download-size="0" install-size="0" @@ -104,20 +59,6 @@ unpack="false"/> <plugin - id="org.eclipse.osee.database" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.osee.orcs.rest" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.eclipse.osee.ats.presenter" download-size="0" install-size="0" @@ -138,25 +79,4 @@ version="0.0.0" unpack="false"/> - <plugin - id="org.eclipse.osee.framework.core.dsl" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.osee.framework.core.dsl.integration" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.osee.framework.h2" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - </feature> diff --git a/plugins/org.eclipse.osee.ats.mocks/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.mocks/META-INF/MANIFEST.MF index ee4217df192..0ea71e832d8 100644 --- a/plugins/org.eclipse.osee.ats.mocks/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.mocks/META-INF/MANIFEST.MF @@ -16,7 +16,6 @@ Import-Package: org.eclipse.osee.ats.api.components, org.eclipse.osee.framework.jdk.core.type, org.eclipse.osee.orcs, org.eclipse.osee.orcs.data, - org.eclipse.osee.orcs.mock, org.eclipse.osee.orcs.search Export-Package: org.eclipse.osee.ats.mocks Require-Bundle: org.eclipse.osee.ats.api diff --git a/plugins/org.eclipse.osee.ats.mocks/src/org/eclipse/osee/ats/mocks/MockAtsArtifactProvider.java b/plugins/org.eclipse.osee.ats.mocks/src/org/eclipse/osee/ats/mocks/MockAtsArtifactProvider.java index d46d244dc93..31160b205de 100644 --- a/plugins/org.eclipse.osee.ats.mocks/src/org/eclipse/osee/ats/mocks/MockAtsArtifactProvider.java +++ b/plugins/org.eclipse.osee.ats.mocks/src/org/eclipse/osee/ats/mocks/MockAtsArtifactProvider.java @@ -14,10 +14,10 @@ import java.util.Collection; import java.util.LinkedList; import java.util.List; import org.eclipse.osee.ats.api.search.AtsArtifactProvider; +import org.eclipse.osee.display.presenter.mocks.MockArtifact; import org.eclipse.osee.display.presenter.mocks.MockArtifactProvider; import org.eclipse.osee.framework.jdk.core.type.HashCollection; import org.eclipse.osee.orcs.data.ReadableArtifact; -import org.eclipse.osee.orcs.mock.MockArtifact; /** * @author John Misinco diff --git a/plugins/org.eclipse.osee.ats.presenter.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.presenter.test/META-INF/MANIFEST.MF index 9ca52ddbc62..087c8afec0c 100644 --- a/plugins/org.eclipse.osee.ats.presenter.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.presenter.test/META-INF/MANIFEST.MF @@ -7,9 +7,8 @@ Fragment-Host: org.eclipse.osee.ats.presenter Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.junit, org.eclipse.osee.display.presenter -Import-Package: org.eclipse.osee.ats.mocks, - org.eclipse.osee.display.presenter.mocks, +Import-Package: org.eclipse.osee.display.presenter.mocks, org.eclipse.osee.framework.core.data, org.eclipse.osee.framework.jdk.core.type, org.eclipse.osee.framework.jdk.core.util, - org.eclipse.osee.orcs.mock + org.eclipse.osee.ats.mocks diff --git a/plugins/org.eclipse.osee.ats.presenter.test/src/org/eclipse/osee/ats/presenter/internal/AtsSearchPresenterTest.java b/plugins/org.eclipse.osee.ats.presenter.test/src/org/eclipse/osee/ats/presenter/internal/AtsSearchPresenterTest.java index 4b0a5cc92f5..44dc293ba56 100644 --- a/plugins/org.eclipse.osee.ats.presenter.test/src/org/eclipse/osee/ats/presenter/internal/AtsSearchPresenterTest.java +++ b/plugins/org.eclipse.osee.ats.presenter.test/src/org/eclipse/osee/ats/presenter/internal/AtsSearchPresenterTest.java @@ -19,8 +19,11 @@ import org.eclipse.osee.ats.api.data.AtsSearchParameters; import org.eclipse.osee.ats.mocks.MockAtsArtifactProvider; import org.eclipse.osee.ats.mocks.MockAtsSearchHeaderComponent; import org.eclipse.osee.display.api.data.ViewId; +import org.eclipse.osee.display.presenter.mocks.MockArtifact; +import org.eclipse.osee.display.presenter.mocks.MockAttribute; import org.eclipse.osee.display.presenter.mocks.MockDisplayOptionsComponent; import org.eclipse.osee.display.presenter.mocks.MockLogger; +import org.eclipse.osee.display.presenter.mocks.MockMatch; import org.eclipse.osee.display.presenter.mocks.MockSearchNavigator; import org.eclipse.osee.display.presenter.mocks.MockSearchResultsListComponent; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; @@ -28,9 +31,6 @@ import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.framework.jdk.core.util.UrlQuery; import org.eclipse.osee.orcs.data.ReadableArtifact; import org.eclipse.osee.orcs.data.ReadableAttribute; -import org.eclipse.osee.orcs.mock.MockArtifact; -import org.eclipse.osee.orcs.mock.MockAttribute; -import org.eclipse.osee.orcs.mock.MockMatch; import org.eclipse.osee.orcs.search.Match; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.database/pom.xml b/plugins/org.eclipse.osee.database/pom.xml index 4e0b671216a..011f671d5d6 100644 --- a/plugins/org.eclipse.osee.database/pom.xml +++ b/plugins/org.eclipse.osee.database/pom.xml @@ -5,9 +5,9 @@ <parent> <groupId>org.eclipse.osee</groupId> - <artifactId>org.eclipse.osee.x.server.parent</artifactId> + <artifactId>org.eclipse.osee.orcs.parent</artifactId> <version>0.9.9-SNAPSHOT</version> - <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath> + <relativePath>../../plugins/org.eclipse.osee.orcs.parent</relativePath> </parent> <artifactId>org.eclipse.osee.database</artifactId> diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.display.presenter.mocks/META-INF/MANIFEST.MF index 87aa9473625..01aeb311a80 100644 --- a/plugins/org.eclipse.osee.display.presenter.mocks/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.display.presenter.mocks/META-INF/MANIFEST.MF @@ -16,6 +16,5 @@ Import-Package: org.eclipse.core.runtime;version="3.4.0", org.eclipse.osee.framework.jdk.core.type, org.eclipse.osee.logger, org.eclipse.osee.orcs.data, - org.eclipse.osee.orcs.mock, org.eclipse.osee.orcs.search Export-Package: org.eclipse.osee.display.presenter.mocks diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/build.properties b/plugins/org.eclipse.osee.display.presenter.mocks/build.properties index bca3d8d1106..04e3bc79f20 100644 --- a/plugins/org.eclipse.osee.display.presenter.mocks/build.properties +++ b/plugins/org.eclipse.osee.display.presenter.mocks/build.properties @@ -5,4 +5,5 @@ bin.includes = META-INF/,\ additional.bundles = org.eclipse.osee.display.presenter,\ org.eclipse.osee.orcs,\ org.eclipse.osee.framework.core,\ - org.eclipse.osee.display.api + org.eclipse.osee.display.api,\ + org.eclipse.osee.framework.jdk.core diff --git a/plugins/org.eclipse.osee.orcs.mock/src/org/eclipse/osee/orcs/mock/MockArtifact.java b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifact.java index 318626fb7be..87de338047b 100644 --- a/plugins/org.eclipse.osee.orcs.mock/src/org/eclipse/osee/orcs/mock/MockArtifact.java +++ b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifact.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.orcs.mock; +package org.eclipse.osee.display.presenter.mocks; import java.util.ArrayList; import java.util.Collection; @@ -28,7 +28,6 @@ import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.enums.CoreBranches; import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity; -import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.type.RelationType; import org.eclipse.osee.framework.jdk.core.type.HashCollection; import org.eclipse.osee.orcs.data.ReadableArtifact; @@ -49,7 +48,6 @@ public class MockArtifact implements ReadableArtifact { private final IArtifactType type; private final IOseeBranch branch; private ReadableArtifact parent; - private boolean hasParent = false; public MockArtifact(String guid, String name) { this(guid, name, CoreArtifactTypes.Artifact, CoreBranches.COMMON); @@ -65,9 +63,6 @@ public class MockArtifact implements ReadableArtifact { public void setParent(ReadableArtifact parent) { this.parent = parent; - if (this.parent != null) { - hasParent = true; - } } public void addAttribute(IAttributeType type, String value) { @@ -197,7 +192,7 @@ public class MockArtifact implements ReadableArtifact { } @Override - public String getSoleAttributeAsString(IAttributeType attributeType, String defaultValue) throws OseeCoreException { + public String getSoleAttributeAsString(IAttributeType attributeType, String defaultValue) { return null; } diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifactProvider.java b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifactProvider.java index 77220893f00..a0f376333be 100644 --- a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifactProvider.java +++ b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifactProvider.java @@ -23,7 +23,6 @@ import org.eclipse.osee.framework.core.data.IRelationTypeSide; import org.eclipse.osee.framework.core.model.type.RelationType; import org.eclipse.osee.orcs.data.ReadableArtifact; import org.eclipse.osee.orcs.data.ReadableAttribute; -import org.eclipse.osee.orcs.mock.MockArtifact; import org.eclipse.osee.orcs.search.Match; /** diff --git a/plugins/org.eclipse.osee.orcs.mock/src/org/eclipse/osee/orcs/mock/MockAttribute.java b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockAttribute.java index dd38a9295bf..9b273c4fef2 100644 --- a/plugins/org.eclipse.osee.orcs.mock/src/org/eclipse/osee/orcs/mock/MockAttribute.java +++ b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockAttribute.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.orcs.mock; +package org.eclipse.osee.display.presenter.mocks; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.enums.ModificationType; diff --git a/plugins/org.eclipse.osee.orcs.mock/src/org/eclipse/osee/orcs/mock/MockMatch.java b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockMatch.java index 44bf0d6fd7a..b956f20640e 100644 --- a/plugins/org.eclipse.osee.orcs.mock/src/org/eclipse/osee/orcs/mock/MockMatch.java +++ b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockMatch.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.orcs.mock; +package org.eclipse.osee.display.presenter.mocks; import java.util.LinkedList; import java.util.List; diff --git a/plugins/org.eclipse.osee.display.presenter.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.display.presenter.test/META-INF/MANIFEST.MF index 1abe7d46e69..8a723c6cb72 100644 --- a/plugins/org.eclipse.osee.display.presenter.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.display.presenter.test/META-INF/MANIFEST.MF @@ -6,11 +6,12 @@ Bundle-Version: 0.9.9.qualifier Fragment-Host: org.eclipse.osee.display.presenter;bundle-version="0.9.9.qualifier" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: Eclipse Open System Engineering Environment -Import-Package: org.eclipse.osee.display.api.data, +Import-Package: org.eclipse.osee.display.api.components, + org.eclipse.osee.display.api.data, org.eclipse.osee.display.api.search, org.eclipse.osee.display.presenter.mocks, org.eclipse.osee.framework.jdk.core.type, org.eclipse.osee.framework.jdk.core.util, - org.eclipse.osee.orcs.mock -Require-Bundle: org.junit, - org.eclipse.osee.display.api + org.junit;version="4.8.2", + org.junit.runner;version="4.8.2", + org.junit.runners;version="4.8.2" diff --git a/plugins/org.eclipse.osee.display.presenter.test/build.properties b/plugins/org.eclipse.osee.display.presenter.test/build.properties index b54796609aa..31a65bbbbac 100644 --- a/plugins/org.eclipse.osee.display.presenter.test/build.properties +++ b/plugins/org.eclipse.osee.display.presenter.test/build.properties @@ -3,4 +3,5 @@ output.. = bin/ bin.includes = META-INF/,\ . additional.bundles = org.eclipse.osee.framework.jdk.core,\ - org.eclipse.osee.display.api + org.eclipse.osee.display.api,\ + org.junit diff --git a/plugins/org.eclipse.osee.display.presenter.test/src/org/eclipse/osee/display/presenter/internal/SearchPresenterTest.java b/plugins/org.eclipse.osee.display.presenter.test/src/org/eclipse/osee/display/presenter/internal/SearchPresenterTest.java index a31e67640c4..d07638e5a2c 100644 --- a/plugins/org.eclipse.osee.display.presenter.test/src/org/eclipse/osee/display/presenter/internal/SearchPresenterTest.java +++ b/plugins/org.eclipse.osee.display.presenter.test/src/org/eclipse/osee/display/presenter/internal/SearchPresenterTest.java @@ -13,7 +13,6 @@ package org.eclipse.osee.display.presenter.internal; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import junit.framework.Assert; import org.eclipse.osee.display.api.components.SearchHeaderComponent; import org.eclipse.osee.display.api.data.ViewArtifact; import org.eclipse.osee.display.api.data.ViewId; @@ -21,11 +20,14 @@ import org.eclipse.osee.display.api.data.ViewSearchParameters; import org.eclipse.osee.display.api.search.ArtifactProvider; import org.eclipse.osee.display.api.search.AsyncSearchListener; import org.eclipse.osee.display.presenter.SearchPresenterImpl; +import org.eclipse.osee.display.presenter.mocks.MockArtifact; import org.eclipse.osee.display.presenter.mocks.MockArtifactHeaderComponent; import org.eclipse.osee.display.presenter.mocks.MockArtifactProvider; +import org.eclipse.osee.display.presenter.mocks.MockAttribute; import org.eclipse.osee.display.presenter.mocks.MockAttributeComponent; import org.eclipse.osee.display.presenter.mocks.MockDisplayOptionsComponent; import org.eclipse.osee.display.presenter.mocks.MockLogger; +import org.eclipse.osee.display.presenter.mocks.MockMatch; import org.eclipse.osee.display.presenter.mocks.MockRelationComponent; import org.eclipse.osee.display.presenter.mocks.MockSearchHeaderComponent; import org.eclipse.osee.display.presenter.mocks.MockSearchNavigator; @@ -45,10 +47,8 @@ import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.framework.jdk.core.util.UrlQuery; import org.eclipse.osee.orcs.data.ReadableArtifact; import org.eclipse.osee.orcs.data.ReadableAttribute; -import org.eclipse.osee.orcs.mock.MockArtifact; -import org.eclipse.osee.orcs.mock.MockAttribute; -import org.eclipse.osee.orcs.mock.MockMatch; import org.eclipse.osee.orcs.search.Match; +import org.junit.Assert; import org.junit.Test; /** diff --git a/plugins/org.eclipse.osee.framework.core.test/pom.xml b/plugins/org.eclipse.osee.framework.core.test/pom.xml index b1fed373dcb..8024c1e3901 100644 --- a/plugins/org.eclipse.osee.framework.core.test/pom.xml +++ b/plugins/org.eclipse.osee.framework.core.test/pom.xml @@ -5,9 +5,9 @@ <parent> <groupId>org.eclipse.osee</groupId> - <artifactId>org.eclipse.osee.x.server.parent</artifactId> + <artifactId>org.eclipse.osee.orcs.parent</artifactId> <version>0.9.9-SNAPSHOT</version> - <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath> + <relativePath>../../plugins/org.eclipse.osee.orcs.parent</relativePath> </parent> <artifactId>org.eclipse.osee.framework.core.test</artifactId> diff --git a/plugins/org.eclipse.osee.framework.core/pom.xml b/plugins/org.eclipse.osee.framework.core/pom.xml index 596ef72a122..8da1fdda070 100644 --- a/plugins/org.eclipse.osee.framework.core/pom.xml +++ b/plugins/org.eclipse.osee.framework.core/pom.xml @@ -5,9 +5,9 @@ <parent> <groupId>org.eclipse.osee</groupId> - <artifactId>org.eclipse.osee.x.server.parent</artifactId> + <artifactId>org.eclipse.osee.orcs.parent</artifactId> <version>0.9.9-SNAPSHOT</version> - <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath> + <relativePath>../../plugins/org.eclipse.osee.orcs.parent</relativePath> </parent> <artifactId>org.eclipse.osee.framework.core</artifactId> diff --git a/plugins/org.eclipse.osee.framework.database.test/pom.xml b/plugins/org.eclipse.osee.framework.database.test/pom.xml index 5cb9ef9dad1..5bfc625387c 100644 --- a/plugins/org.eclipse.osee.framework.database.test/pom.xml +++ b/plugins/org.eclipse.osee.framework.database.test/pom.xml @@ -5,9 +5,9 @@ <parent> <groupId>org.eclipse.osee</groupId> - <artifactId>org.eclipse.osee.x.server.parent</artifactId> + <artifactId>org.eclipse.osee.orcs.parent</artifactId> <version>0.9.9-SNAPSHOT</version> - <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath> + <relativePath>../../plugins/org.eclipse.osee.orcs.parent</relativePath> </parent> <artifactId>org.eclipse.osee.framework.database.test</artifactId> diff --git a/plugins/org.eclipse.osee.framework.database/pom.xml b/plugins/org.eclipse.osee.framework.database/pom.xml index 1da537dd7a2..3ae1f053bf4 100644 --- a/plugins/org.eclipse.osee.framework.database/pom.xml +++ b/plugins/org.eclipse.osee.framework.database/pom.xml @@ -5,9 +5,9 @@ <parent> <groupId>org.eclipse.osee</groupId> - <artifactId>org.eclipse.osee.x.server.parent</artifactId> + <artifactId>org.eclipse.osee.orcs.parent</artifactId> <version>0.9.9-SNAPSHOT</version> - <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath> + <relativePath>../../plugins/org.eclipse.osee.orcs.parent</relativePath> </parent> <artifactId>org.eclipse.osee.framework.database</artifactId> diff --git a/plugins/org.eclipse.osee.framework.h2/pom.xml b/plugins/org.eclipse.osee.framework.h2/pom.xml index 621d18ce784..ea5ca4008b0 100644 --- a/plugins/org.eclipse.osee.framework.h2/pom.xml +++ b/plugins/org.eclipse.osee.framework.h2/pom.xml @@ -5,9 +5,9 @@ <parent> <groupId>org.eclipse.osee</groupId> - <artifactId>org.eclipse.osee.x.server.parent</artifactId> + <artifactId>org.eclipse.osee.orcs.parent</artifactId> <version>0.9.9-SNAPSHOT</version> - <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath> + <relativePath>../../plugins/org.eclipse.osee.orcs.parent</relativePath> </parent> <artifactId>org.eclipse.osee.framework.h2</artifactId> diff --git a/plugins/org.eclipse.osee.framework.resource.management.test/pom.xml b/plugins/org.eclipse.osee.framework.resource.management.test/pom.xml index 352fd52e216..a1a7197b395 100644 --- a/plugins/org.eclipse.osee.framework.resource.management.test/pom.xml +++ b/plugins/org.eclipse.osee.framework.resource.management.test/pom.xml @@ -5,9 +5,9 @@ <parent> <groupId>org.eclipse.osee</groupId> - <artifactId>org.eclipse.osee.x.server.parent</artifactId> + <artifactId>org.eclipse.osee.orcs.parent</artifactId> <version>0.9.9-SNAPSHOT</version> - <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath> + <relativePath>../../plugins/org.eclipse.osee.orcs.parent</relativePath> </parent> <artifactId>org.eclipse.osee.framework.resource.management.test</artifactId> diff --git a/plugins/org.eclipse.osee.framework.resource.management/pom.xml b/plugins/org.eclipse.osee.framework.resource.management/pom.xml index 9fc7a452be0..4c9bfe0cf68 100644 --- a/plugins/org.eclipse.osee.framework.resource.management/pom.xml +++ b/plugins/org.eclipse.osee.framework.resource.management/pom.xml @@ -5,9 +5,9 @@ <parent> <groupId>org.eclipse.osee</groupId> - <artifactId>org.eclipse.osee.x.server.parent</artifactId> + <artifactId>org.eclipse.osee.orcs.parent</artifactId> <version>0.9.9-SNAPSHOT</version> - <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath> + <relativePath>../../plugins/org.eclipse.osee.orcs.parent</relativePath> </parent> <artifactId>org.eclipse.osee.framework.resource.management</artifactId> diff --git a/plugins/org.eclipse.osee.orcs.core.integration.test/OrcsIntegrationTestSuite.launch b/plugins/org.eclipse.osee.orcs.core.integration.test/OrcsIntegrationTestSuite.launch index b38c09fb378..e395eb873b8 100644 --- a/plugins/org.eclipse.osee.orcs.core.integration.test/OrcsIntegrationTestSuite.launch +++ b/plugins/org.eclipse.osee.orcs.core.integration.test/OrcsIntegrationTestSuite.launch @@ -34,9 +34,9 @@ <stringAttribute key="product" value="lba.ote.outfile.conversion.app.convert"/> <booleanAttribute key="run_in_ui_thread" value="true"/> <stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.collect@default:default,com.google.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.antlr.runtime@default:default,org.aopalliance@default:default,org.apache.commons.codec@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.log4j@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.core.net@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.emf.common@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.emf.compare@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.servletbridge.extensionbundle@default:false,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.util@default:default,org.eclipse.equinox.weaving.hook@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.util@default:default,org.eclipse.xtext@default:default,org.h2@default:default,org.hamcrest.core@default:default,org.junit*4.8.2.v4_8_2_v20110321-1705@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="org.eclipse.osee.event.osgi@default:default,org.eclipse.osee.event@default:default,org.eclipse.osee.executor.admin@default:default,org.eclipse.osee.framework.core.dsl.integration.test@default:false,org.eclipse.osee.framework.core.dsl.integration@default:default,org.eclipse.osee.framework.core.dsl@default:default,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.database.test@default:false,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.framework.h2@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.logging.test@default:false,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.resource.management.test@default:false,org.eclipse.osee.framework.resource.management@default:default,org.eclipse.osee.logback.config@default:false,org.eclipse.osee.logger.slf4j@default:default,org.eclipse.osee.logger@default:true,org.eclipse.osee.orcs.core.integration.test@default:false,org.eclipse.osee.orcs.core.test@default:false,org.eclipse.osee.orcs.core@default:default,org.eclipse.osee.orcs.db.mock@default:default,org.eclipse.osee.orcs.db.test@default:false,org.eclipse.osee.orcs.db@default:default,org.eclipse.osee.orcs.mock@default:default,org.eclipse.osee.orcs@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.eclipse.osee.event.osgi@default:default,org.eclipse.osee.event@default:default,org.eclipse.osee.executor.admin@default:default,org.eclipse.osee.framework.core.dsl.integration.test@default:false,org.eclipse.osee.framework.core.dsl.integration@default:default,org.eclipse.osee.framework.core.dsl@default:default,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.database.test@default:false,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.framework.h2@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.logging.test@default:false,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.resource.management.test@default:false,org.eclipse.osee.framework.resource.management@default:default,org.eclipse.osee.logback.config@default:false,org.eclipse.osee.logger.slf4j@default:default,org.eclipse.osee.logger@default:true,org.eclipse.osee.orcs.core.integration.test@default:false,org.eclipse.osee.orcs.core.test*0.9.9.qualifier@default:false,org.eclipse.osee.orcs.core@default:default,org.eclipse.osee.orcs.db.mock@default:default,org.eclipse.osee.orcs.db.test@default:false,org.eclipse.osee.orcs.db@default:default,org.eclipse.osee.orcs.mock@default:default,org.eclipse.osee.orcs@default:default"/> <booleanAttribute key="show_selected_only" value="false"/> -<stringAttribute key="timestamp" value="1319517127352"/> +<stringAttribute key="timestamp" value="1321656353603"/> <booleanAttribute key="tracing" value="false"/> <booleanAttribute key="useCustomFeatures" value="false"/> <booleanAttribute key="useDefaultConfig" value="true"/> diff --git a/plugins/org.eclipse.osee.orcs.core.integration.test/pom.xml b/plugins/org.eclipse.osee.orcs.core.integration.test/pom.xml index 55e2e2d0439..c243690280c 100644 --- a/plugins/org.eclipse.osee.orcs.core.integration.test/pom.xml +++ b/plugins/org.eclipse.osee.orcs.core.integration.test/pom.xml @@ -5,9 +5,9 @@ <parent> <groupId>org.eclipse.osee</groupId> - <artifactId>org.eclipse.osee.x.server.parent</artifactId> + <artifactId>org.eclipse.osee.orcs.parent</artifactId> <version>0.9.9-SNAPSHOT</version> - <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath> + <relativePath>../../plugins/org.eclipse.osee.orcs.parent</relativePath> </parent> <artifactId>org.eclipse.osee.orcs.core.integration.test</artifactId> diff --git a/plugins/org.eclipse.osee.orcs.core.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.core.test/META-INF/MANIFEST.MF index a511fd04a3e..95eeaf24074 100644 --- a/plugins/org.eclipse.osee.orcs.core.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs.core.test/META-INF/MANIFEST.MF @@ -11,7 +11,6 @@ Import-Package: junit.framework;version="4.8.2", org.eclipse.osee.framework.core.enums, org.eclipse.osee.framework.core.model.cache, org.eclipse.osee.framework.core.model.mocks, - org.eclipse.osee.orcs.mock, org.junit;version="4.8.2", org.junit.runner;version="4.8.2", org.junit.runners;version="4.8.2" diff --git a/plugins/org.eclipse.osee.orcs.core.test/pom.xml b/plugins/org.eclipse.osee.orcs.core.test/pom.xml index 82884bc6547..0b22c9aab2e 100644 --- a/plugins/org.eclipse.osee.orcs.core.test/pom.xml +++ b/plugins/org.eclipse.osee.orcs.core.test/pom.xml @@ -5,9 +5,9 @@ <parent> <groupId>org.eclipse.osee</groupId> - <artifactId>org.eclipse.osee.x.server.parent</artifactId> + <artifactId>org.eclipse.osee.orcs.parent</artifactId> <version>0.9.9-SNAPSHOT</version> - <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath> + <relativePath>../../plugins/org.eclipse.osee.orcs.parent</relativePath> </parent> <artifactId>org.eclipse.osee.orcs.core.test</artifactId> diff --git a/plugins/org.eclipse.osee.orcs.core/pom.xml b/plugins/org.eclipse.osee.orcs.core/pom.xml index 04cdee5ae8b..bde971e238e 100644 --- a/plugins/org.eclipse.osee.orcs.core/pom.xml +++ b/plugins/org.eclipse.osee.orcs.core/pom.xml @@ -5,9 +5,9 @@ <parent> <groupId>org.eclipse.osee</groupId> - <artifactId>org.eclipse.osee.x.server.parent</artifactId> + <artifactId>org.eclipse.osee.orcs.parent</artifactId> <version>0.9.9-SNAPSHOT</version> - <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath> + <relativePath>../../plugins/org.eclipse.osee.orcs.parent</relativePath> </parent> <artifactId>org.eclipse.osee.orcs.core</artifactId> diff --git a/plugins/org.eclipse.osee.orcs.db.mock/pom.xml b/plugins/org.eclipse.osee.orcs.db.mock/pom.xml index 765a58cd8c3..4a80b6d3b3a 100644 --- a/plugins/org.eclipse.osee.orcs.db.mock/pom.xml +++ b/plugins/org.eclipse.osee.orcs.db.mock/pom.xml @@ -5,9 +5,9 @@ <parent> <groupId>org.eclipse.osee</groupId> - <artifactId>org.eclipse.osee.x.server.parent</artifactId> + <artifactId>org.eclipse.osee.orcs.parent</artifactId> <version>0.9.9-SNAPSHOT</version> - <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath> + <relativePath>../../plugins/org.eclipse.osee.orcs.parent</relativePath> </parent> <artifactId>org.eclipse.osee.orcs.db.mock</artifactId> diff --git a/plugins/org.eclipse.osee.orcs.db.test/pom.xml b/plugins/org.eclipse.osee.orcs.db.test/pom.xml index ddd36f076d9..b84f4555223 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/pom.xml +++ b/plugins/org.eclipse.osee.orcs.db.test/pom.xml @@ -5,9 +5,9 @@ <parent> <groupId>org.eclipse.osee</groupId> - <artifactId>org.eclipse.osee.x.server.parent</artifactId> + <artifactId>org.eclipse.osee.orcs.parent</artifactId> <version>0.9.9-SNAPSHOT</version> - <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath> + <relativePath>../../plugins/org.eclipse.osee.orcs.parent</relativePath> </parent> <artifactId>org.eclipse.osee.orcs.db.test</artifactId> diff --git a/plugins/org.eclipse.osee.orcs.db/pom.xml b/plugins/org.eclipse.osee.orcs.db/pom.xml index f7f7c0297cb..25908c32df8 100644 --- a/plugins/org.eclipse.osee.orcs.db/pom.xml +++ b/plugins/org.eclipse.osee.orcs.db/pom.xml @@ -5,9 +5,9 @@ <parent> <groupId>org.eclipse.osee</groupId> - <artifactId>org.eclipse.osee.x.server.parent</artifactId> + <artifactId>org.eclipse.osee.orcs.parent</artifactId> <version>0.9.9-SNAPSHOT</version> - <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath> + <relativePath>../../plugins/org.eclipse.osee.orcs.parent</relativePath> </parent> <artifactId>org.eclipse.osee.orcs.db</artifactId> diff --git a/plugins/org.eclipse.osee.orcs.mock/.classpath b/plugins/org.eclipse.osee.orcs.mock/.classpath deleted file mode 100644 index ad32c83a788..00000000000 --- a/plugins/org.eclipse.osee.orcs.mock/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/plugins/org.eclipse.osee.orcs.mock/.project b/plugins/org.eclipse.osee.orcs.mock/.project deleted file mode 100644 index 12a831b36c4..00000000000 --- a/plugins/org.eclipse.osee.orcs.mock/.project +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.osee.orcs.mock</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/plugins/org.eclipse.osee.orcs.mock/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.mock/META-INF/MANIFEST.MF deleted file mode 100644 index 4dd8f7712dd..00000000000 --- a/plugins/org.eclipse.osee.orcs.mock/META-INF/MANIFEST.MF +++ /dev/null @@ -1,16 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: OSEE Object Revision Control Service Mock -Bundle-SymbolicName: org.eclipse.osee.orcs.mock -Bundle-Version: 0.9.9.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Bundle-Vendor: Eclipse Open System Engineering Environment -Import-Package: org.eclipse.osee.framework.core.data, - org.eclipse.osee.framework.core.enums, - org.eclipse.osee.framework.core.exception, - org.eclipse.osee.framework.core.model.type, - org.eclipse.osee.framework.jdk.core.type, - org.eclipse.osee.orcs.data, - org.eclipse.osee.orcs.search -Require-Bundle: org.eclipse.core.runtime -Export-Package: org.eclipse.osee.orcs.mock diff --git a/plugins/org.eclipse.osee.orcs.mock/build.properties b/plugins/org.eclipse.osee.orcs.mock/build.properties deleted file mode 100644 index 014fd9e9569..00000000000 --- a/plugins/org.eclipse.osee.orcs.mock/build.properties +++ /dev/null @@ -1,7 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - . -additional.bundles = org.eclipse.osee.orcs,\ - org.eclipse.osee.framework.core,\ - org.eclipse.osee.framework.jdk.core diff --git a/plugins/org.eclipse.osee.orcs.mock/pom.xml b/plugins/org.eclipse.osee.orcs.mock/pom.xml deleted file mode 100644 index a14539ced6f..00000000000 --- a/plugins/org.eclipse.osee.orcs.mock/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ -<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/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.osee</groupId> - <artifactId>org.eclipse.osee.x.server.parent</artifactId> - <version>0.9.9-SNAPSHOT</version> - <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath> - </parent> - - <artifactId>org.eclipse.osee.orcs.mock</artifactId> - <packaging>eclipse-plugin</packaging> - <name>OSEE ORCS Mock - (Incubation)</name> - - <build> - <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 --> - <resources> - <resource> - <directory>src</directory> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </resource> - </resources> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-source-plugin</artifactId> - </plugin> - </plugins> - </build> -</project>
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.orcs.mock/src/org/eclipse/osee/orcs/mock/SampleDataStore.java b/plugins/org.eclipse.osee.orcs.mock/src/org/eclipse/osee/orcs/mock/SampleDataStore.java deleted file mode 100644 index 7a88d3396e9..00000000000 --- a/plugins/org.eclipse.osee.orcs.mock/src/org/eclipse/osee/orcs/mock/SampleDataStore.java +++ /dev/null @@ -1,18 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Boeing. - * All rights reserved. This program and the accompanying materials - * are 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 - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.orcs.mock; - -public interface SampleDataStore { - - void stopDataStore(); - - void startDataStore() throws Exception; -} diff --git a/plugins/org.eclipse.osee.orcs.p2/.project b/plugins/org.eclipse.osee.orcs.p2/.project new file mode 100644 index 00000000000..23e62c91eef --- /dev/null +++ b/plugins/org.eclipse.osee.orcs.p2/.project @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.osee.orcs.p2</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/plugins/org.eclipse.osee.orcs.p2/category.xml b/plugins/org.eclipse.osee.orcs.p2/category.xml new file mode 100644 index 00000000000..8da8bda4cf9 --- /dev/null +++ b/plugins/org.eclipse.osee.orcs.p2/category.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<site> + <feature url="features/org.eclipse.osee.orcs.feature_0.9.9.qualifier.jar" id="org.eclipse.osee.orcs.feature" version="0.9.9.qualifier"> + <category name="org.eclipse.osee.orcs"/> + </feature> + <feature url="features/org.eclipse.osee.orcs.feature.source_0.9.9.qualifier.jar" id="org.eclipse.osee.orcs.feature.source" version="0.9.9.qualifier"> + <category name="org.eclipse.osee.orcs"/> + </feature> + <category-def name="org.eclipse.osee.orcs" label="Eclipse OSEE ORCS - (Incubation)"> + <description> + Eclipse OSEE ORCS - (Incubation) + </description> + </category-def> +</site> diff --git a/plugins/org.eclipse.osee.orcs.p2/pom.xml b/plugins/org.eclipse.osee.orcs.p2/pom.xml new file mode 100644 index 00000000000..781ed700c0f --- /dev/null +++ b/plugins/org.eclipse.osee.orcs.p2/pom.xml @@ -0,0 +1,18 @@ +<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/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.eclipse.osee</groupId> + <artifactId>org.eclipse.osee.orcs.parent</artifactId> + <version>0.9.9-SNAPSHOT</version> + <relativePath>../../plugins/org.eclipse.osee.orcs.parent</relativePath> + </parent> + + <artifactId>org.eclipse.osee.orcs.p2</artifactId> + <packaging>eclipse-repository</packaging> + <name>OSEE ORCS - p2 Site (Incubation)</name> + <version>0.9.9-SNAPSHOT</version> + +</project> diff --git a/plugins/org.eclipse.osee.orcs.parent/.project b/plugins/org.eclipse.osee.orcs.parent/.project new file mode 100644 index 00000000000..acecbba503f --- /dev/null +++ b/plugins/org.eclipse.osee.orcs.parent/.project @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.osee.orcs.parent</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + </buildSpec> + <natures> + </natures> +</projectDescription> diff --git a/plugins/org.eclipse.osee.orcs.parent/pom.xml b/plugins/org.eclipse.osee.orcs.parent/pom.xml new file mode 100644 index 00000000000..cbd09b4f2a0 --- /dev/null +++ b/plugins/org.eclipse.osee.orcs.parent/pom.xml @@ -0,0 +1,476 @@ +<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/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <groupId>org.eclipse.osee</groupId> + <artifactId>org.eclipse.osee.orcs.parent</artifactId> + <packaging>pom</packaging> + <name>OSEE ORCS - Parent (Incubation)</name> + <version>0.9.9-SNAPSHOT</version> + + <modules> + <module>../../plugins/org.eclipse.osee.framework.core</module> + <module>../../plugins/org.eclipse.osee.framework.core.test</module> + <module>../../plugins/org.eclipse.osee.framework.core.dsl</module> + <module>../../plugins/org.eclipse.osee.framework.core.dsl.integration</module> + <module>../../plugins/org.eclipse.osee.framework.core.dsl.integration.test</module> + <module>../../plugins/org.eclipse.osee.framework.core.model</module> + <module>../../plugins/org.eclipse.osee.framework.core.model.test</module> + <module>../../plugins/org.eclipse.osee.framework.resource.management</module> + <module>../../plugins/org.eclipse.osee.framework.resource.management.test</module> + <module>../../plugins/org.eclipse.osee.framework.database</module> + <module>../../plugins/org.eclipse.osee.framework.database.test</module> + + <module>../../plugins/org.eclipse.osee.database</module> + + <module>../../plugins/org.eclipse.osee.orcs</module> + <module>../../plugins/org.eclipse.osee.orcs.core</module> + <module>../../plugins/org.eclipse.osee.orcs.core.test</module> + <module>../../plugins/org.eclipse.osee.orcs.db</module> + <module>../../plugins/org.eclipse.osee.orcs.db.mock</module> + <module>../../plugins/org.eclipse.osee.orcs.rest</module> + <module>../../plugins/org.eclipse.osee.framework.h2</module> + <module>../../plugins/org.eclipse.osee.orcs.db.test</module> + + <module>../../plugins/org.eclipse.osee.orcs.core.integration.test</module> + + <module>../../features/org.eclipse.osee.orcs.feature</module> + <module>../../features/org.eclipse.osee.orcs.feature.source</module> + + <module>../../plugins/org.eclipse.osee.orcs.p2</module> + </modules> + + <properties> + <tycho-version>0.12.0</tycho-version> + <maven-antrun-version>1.6</maven-antrun-version> + <ant-contrib-version>1.0b3</ant-contrib-version> + <build-alias>-DEV</build-alias> + <platform-version-name>indigo</platform-version-name> + + <orbit-version>R20110523182458</orbit-version> + + <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/${orbit-version}/repository</orbit-site> + <eclipse-site>http://download.eclipse.org/releases/${platform-version-name}</eclipse-site> + <wikitext-site>http://download.eclipse.org/tools/mylyn/update/weekly</wikitext-site> + <swtbot-site>http://download.eclipse.org/technology/swtbot/${platform-version-name}/dev-build/update-site</swtbot-site> + + <osee-xcore-site-path>file:../../../org.eclipse.osee/plugins</osee-xcore-site-path> + <osee-xcore-site>${osee-xcore-site-path}/org.eclipse.osee.x.core.p2/target/repository</osee-xcore-site> + + </properties> + + <licenses> + <license> + <name>Eclipse Public License v1.0</name> + <comments> + All rights reserved. + + This program and the accompanying materials are 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.htm + </comments> + </license> + </licenses> + + <organization> + <name>Eclipse Open System Engineering Environment</name> + <url>http://www.eclipse.org/osee</url> + </organization> + + <repositories> + <repository> + <id>eclipse</id> + <layout>p2</layout> + <url>${eclipse-site}</url> + </repository> + <repository> + <id>swtbot</id> + <layout>p2</layout> + <url>${swtbot-site}</url> + </repository> + <repository> + <id>wikitext</id> + <layout>p2</layout> + <url>${wikitext-site}</url> + </repository> + <repository> + <id>orbit</id> + <layout>p2</layout> + <url>${orbit-site}</url> + </repository> + <repository> + <id>osee-xcore</id> + <layout>p2</layout> + <url>${osee-xcore-site}</url> + </repository> + </repositories> + + <build> + <sourceDirectory>src</sourceDirectory> + <plugins> + <plugin> + <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>tycho-packaging-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <format>'v'yyyyMMddHHmm'${build-alias}'</format> + <archiveSite>true</archiveSite> + <environments> + <!-- <environment> <os>macosx</os> <ws>cocoa</ws> <arch>x86</arch> + </environment> <environment> <os>macosx</os> <ws>carbon</ws> <arch>x86</arch> + </environment> --> + <environment> + <os>win32</os> + <ws>win32</ws> + <arch>x86</arch> + </environment> + <environment> + <os>linux</os> + <ws>gtk</ws> + <arch>x86</arch> + </environment> + <environment> + <os>linux</os> + <ws>gtk</ws> + <arch>x86_64</arch> + </environment> + </environments> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho-version}</version> + <configuration> + <resolver>p2</resolver> + <environments> + <!-- <environment> <os>macosx</os> <ws>cocoa</ws> <arch>x86</arch> + </environment> <environment> <os>macosx</os> <ws>carbon</ws> <arch>x86</arch> + </environment> --> + <environment> + <os>win32</os> + <ws>win32</ws> + <arch>x86</arch> + </environment> + <environment> + <os>linux</os> + <ws>gtk</ws> + <arch>x86</arch> + </environment> + <environment> + <os>linux</os> + <ws>gtk</ws> + <arch>x86_64</arch> + </environment> + </environments> + </configuration> + </plugin> + </plugins> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-compiler-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <source>1.6</source> + <target>1.6</target> + <encoding>UTF-8</encoding> + </configuration> + </plugin> + <!-- enable source bundle generation --> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + <version>${tycho-version}</version> + <executions> + <execution> + <id>plugin-source</id> + <goals> + <goal>plugin-source</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>2.4.1</version> + <configuration> + <encoding>ISO-8859-1</encoding> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>${maven-antrun-version}</version> + <dependencies> + <dependency> + <groupId>ant-contrib</groupId> + <artifactId>ant-contrib</artifactId> + <version>${ant-contrib-version}</version> + <exclusions> + <exclusion> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <version>2.3.2</version> + <configuration> + <findbugsXmlOutput>true</findbugsXmlOutput> + <failOnError>false</failOnError> + </configuration> + <executions> + <execution> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-pmd-plugin</artifactId> + <version>2.5</version> + <configuration> + <sourceEncoding>utf-8</sourceEncoding> + <minimumTokens>100</minimumTokens> + <targetJdk>1.6</targetJdk> + <format>xml</format> + <failOnViolation>false</failOnViolation> + </configuration> + <executions> + <execution> + <goals> + <goal>cpd-check</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> + </build> + + <profiles> + <profile> + <id>helpGeneration</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <update.osee.doc>true</update.osee.doc> + </properties> + </profile> + + <profile> + <id>platform-helios</id> + <activation> + <property> + <name>platform-version-name</name> + <value>helios</value> + </property> + </activation> + <properties> + <eclipse-site>http://download.eclipse.org/releases/helios</eclipse-site> + <platform-version>[3.6,3.7)</platform-version> + <swtbot-site>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site</swtbot-site> + </properties> + </profile> + + <profile> + <id>platform-indigo</id> + <activation> + <property> + <name>platform-version-name</name> + <value>indigo</value> + </property> + </activation> + <properties> + <eclipse-site>http://download.eclipse.org/releases/indigo</eclipse-site> + <platform-version>[3.7,3.8)</platform-version> + <swtbot-site>http://download.eclipse.org/technology/swtbot/indigo/dev-build/update-site</swtbot-site> + </properties> + </profile> + + <profile> + <id>checkstyle</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>check my sources</id> + <goals> + <goal>checkstyle</goal> + </goals> + <phase>verify</phase> + <configuration> + <failOnErrors>false</failOnErrors> + <consoleOutput>true</consoleOutput> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>coverage</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <modules> + <module>org.eclemma.runtime.equinox</module> + </modules> + </profile> + <profile> + <id>static-checks</id> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-pmd-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>hudson</id> + <activation> + <property> + <name>BUILD_NUMBER</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>maven-osgi-packaging-plugin</artifactId> + <version>${tychoVersion}</version> + <configuration> + <format>'v'yyyyMMdd-HHmm'-H${BUILD_NUMBER}-${build-alias}</format> + <archiveSite>true</archiveSite> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>osee-local-sites</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <osee-xcore-site-path>file:../../../org.eclipse.osee/plugins</osee-xcore-site-path> + <osee-xcore-site>${osee-xcore-site-path}/org.eclipse.osee.x.core.p2/target/repository</osee-xcore-site> + </properties> + </profile> + + <profile> + <id>osee-remote-sites</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <properties> + <osee-xcore-site-path>http://msa-linux-adm.msc.az.boeing.com/osee/sites</osee-xcore-site-path> + <osee-xcore-site-version>DEV/org.eclipse.osee</osee-xcore-site-version> + <osee-xcore-site>${osee-xcore-site-path}/org.eclipse.osee.x.core.p2</osee-xcore-site> + </properties> + </profile> + + <profile> + <id>local-mirror</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <mirrors-server>http://msa-linux-adm.msc.az.boeing.com</mirrors-server> + </properties> + <!--Enable snapshots for the built in central repo to direct --> + <!--all requests to nexus via the mirror --> + <repositories> + <repository> + <id>central</id> + <url>${mirrors-server}/nexus/content/groups/public/</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>snapshots</id> + <url>${mirrors-server}/nexus/content/groups/public-snapshots/</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + <repository> + <id>eclipse</id> + <layout>p2</layout> + <url>${mirrors-server}/osee/sites/MIRRORS/eclipse/${platform-version-name}</url> + </repository> + <repository> + <id>orbit</id> + <layout>p2</layout> + <url>${mirrors-server}/osee/sites/MIRRORS/orbit/${orbit-version}/</url> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>central</id> + <url>${mirrors-server}/nexus/content/groups/public/</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </pluginRepository> + <pluginRepository> + <id>snapshots</id> + <url>${mirrors-server}/nexus/content/groups/public-snapshots/</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> + </profile> + + </profiles> + +</project> diff --git a/plugins/org.eclipse.osee.orcs.rest/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.rest/META-INF/MANIFEST.MF index 5ac4c0065f3..474828ef2ce 100644 --- a/plugins/org.eclipse.osee.orcs.rest/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs.rest/META-INF/MANIFEST.MF @@ -6,8 +6,7 @@ Bundle-Version: 0.9.9.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Service-Component: OSGI-INF/*.xml -Import-Package: com.sun.jersey.multipart, - javax.ws.rs, +Import-Package: javax.ws.rs, javax.ws.rs.core, org.eclipse.osee.framework.core.data, org.eclipse.osee.framework.core.enums, diff --git a/plugins/org.eclipse.osee.orcs/pom.xml b/plugins/org.eclipse.osee.orcs/pom.xml index 5c577da5644..d7da2e7cc00 100644 --- a/plugins/org.eclipse.osee.orcs/pom.xml +++ b/plugins/org.eclipse.osee.orcs/pom.xml @@ -5,9 +5,9 @@ <parent> <groupId>org.eclipse.osee</groupId> - <artifactId>org.eclipse.osee.x.server.parent</artifactId> + <artifactId>org.eclipse.osee.orcs.parent</artifactId> <version>0.9.9-SNAPSHOT</version> - <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath> + <relativePath>../../plugins/org.eclipse.osee.orcs.parent</relativePath> </parent> <artifactId>org.eclipse.osee.orcs</artifactId> diff --git a/plugins/org.eclipse.osee.x.parent/pom.xml b/plugins/org.eclipse.osee.x.parent/pom.xml index 294f7d703b3..30eb721c860 100644 --- a/plugins/org.eclipse.osee.x.parent/pom.xml +++ b/plugins/org.eclipse.osee.x.parent/pom.xml @@ -11,6 +11,7 @@ <modules> <module>../../plugins/org.eclipse.osee.x.core.parent</module> + <module>../../plugins/org.eclipse.osee.orcs.parent</module> <module>../../plugins/org.eclipse.osee.x.server.parent</module> </modules> diff --git a/plugins/org.eclipse.osee.x.server.parent/pom.xml b/plugins/org.eclipse.osee.x.server.parent/pom.xml index 5bc8220d469..57ff3498c2e 100644 --- a/plugins/org.eclipse.osee.x.server.parent/pom.xml +++ b/plugins/org.eclipse.osee.x.server.parent/pom.xml @@ -10,20 +10,6 @@ <version>0.9.9-SNAPSHOT</version> <modules> - <module>../../plugins/org.eclipse.osee.framework.core</module> - <module>../../plugins/org.eclipse.osee.framework.core.test</module> - <module>../../plugins/org.eclipse.osee.framework.core.dsl</module> - <module>../../plugins/org.eclipse.osee.framework.core.dsl.integration</module> - <module>../../plugins/org.eclipse.osee.framework.core.dsl.integration.test</module> - <module>../../plugins/org.eclipse.osee.framework.core.model</module> - <module>../../plugins/org.eclipse.osee.framework.core.model.test</module> - <module>../../plugins/org.eclipse.osee.framework.resource.management</module> - <module>../../plugins/org.eclipse.osee.framework.resource.management.test</module> - <module>../../plugins/org.eclipse.osee.framework.database</module> - <module>../../plugins/org.eclipse.osee.framework.database.test</module> - - <module>../../plugins/org.eclipse.osee.database</module> - <module>../../plugins/org.eclipse.osee.display.api</module> <module>../../plugins/org.eclipse.osee.display.view.web</module> <module>../../plugins/org.eclipse.osee.display.presenter</module> @@ -36,18 +22,6 @@ <module>../../plugins/org.eclipse.osee.ats.presenter</module> <module>../../plugins/org.eclipse.osee.ats.presenter.test</module> - <module>../../plugins/org.eclipse.osee.orcs</module> - <module>../../plugins/org.eclipse.osee.orcs.mock</module> - <module>../../plugins/org.eclipse.osee.orcs.core</module> - <module>../../plugins/org.eclipse.osee.orcs.core.test</module> - <module>../../plugins/org.eclipse.osee.orcs.db</module> - <module>../../plugins/org.eclipse.osee.orcs.db.mock</module> - <module>../../plugins/org.eclipse.osee.orcs.rest</module> - <module>../../plugins/org.eclipse.osee.framework.h2</module> - <module>../../plugins/org.eclipse.osee.orcs.db.test</module> - - <module>../../plugins/org.eclipse.osee.orcs.core.integration.test</module> - <module>../../features/org.eclipse.osee.x.server.feature</module> <module>../../features/org.eclipse.osee.x.server.external.feature</module> <module>../../features/org.eclipse.osee.x.server.feature.source</module> @@ -75,6 +49,9 @@ <osee-xcore-site-path>file:../../../org.eclipse.osee/plugins</osee-xcore-site-path> <osee-xcore-site>${osee-xcore-site-path}/org.eclipse.osee.x.core.p2/target/repository</osee-xcore-site> + <osee-orcs-site-path>file:../../../org.eclipse.osee/plugins</osee-orcs-site-path> + <osee-orcs-site>${osee-orcs-site-path}/org.eclipse.osee.orcs.p2/target/repository</osee-orcs-site> + </properties> <licenses> @@ -127,6 +104,11 @@ <layout>p2</layout> <url>${osee-xcore-site}</url> </repository> + <repository> + <id>osee-orcs</id> + <layout>p2</layout> + <url>${osee-orcs-site}</url> + </repository> </repositories> <build> @@ -455,6 +437,9 @@ <osee-xcore-site-path>file:../../../org.eclipse.osee/plugins</osee-xcore-site-path> <osee-xcore-site>${osee-xcore-site-path}/org.eclipse.osee.x.core.p2/target/repository</osee-xcore-site> + + <osee-orcs-site-path>file:../../../org.eclipse.osee/plugins</osee-orcs-site-path> + <osee-orcs-site>${osee-orcs-site-path}/org.eclipse.osee.orcs.p2/target/repository</osee-orcs-site> </properties> </profile> @@ -469,8 +454,12 @@ <eclipse-ip-site>${eclipse-ip-site-path}/${eclipse-ip-site-version}/org.eclipse.ip/org.eclipse.ip.p2</eclipse-ip-site> <osee-xcore-site-path>http://msa-linux-adm.msc.az.boeing.com/osee/sites</osee-xcore-site-path> - <osee-xcore-site-version>DEV/org.eclipse.osee</osee-xcore-site-version> - <osee-xcore-site>${osee-xcore-site-path}/org.eclipse.osee.x.core.p2</osee-xcore-site> + <osee-xcore-site-version>DEV</osee-xcore-site-version> + <osee-xcore-site>${osee-xcore-site-path}/${osee-xcore-site-version}/org.eclipse.osee/org.eclipse.osee.x.core.p2</osee-xcore-site> + + <osee-orcs-site-path>http://msa-linux-adm.msc.az.boeing.com/osee/sites</osee-orcs-site-path> + <osee-orcs-site-version>DEV</osee-orcs-site-version> + <osee-orcs-site>${osee-orcs-site-path}/${osee-orcs-site-version}/org.eclipse.osee/org.eclipse.osee.orcs.p2</osee-orcs-site> </properties> </profile> |