summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.idea/workspace.xml131
-rw-r--r--dcae_dmaapbc_client/pom.xml3
-rw-r--r--dcae_dmaapbc_model/pom.xml5
-rw-r--r--dcae_dmaapbc_webapp/pom.xml8
-rw-r--r--pom.xml23
5 files changed, 88 insertions, 82 deletions
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index def7174..1349b74 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,9 +3,6 @@
<component name="ChangeListManager">
<list default="true" id="5ec58a98-eb4f-4bbc-9d03-30da5dbed091" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/dcae_dmaapbc_client/pom.xml" afterPath="$PROJECT_DIR$/dcae_dmaapbc_client/pom.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/dcae_dmaapbc_model/pom.xml" afterPath="$PROJECT_DIR$/dcae_dmaapbc_model/pom.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/dcae_dmaapbc_webapp/pom.xml" afterPath="$PROJECT_DIR$/dcae_dmaapbc_webapp/pom.xml" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
@@ -26,29 +23,31 @@
<file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dcae_dmaapbc_client/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="374">
- <caret line="22" column="0" lean-forward="false" selection-start-line="22" selection-start-column="0" selection-end-line="33" selection-end-column="21" />
+ <state relative-caret-position="3060">
+ <caret line="180" column="28" lean-forward="false" selection-start-line="180" selection-start-column="28" selection-end-line="180" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
+ <file leaf-file-name="pom.xml" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/dcae_dmaapbc_webapp/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="714">
+ <state relative-caret-position="17">
<caret line="42" column="21" lean-forward="false" selection-start-line="42" selection-start-column="21" selection-end-line="42" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="pom.xml" pinned="false" current-in-tab="true">
+ <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dcae_dmaapbc_model/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1955">
- <caret line="115" column="29" lean-forward="false" selection-start-line="115" selection-start-column="29" selection-end-line="115" selection-end-column="29" />
- <folding />
+ <state relative-caret-position="1700">
+ <caret line="100" column="28" lean-forward="false" selection-start-line="100" selection-start-column="28" selection-end-line="100" selection-end-column="28" />
+ <folding>
+ <marker date="1487026261378" expanded="true" signature="3253:3262" ph="..." />
+ </folding>
</state>
</provider>
</entry>
@@ -66,8 +65,8 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
- <option value="$PROJECT_DIR$/dcae_dmaapbc_client/pom.xml" />
<option value="$PROJECT_DIR$/dcae_dmaapbc_model/pom.xml" />
+ <option value="$PROJECT_DIR$/dcae_dmaapbc_client/pom.xml" />
<option value="$PROJECT_DIR$/dcae_dmaapbc_webapp/pom.xml" />
</list>
</option>
@@ -75,8 +74,8 @@
<component name="ProjectFrameBounds">
<option name="x" value="-8" />
<option name="y" value="-8" />
- <option name="width" value="1936" />
- <option name="height" value="1056" />
+ <option name="width" value="1616" />
+ <option name="height" value="1176" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
@@ -93,7 +92,8 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
- <pane id="Scope" />
+ <pane id="PackagesPane" />
+ <pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -106,52 +106,9 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="dmaapbc" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="dmaapbc" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="dcae_dmaapbc_webapp" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="dmaapbc" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="dmaapbc" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="dcae_dmaapbc_model" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="dmaapbc" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="dmaapbc" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="dcae_dmaapbc_client" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
</subPane>
</pane>
- <pane id="PackagesPane" />
- <pane id="Scratches" />
+ <pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -386,7 +343,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+ <frame x="-8" y="-8" width="1616" height="1176" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -401,10 +358,10 @@
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+ <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.29146692" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20948827" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+ <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25578406" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="BPMNPalette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -432,11 +389,36 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
+ <entry file="file://$PROJECT_DIR$/dcae_dmaapbc_client/pom.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="3060">
+ <caret line="180" column="28" lean-forward="false" selection-start-line="180" selection-start-column="28" selection-end-line="180" selection-end-column="28" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/dcae_dmaapbc_webapp/pom.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="714">
+ <caret line="42" column="21" lean-forward="false" selection-start-line="42" selection-start-column="21" selection-end-line="42" selection-end-column="21" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/dcae_dmaapbc_model/pom.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="1700">
+ <caret line="100" column="28" lean-forward="false" selection-start-line="100" selection-start-column="28" selection-end-line="100" selection-end-column="28" />
+ <folding>
+ <marker date="1487026261378" expanded="true" signature="3253:3262" ph="..." />
+ </folding>
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/LICENSE.txt">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- <folding />
</state>
</provider>
</entry>
@@ -444,30 +426,31 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/dcae_dmaapbc_client/pom.xml">
+ <entry file="file://$PROJECT_DIR$/dcae_dmaapbc_model/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="374">
- <caret line="22" column="0" lean-forward="false" selection-start-line="22" selection-start-column="0" selection-end-line="33" selection-end-column="21" />
- <folding />
+ <state relative-caret-position="1700">
+ <caret line="100" column="28" lean-forward="false" selection-start-line="100" selection-start-column="28" selection-end-line="100" selection-end-column="28" />
+ <folding>
+ <marker date="1487026261378" expanded="true" signature="3253:3262" ph="..." />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/dcae_dmaapbc_webapp/pom.xml">
+ <entry file="file://$PROJECT_DIR$/dcae_dmaapbc_client/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="714">
- <caret line="42" column="21" lean-forward="false" selection-start-line="42" selection-start-column="21" selection-end-line="42" selection-end-column="21" />
+ <state relative-caret-position="3060">
+ <caret line="180" column="28" lean-forward="false" selection-start-line="180" selection-start-column="28" selection-end-line="180" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/dcae_dmaapbc_model/pom.xml">
+ <entry file="file://$PROJECT_DIR$/dcae_dmaapbc_webapp/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1955">
- <caret line="115" column="29" lean-forward="false" selection-start-line="115" selection-start-column="29" selection-end-line="115" selection-end-column="29" />
+ <state relative-caret-position="17">
+ <caret line="42" column="21" lean-forward="false" selection-start-line="42" selection-start-column="21" selection-end-line="42" selection-end-column="21" />
<folding />
</state>
</provider>
diff --git a/dcae_dmaapbc_client/pom.xml b/dcae_dmaapbc_client/pom.xml
index 977d3b1..8829f68 100644
--- a/dcae_dmaapbc_client/pom.xml
+++ b/dcae_dmaapbc_client/pom.xml
@@ -179,9 +179,6 @@
</dependencies>
<distributionManagement>
- <!-- Publish jars to the RackSpace Maven Central Repository. Host name
- is INCOMPLETE; /etc/hosts must resolve to 162.242.254.138. The id tags below
- must match a .m2/settings.xml/servers/server/id -->
<repository>
<id>ecomp-releases</id>
<name>OpenECOMP - Release Repository</name>
diff --git a/dcae_dmaapbc_model/pom.xml b/dcae_dmaapbc_model/pom.xml
index 0b840e7..9622e8d 100644
--- a/dcae_dmaapbc_model/pom.xml
+++ b/dcae_dmaapbc_model/pom.xml
@@ -99,11 +99,6 @@
</build>
<distributionManagement>
- <!--
- Publish jars to the RackSpace Maven Central Repository.
- Host name is INCOMPLETE; /etc/hosts must resolve to 162.242.254.138.
- The id tags below must match a .m2/settings.xml/servers/server/id
- -->
<repository>
<id>ecomp-releases</id>
<name>OpenECOMP - Release Repository</name>
diff --git a/dcae_dmaapbc_webapp/pom.xml b/dcae_dmaapbc_webapp/pom.xml
index 2732e8c..fb877e8 100644
--- a/dcae_dmaapbc_webapp/pom.xml
+++ b/dcae_dmaapbc_webapp/pom.xml
@@ -72,6 +72,14 @@
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.8</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>com.blackducksoftware.integration</groupId>
<artifactId>hub-maven-plugin</artifactId>
<version>1.4.0</version>
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..322418e
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.openecomp.ui.dmaapbc</groupId>
+ <artifactId>ui-dmaapbc-project</artifactId>
+ <packaging>pom</packaging>
+ <!-- NOTE This value will not be picked from the property tag below, pass it as -Drelease.version="" when doing mvn deploy -->
+ <version>1.0.0</version>
+ <name>DMaaP Bus Controller UI (parent)</name>
+ <url>https://wiki/display/EcompPortal</url>
+ <description>DCAE DMaaP Bus Controller GUI based on the ECOMP Portal Open-Source SDK</description>
+ <scm>
+ <url>https://gitlab/projects/ST_DBPA/repos/dcae_dmaapbc_webapp/browse</url>
+ <developerConnection>scm:git:ssh://git@gitlab/st_dbpa/dcae_dmaapbc_webapp.git</developerConnection>
+ </scm>
+
+ <modules>
+ <module>dcae_dmaapbc_model</module>
+ <module>dcae_dmaapbc_client</module>
+ <module>dcae_dmaapbc_webapp</module>
+ </modules>
+
+</project>