Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmisinco2011-10-10 22:03:24 +0000
committerRoberto E. Escobar2011-10-10 22:03:24 +0000
commit0c1962a3c2f946e05668ac0aa090414a7dcb92b3 (patch)
tree2ad10e3497370f6683932a1067751917db26e2f0
parentdd34e15f4eeb4eb005a6dcd18a12ee32b157f0ad (diff)
downloadorg.eclipse.osee-0c1962a3c2f946e05668ac0aa090414a7dcb92b3.tar.gz
org.eclipse.osee-0c1962a3c2f946e05668ac0aa090414a7dcb92b3.tar.xz
org.eclipse.osee-0c1962a3c2f946e05668ac0aa090414a7dcb92b3.zip
feature[ats_8KF8L]: Update server features for presenter bundles
-rw-r--r--features/org.eclipse.osee.x.server.feature.source/feature.xml23
-rw-r--r--features/org.eclipse.osee.x.server.feature/feature.xml21
-rw-r--r--plugins/org.eclipse.osee.ats.api/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.osee.ats.api/pom.xml34
-rw-r--r--plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/search/AtsPresenterFactory.java12
-rw-r--r--plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/search/AtsSearchPresenter.java (renamed from plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/search/AtsWebSearchPresenter.java)2
-rw-r--r--plugins/org.eclipse.osee.ats.presenter.test/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.ats.presenter.test/src/org/eclipse/osee/ats/presenter/WebProgramsPresenterTest.java7
-rw-r--r--plugins/org.eclipse.osee.ats.presenter/.project5
-rw-r--r--plugins/org.eclipse.osee.ats.presenter/META-INF/MANIFEST.MF15
-rw-r--r--plugins/org.eclipse.osee.ats.presenter/OSGI-INF/component.xml8
-rw-r--r--plugins/org.eclipse.osee.ats.presenter/build.properties3
-rw-r--r--plugins/org.eclipse.osee.ats.presenter/pom.xml34
-rw-r--r--plugins/org.eclipse.osee.ats.presenter/src/org/eclipse/osee/ats/presenter/internal/AtsPresenterFactoryImpl.java29
-rw-r--r--plugins/org.eclipse.osee.ats.presenter/src/org/eclipse/osee/ats/presenter/internal/AtsSearchPresenterImpl.java (renamed from plugins/org.eclipse.osee.ats.presenter/src/org/eclipse/osee/ats/presenter/WebProgramsPresenter.java)8
-rw-r--r--plugins/org.eclipse.osee.ats.view.web/build.properties3
-rw-r--r--plugins/org.eclipse.osee.ats.view.web/pom.xml34
-rw-r--r--plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsAppData.java6
-rw-r--r--plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsUiApplication.java6
-rw-r--r--plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsWebSearchPresenter_TestBackend.java8
-rw-r--r--plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/components/AtsSearchHeaderComponent.java4
-rw-r--r--plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/search/AtsSearchHomeView.java4
-rw-r--r--plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/search/AtsSearchResultsView.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.core/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.osee.orcs.core/OSGI-INF/orcs.api.xml7
-rw-r--r--plugins/org.eclipse.osee.orcs.core/build.properties2
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/OrcsApiImpl.java19
-rw-r--r--plugins/org.eclipse.osee.x.server.parent/pom.xml5
28 files changed, 273 insertions, 35 deletions
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 e682d357fa4..141f0b0a2c1 100644
--- a/features/org.eclipse.osee.x.server.feature.source/feature.xml
+++ b/features/org.eclipse.osee.x.server.feature.source/feature.xml
@@ -104,5 +104,26 @@
install-size="0"
version="0.0.0"
unpack="false"/>
-
+
+ <plugin
+ id="org.eclipse.osee.ats.presenter"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.osee.ats.view.web"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.osee.ats.api"
+ 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 e8f849fea47..c3bc9764c82 100644
--- a/features/org.eclipse.osee.x.server.feature/feature.xml
+++ b/features/org.eclipse.osee.x.server.feature/feature.xml
@@ -117,4 +117,25 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.osee.ats.presenter"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.osee.ats.view.web"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.osee.ats.api"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/plugins/org.eclipse.osee.ats.api/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.api/META-INF/MANIFEST.MF
index f7db0d1d1fc..c0886467891 100644
--- a/plugins/org.eclipse.osee.ats.api/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.ats.api/META-INF/MANIFEST.MF
@@ -10,5 +10,3 @@ Export-Package: org.eclipse.osee.ats.api.components,
org.eclipse.osee.ats.api.tokens
Require-Bundle: org.eclipse.osee.display.api,
org.eclipse.osee.framework.core
-Require-Bundle: org.eclipse.osee.framework.core,
- org.eclipse.osee.display.api
diff --git a/plugins/org.eclipse.osee.ats.api/pom.xml b/plugins/org.eclipse.osee.ats.api/pom.xml
new file mode 100644
index 00000000000..68b71bbbcc8
--- /dev/null
+++ b/plugins/org.eclipse.osee.ats.api/pom.xml
@@ -0,0 +1,34 @@
+<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.ats.api</artifactId>
+ <packaging>eclipse-plugin</packaging>
+ <name>OSEE Ats Api - (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.ats.api/src/org/eclipse/osee/ats/api/search/AtsPresenterFactory.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/search/AtsPresenterFactory.java
new file mode 100644
index 00000000000..d5f68a34bc3
--- /dev/null
+++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/search/AtsPresenterFactory.java
@@ -0,0 +1,12 @@
+/*
+ * Created on Oct 10, 2011
+ *
+ * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE
+ */
+package org.eclipse.osee.ats.api.search;
+
+public interface AtsPresenterFactory {
+
+ AtsSearchPresenter createInstance();
+
+}
diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/search/AtsWebSearchPresenter.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/search/AtsSearchPresenter.java
index 5afb086a8ba..6a1a13663db 100644
--- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/search/AtsWebSearchPresenter.java
+++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/search/AtsSearchPresenter.java
@@ -19,7 +19,7 @@ import org.eclipse.osee.display.api.search.SearchPresenter;
/*
* @author John Misinco
*/
-public interface AtsWebSearchPresenter extends SearchPresenter {
+public interface AtsSearchPresenter extends SearchPresenter {
void selectProgram(WebId program, AtsSearchHeaderComponentInterface headerComponent);
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 994d19df551..6b5545766fb 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,4 +7,5 @@ Fragment-Host: org.eclipse.osee.ats.presenter
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.junit
Import-Package: org.eclipse.osee.display.presenter.mocks,
+ org.eclipse.osee.framework.core.data,
org.eclipse.osee.orcs.mock
diff --git a/plugins/org.eclipse.osee.ats.presenter.test/src/org/eclipse/osee/ats/presenter/WebProgramsPresenterTest.java b/plugins/org.eclipse.osee.ats.presenter.test/src/org/eclipse/osee/ats/presenter/WebProgramsPresenterTest.java
index 1907f4fa055..ea6ee4b5cbf 100644
--- a/plugins/org.eclipse.osee.ats.presenter.test/src/org/eclipse/osee/ats/presenter/WebProgramsPresenterTest.java
+++ b/plugins/org.eclipse.osee.ats.presenter.test/src/org/eclipse/osee/ats/presenter/WebProgramsPresenterTest.java
@@ -7,6 +7,7 @@ package org.eclipse.osee.ats.presenter;
import junit.framework.Assert;
import org.eclipse.osee.ats.api.tokens.AtsRelationTypes;
+import org.eclipse.osee.ats.presenter.internal.AtsSearchPresenterImpl;
import org.eclipse.osee.ats.presenter.mock.MockAtsSearchHeaderComponent;
import org.eclipse.osee.display.api.data.WebId;
import org.eclipse.osee.display.presenter.mocks.MockArtifactProvider;
@@ -31,7 +32,7 @@ public class WebProgramsPresenterTest {
teamDef.addRelation(AtsRelationTypes.TeamDefinitionToVersion_Version, build3Artifact);
MockArtifactProvider provider = new MockArtifactProvider();
provider.setArtifact(programArtifact);
- WebProgramsPresenter presenter = new WebProgramsPresenter(provider);
+ AtsSearchPresenterImpl presenter = new AtsSearchPresenterImpl(provider);
MockAtsSearchHeaderComponent comp = new MockAtsSearchHeaderComponent();
WebId program = new WebId("prg1Guid", "Program1");
presenter.selectProgram(program, comp);
@@ -41,7 +42,7 @@ public class WebProgramsPresenterTest {
@Test
public void testSelectSearch() {
- WebProgramsPresenter presenter = new WebProgramsPresenter(null);
+ AtsSearchPresenterImpl presenter = new AtsSearchPresenterImpl(null);
MockSearchNavigator navigator = new MockSearchNavigator();
WebId program = new WebId("prgGuid", "prgName");
WebId build = new WebId("bldGuid", "bldName");
@@ -58,7 +59,7 @@ public class WebProgramsPresenterTest {
webPrograms.addRelation(CoreRelationTypes.Universal_Grouping__Members, program1);
MockArtifactProvider provider = new MockArtifactProvider();
provider.setArtifact(webPrograms);
- WebProgramsPresenter presenter = new WebProgramsPresenter(provider);
+ AtsSearchPresenterImpl presenter = new AtsSearchPresenterImpl(provider);
MockAtsSearchHeaderComponent headerComp = new MockAtsSearchHeaderComponent();
presenter.initSearchHome(headerComp);
Assert.assertTrue(headerComp.isClearAllCalled());
diff --git a/plugins/org.eclipse.osee.ats.presenter/.project b/plugins/org.eclipse.osee.ats.presenter/.project
index 0f2fefb82ef..df3df51a3f4 100644
--- a/plugins/org.eclipse.osee.ats.presenter/.project
+++ b/plugins/org.eclipse.osee.ats.presenter/.project
@@ -20,6 +20,11 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ds.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
diff --git a/plugins/org.eclipse.osee.ats.presenter/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.presenter/META-INF/MANIFEST.MF
index e363491bbc2..57d08732361 100644
--- a/plugins/org.eclipse.osee.ats.presenter/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.ats.presenter/META-INF/MANIFEST.MF
@@ -5,7 +5,16 @@ Bundle-SymbolicName: org.eclipse.osee.ats.presenter
Bundle-Version: 0.9.9.qualifier
Bundle-Vendor: Eclipse Foundation
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.osee.ats.api,
+Import-Package: org.eclipse.osee.ats.api.components,
+ org.eclipse.osee.ats.api.search,
+ org.eclipse.osee.ats.api.tokens,
+ org.eclipse.osee.display.api.components,
+ org.eclipse.osee.display.api.data,
+ org.eclipse.osee.display.api.search,
+ org.eclipse.osee.display.presenter,
+ org.eclipse.osee.framework.core.data,
+ org.eclipse.osee.framework.core.enums,
+ org.eclipse.osee.framework.core.exception,
org.eclipse.osee.orcs,
- org.eclipse.osee.display.api,
- org.eclipse.osee.framework.core
+ org.eclipse.osee.orcs.data
+Require-Bundle: org.eclipse.core.runtime
diff --git a/plugins/org.eclipse.osee.ats.presenter/OSGI-INF/component.xml b/plugins/org.eclipse.osee.ats.presenter/OSGI-INF/component.xml
new file mode 100644
index 00000000000..2c1f977c46a
--- /dev/null
+++ b/plugins/org.eclipse.osee.ats.presenter/OSGI-INF/component.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.osee.ats.presenter.internal.AtsPresenterFactoryImpl">
+ <implementation class="org.eclipse.osee.ats.presenter.internal.AtsPresenterFactoryImpl"/>
+ <reference bind="setOseeApi" cardinality="1..1" interface="org.eclipse.osee.orcs.OseeApi" policy="static"/>
+ <service>
+ <provide interface="org.eclipse.osee.ats.api.search.AtsPresenterFactory"/>
+ </service>
+</scr:component>
diff --git a/plugins/org.eclipse.osee.ats.presenter/build.properties b/plugins/org.eclipse.osee.ats.presenter/build.properties
index 3eeead54fe1..a69c4c30fb0 100644
--- a/plugins/org.eclipse.osee.ats.presenter/build.properties
+++ b/plugins/org.eclipse.osee.ats.presenter/build.properties
@@ -1,7 +1,8 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- .
+ .,\
+ OSGI-INF/
additional.bundles = org.eclipse.osee.ats.api,\
org.eclipse.osee.display.api,\
org.eclipse.osee.framework.core,\
diff --git a/plugins/org.eclipse.osee.ats.presenter/pom.xml b/plugins/org.eclipse.osee.ats.presenter/pom.xml
new file mode 100644
index 00000000000..74a7e40e2b4
--- /dev/null
+++ b/plugins/org.eclipse.osee.ats.presenter/pom.xml
@@ -0,0 +1,34 @@
+<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.ats.presenter</artifactId>
+ <packaging>eclipse-plugin</packaging>
+ <name>OSEE Ats Presenter - (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.ats.presenter/src/org/eclipse/osee/ats/presenter/internal/AtsPresenterFactoryImpl.java b/plugins/org.eclipse.osee.ats.presenter/src/org/eclipse/osee/ats/presenter/internal/AtsPresenterFactoryImpl.java
new file mode 100644
index 00000000000..0fa5365548a
--- /dev/null
+++ b/plugins/org.eclipse.osee.ats.presenter/src/org/eclipse/osee/ats/presenter/internal/AtsPresenterFactoryImpl.java
@@ -0,0 +1,29 @@
+/*
+ * Created on Oct 10, 2011
+ *
+ * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE
+ */
+package org.eclipse.osee.ats.presenter.internal;
+
+import org.eclipse.osee.ats.api.search.AtsPresenterFactory;
+import org.eclipse.osee.ats.api.search.AtsSearchPresenter;
+import org.eclipse.osee.display.presenter.ArtifactProvider;
+import org.eclipse.osee.display.presenter.ArtifactProviderImpl;
+import org.eclipse.osee.orcs.OseeApi;
+
+public class AtsPresenterFactoryImpl implements AtsPresenterFactory {
+
+ private OseeApi oseeApi;
+
+ public void setOseeApi(OseeApi oseeApi) {
+ this.oseeApi = oseeApi;
+ }
+
+ @Override
+ public AtsSearchPresenter createInstance() {
+ ArtifactProvider provider = new ArtifactProviderImpl(oseeApi.getQueryFactory(null));
+ AtsSearchPresenterImpl instance = new AtsSearchPresenterImpl(provider);
+ return instance;
+ }
+
+}
diff --git a/plugins/org.eclipse.osee.ats.presenter/src/org/eclipse/osee/ats/presenter/WebProgramsPresenter.java b/plugins/org.eclipse.osee.ats.presenter/src/org/eclipse/osee/ats/presenter/internal/AtsSearchPresenterImpl.java
index b0dac9f0ba4..dfe452adf03 100644
--- a/plugins/org.eclipse.osee.ats.presenter/src/org/eclipse/osee/ats/presenter/WebProgramsPresenter.java
+++ b/plugins/org.eclipse.osee.ats.presenter/src/org/eclipse/osee/ats/presenter/internal/AtsSearchPresenterImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.ats.presenter;
+package org.eclipse.osee.ats.presenter.internal;
import java.util.ArrayList;
import java.util.Collection;
@@ -17,7 +17,7 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.eclipse.osee.ats.api.components.AtsSearchHeaderComponentInterface;
-import org.eclipse.osee.ats.api.search.AtsWebSearchPresenter;
+import org.eclipse.osee.ats.api.search.AtsSearchPresenter;
import org.eclipse.osee.ats.api.tokens.AtsArtifactToken;
import org.eclipse.osee.ats.api.tokens.AtsAttributeTypes;
import org.eclipse.osee.ats.api.tokens.AtsRelationTypes;
@@ -34,7 +34,7 @@ import org.eclipse.osee.orcs.data.ReadableArtifact;
/**
* @author John Misinco
*/
-public class WebProgramsPresenter extends WebSearchPresenter implements AtsWebSearchPresenter {
+public class AtsSearchPresenterImpl extends WebSearchPresenter implements AtsSearchPresenter {
private final static Pattern buildPattern = Pattern.compile("build=([0-9A-Za-z\\+_=]{20,22})");
private final static Pattern programPattern = Pattern.compile("program=([0-9A-Za-z\\+_=]{20,22})");
@@ -42,7 +42,7 @@ public class WebProgramsPresenter extends WebSearchPresenter implements AtsWebSe
private final Matcher buildMatcher;
private final Matcher programMatcher;
- public WebProgramsPresenter(ArtifactProvider artifactProvider) {
+ public AtsSearchPresenterImpl(ArtifactProvider artifactProvider) {
super(artifactProvider);
buildMatcher = buildPattern.matcher("");
programMatcher = programPattern.matcher("");
diff --git a/plugins/org.eclipse.osee.ats.view.web/build.properties b/plugins/org.eclipse.osee.ats.view.web/build.properties
index e1697f49315..9f9ce987ba0 100644
--- a/plugins/org.eclipse.osee.ats.view.web/build.properties
+++ b/plugins/org.eclipse.osee.ats.view.web/build.properties
@@ -1,7 +1,8 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- .
+ .,\
+ OSGI-INF/
additional.bundles = com.vaadin,\
org.eclipse.osee.display.view.web,\
org.eclipse.osee.vaadin.widgets,\
diff --git a/plugins/org.eclipse.osee.ats.view.web/pom.xml b/plugins/org.eclipse.osee.ats.view.web/pom.xml
new file mode 100644
index 00000000000..dd0c13fce85
--- /dev/null
+++ b/plugins/org.eclipse.osee.ats.view.web/pom.xml
@@ -0,0 +1,34 @@
+<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.ats.view.web</artifactId>
+ <packaging>eclipse-plugin</packaging>
+ <name>OSEE Ats View Web - (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.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsAppData.java b/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsAppData.java
index 99474d1fb7d..38d0a26cf50 100644
--- a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsAppData.java
+++ b/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsAppData.java
@@ -11,7 +11,7 @@ he Eclipse Public License v1.0
*******************************************************************************/
package org.eclipse.osee.ats.view.web;
-import org.eclipse.osee.ats.api.search.AtsWebSearchPresenter;
+import org.eclipse.osee.ats.api.search.AtsSearchPresenter;
import org.eclipse.osee.display.api.search.SearchNavigator;
import org.eclipse.osee.display.api.search.SearchPresenter;
import org.eclipse.osee.display.view.web.OseeAppData;
@@ -48,8 +48,8 @@ public class AtsAppData extends OseeAppData {
return (AtsNavigator) OseeAppData.getNavigator();
}
- public static AtsWebSearchPresenter getAtsWebSearchPresenter() {
- return (AtsWebSearchPresenter) OseeAppData.getSearchPresenter();
+ public static AtsSearchPresenter getAtsWebSearchPresenter() {
+ return (AtsSearchPresenter) OseeAppData.getSearchPresenter();
}
@Override
diff --git a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsUiApplication.java b/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsUiApplication.java
index 05b543ebbe3..279f993da4d 100644
--- a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsUiApplication.java
+++ b/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsUiApplication.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.ats.view.web;
-import org.eclipse.osee.ats.api.search.AtsWebSearchPresenter;
+import org.eclipse.osee.ats.api.search.AtsSearchPresenter;
import org.eclipse.osee.vaadin.widgets.HasViews;
import org.osgi.framework.Bundle;
import org.osgi.framework.FrameworkUtil;
@@ -23,7 +23,7 @@ import com.vaadin.ui.Window;
@SuppressWarnings("serial")
public class AtsUiApplication extends Application {
- private final AtsWebSearchPresenter atsBackend = AtsWebSearchPresenter_TestBackend.getInstance();
+ private final AtsSearchPresenter atsBackend = AtsWebSearchPresenter_TestBackend.getInstance();
@Override
public void init() {
@@ -43,7 +43,7 @@ public class AtsUiApplication extends Application {
return bundle.getVersion().toString();
}
- public AtsWebSearchPresenter getAtsWebSearchPresenter() {
+ public AtsSearchPresenter getAtsWebSearchPresenter() {
return atsBackend;
}
diff --git a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsWebSearchPresenter_TestBackend.java b/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsWebSearchPresenter_TestBackend.java
index 72fc7459466..44b064d38ea 100644
--- a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsWebSearchPresenter_TestBackend.java
+++ b/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsWebSearchPresenter_TestBackend.java
@@ -18,7 +18,7 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import org.eclipse.osee.ats.api.components.AtsSearchHeaderComponentInterface;
-import org.eclipse.osee.ats.api.search.AtsWebSearchPresenter;
+import org.eclipse.osee.ats.api.search.AtsSearchPresenter;
import org.eclipse.osee.display.api.components.ArtifactHeaderComponent;
import org.eclipse.osee.display.api.components.AttributeComponent;
import org.eclipse.osee.display.api.components.RelationComponent;
@@ -34,9 +34,9 @@ import org.eclipse.osee.display.view.web.UrlParamNameConstants;
/**
* @author Shawn F. Cook
*/
-public class AtsWebSearchPresenter_TestBackend implements AtsWebSearchPresenter {
+public class AtsWebSearchPresenter_TestBackend implements AtsSearchPresenter {
- private static final AtsWebSearchPresenter atsBackend = new AtsWebSearchPresenter_TestBackend();
+ private static final AtsSearchPresenter atsBackend = new AtsWebSearchPresenter_TestBackend();
//*** TEST DATA ***
WebId build0 = new WebId("baseline_guid", "Baseline");
@@ -199,7 +199,7 @@ public class AtsWebSearchPresenter_TestBackend implements AtsWebSearchPresenter
}
}
- public static AtsWebSearchPresenter getInstance() {
+ public static AtsSearchPresenter getInstance() {
return atsBackend;
}
diff --git a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/components/AtsSearchHeaderComponent.java b/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/components/AtsSearchHeaderComponent.java
index 3ea99f93982..cc0a2777325 100644
--- a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/components/AtsSearchHeaderComponent.java
+++ b/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/components/AtsSearchHeaderComponent.java
@@ -11,7 +11,7 @@
package org.eclipse.osee.ats.view.web.components;
import org.eclipse.osee.ats.api.components.AtsSearchHeaderComponentInterface;
-import org.eclipse.osee.ats.api.search.AtsWebSearchPresenter;
+import org.eclipse.osee.ats.api.search.AtsSearchPresenter;
import org.eclipse.osee.ats.view.web.AtsAppData;
import org.eclipse.osee.ats.view.web.AtsNavigator;
import org.eclipse.osee.ats.view.web.search.AtsSearchHomeView;
@@ -46,7 +46,7 @@ public class AtsSearchHeaderComponent extends OseeSearchHeaderComponent implemen
private final CheckBox nameOnlyCheckBox;
private final TextField searchTextField;
private final boolean showOseeTitleAbove;
- private final AtsWebSearchPresenter atsBackend;
+ private final AtsSearchPresenter atsBackend;
private final AtsNavigator atsNavigator;
private boolean lockProgramCombo = false;
diff --git a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/search/AtsSearchHomeView.java b/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/search/AtsSearchHomeView.java
index d6d2fa5dcde..3e2e670f7ee 100644
--- a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/search/AtsSearchHomeView.java
+++ b/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/search/AtsSearchHomeView.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.ats.view.web.search;
-import org.eclipse.osee.ats.api.search.AtsWebSearchPresenter;
+import org.eclipse.osee.ats.api.search.AtsSearchPresenter;
import org.eclipse.osee.ats.view.web.AtsAppData;
import org.eclipse.osee.ats.view.web.components.AtsSearchHeaderComponent;
import org.eclipse.osee.display.view.web.search.OseeSearchHeaderComponent;
@@ -22,7 +22,7 @@ import org.eclipse.osee.display.view.web.search.OseeSearchHomeView;
@SuppressWarnings("serial")
public class AtsSearchHomeView extends OseeSearchHomeView {
- private final AtsWebSearchPresenter atsBackend;
+ private final AtsSearchPresenter atsBackend;
public AtsSearchHomeView() {
super();
diff --git a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/search/AtsSearchResultsView.java b/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/search/AtsSearchResultsView.java
index 84d402d0d1f..339463de0ff 100644
--- a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/search/AtsSearchResultsView.java
+++ b/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/search/AtsSearchResultsView.java
@@ -11,7 +11,7 @@
package org.eclipse.osee.ats.view.web.search;
import org.eclipse.osee.ats.api.components.AtsSearchHeaderComponentInterface;
-import org.eclipse.osee.ats.api.search.AtsWebSearchPresenter;
+import org.eclipse.osee.ats.api.search.AtsSearchPresenter;
import org.eclipse.osee.ats.view.web.AtsAppData;
import org.eclipse.osee.ats.view.web.components.AtsSearchHeaderComponent;
import org.eclipse.osee.display.view.web.search.OseeSearchHeaderComponent;
@@ -23,7 +23,7 @@ import org.eclipse.osee.display.view.web.search.OseeSearchResultsView;
@SuppressWarnings("serial")
public class AtsSearchResultsView extends OseeSearchResultsView {
- private final AtsWebSearchPresenter atsBackend;
+ private final AtsSearchPresenter atsBackend;
public AtsSearchResultsView() {
super();
diff --git a/plugins/org.eclipse.osee.orcs.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.core/META-INF/MANIFEST.MF
index eb37298bcab..782685c414c 100644
--- a/plugins/org.eclipse.osee.orcs.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.orcs.core/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.orcs.core
Bundle-Version: 0.9.9.qualifier
Bundle-Vendor: Eclipse Open System Engineering Environment
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Service-Component: OSGI-INF/*.xml
+Service-Component: OSGI-INF/*.xml, OSGI-INF/orcs.api.xml
Import-Package: org.eclipse.osee.framework.core.data,
org.eclipse.osee.framework.core.enums,
org.eclipse.osee.framework.core.exception,
diff --git a/plugins/org.eclipse.osee.orcs.core/OSGI-INF/orcs.api.xml b/plugins/org.eclipse.osee.orcs.core/OSGI-INF/orcs.api.xml
new file mode 100644
index 00000000000..854b34cb5b9
--- /dev/null
+++ b/plugins/org.eclipse.osee.orcs.core/OSGI-INF/orcs.api.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.osee.orcs.core.internal.OrcsApiImpl">
+ <implementation class="org.eclipse.osee.orcs.core.internal.OrcsApiImpl"/>
+ <service>
+ <provide interface="org.eclipse.osee.orcs.OseeApi"/>
+ </service>
+</scr:component>
diff --git a/plugins/org.eclipse.osee.orcs.core/build.properties b/plugins/org.eclipse.osee.orcs.core/build.properties
index 451722d7166..dc73b148405 100644
--- a/plugins/org.eclipse.osee.orcs.core/build.properties
+++ b/plugins/org.eclipse.osee.orcs.core/build.properties
@@ -1,8 +1,8 @@
-source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
OSGI-INF/
+source.. = src/
additional.bundles = org.eclipse.osee.logger,\
org.eclipse.osee.orcs,\
org.eclipse.osee.framework.core,\
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/OrcsApiImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/OrcsApiImpl.java
new file mode 100644
index 00000000000..6f1687f6015
--- /dev/null
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/OrcsApiImpl.java
@@ -0,0 +1,19 @@
+/*
+ * Created on Oct 10, 2011
+ *
+ * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE
+ */
+package org.eclipse.osee.orcs.core.internal;
+
+import org.eclipse.osee.orcs.ApplicationContext;
+import org.eclipse.osee.orcs.OseeApi;
+import org.eclipse.osee.orcs.search.QueryFactory;
+
+public class OrcsApiImpl implements OseeApi {
+
+ @Override
+ public QueryFactory getQueryFactory(ApplicationContext context) {
+ return null;
+ }
+
+}
diff --git a/plugins/org.eclipse.osee.x.server.parent/pom.xml b/plugins/org.eclipse.osee.x.server.parent/pom.xml
index 98a08f0f4ef..2ffd4eb8831 100644
--- a/plugins/org.eclipse.osee.x.server.parent/pom.xml
+++ b/plugins/org.eclipse.osee.x.server.parent/pom.xml
@@ -23,11 +23,14 @@
<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>
<module>../../plugins/org.eclipse.osee.display.presenter.mocks</module>
<module>../../plugins/org.eclipse.osee.display.presenter.test</module>
+ <module>../../plugins/org.eclipse.osee.ats.api</module>
+ <module>../../plugins/org.eclipse.osee.ats.view.web</module>
+ <module>../../plugins/org.eclipse.osee.ats.presenter</module>
+
<module>../../plugins/org.eclipse.osee.orcs</module>
<module>../../plugins/org.eclipse.osee.orcs.mock</module>
<module>../../plugins/org.eclipse.osee.orcs.core</module>

Back to the top