Merge "Uninstall action for Ogee"
diff --git a/org.eclipse.ogee.parent/pom.xml b/org.eclipse.ogee.parent/pom.xml
index 21f72e0..bfac32c 100644
--- a/org.eclipse.ogee.parent/pom.xml
+++ b/org.eclipse.ogee.parent/pom.xml
@@ -116,7 +116,6 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
- <!-- <version>${ldi.tycho-parent.tycho-version}</version> -->
<version>${tycho-version}</version>
<configuration>
<target>
@@ -201,10 +200,6 @@
</snapshotRepository>
</distributionManagement>
- <!-- <profiles> <profile> <id>release.build</id> <activation> <property>
- <name>ldi.releaseBuild</name> </property> </activation> <properties> <maven.test.skip>true</maven.test.skip>
- </properties> </profile> </profiles> -->
-
<pluginRepositories>
<pluginRepository>
<id>cbi</id>
diff --git a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructAssociationEnds.java b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructAssociationEnds.java
index 22cb261..648ae57 100644
--- a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructAssociationEnds.java
+++ b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructAssociationEnds.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2015 SAP SE.
+ * 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:
+ *
+ *******************************************************************************/
package org.eclipse.ogee.utils.olingo.parser;
import java.util.List;
diff --git a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructAssociationSetEnds.java b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructAssociationSetEnds.java
index b400c1f..eae204f 100644
--- a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructAssociationSetEnds.java
+++ b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructAssociationSetEnds.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2015 SAP SE.
+ * 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:
+ *
+ *******************************************************************************/
package org.eclipse.ogee.utils.olingo.parser;
import java.util.List;
diff --git a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructAssociationSets.java b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructAssociationSets.java
index 12e0275..36bfe81 100644
--- a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructAssociationSets.java
+++ b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructAssociationSets.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2015 SAP SE.
+ * 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:
+ *
+ *******************************************************************************/
package org.eclipse.ogee.utils.olingo.parser;
import java.util.ArrayList;
diff --git a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructAssociations.java b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructAssociations.java
index b2b4653..0b5906a 100644
--- a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructAssociations.java
+++ b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructAssociations.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2015 SAP SE.
+ * 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:
+ *
+ *******************************************************************************/
package org.eclipse.ogee.utils.olingo.parser;
import java.util.ArrayList;
diff --git a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructComplexType.java b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructComplexType.java
index 205d4d8..b9c421a 100644
--- a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructComplexType.java
+++ b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructComplexType.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2015 SAP SE.
+ * 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:
+ *
+ *******************************************************************************/
package org.eclipse.ogee.utils.olingo.parser;
import java.util.List;
diff --git a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructDocumentation.java b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructDocumentation.java
index 57d546a..fa611fc 100644
--- a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructDocumentation.java
+++ b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructDocumentation.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2015 SAP SE.
+ * 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:
+ *
+ *******************************************************************************/
package org.eclipse.ogee.utils.olingo.parser;
import org.eclipse.ogee.client.model.edmx.Documentation;
diff --git a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructEntityContainer.java b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructEntityContainer.java
index 0d94143..174c552 100644
--- a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructEntityContainer.java
+++ b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructEntityContainer.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2015 SAP SE.
+ * 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:
+ *
+ *******************************************************************************/
package org.eclipse.ogee.utils.olingo.parser;
import java.util.List;
diff --git a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructEntitySets.java b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructEntitySets.java
index b75c542..9c8018d 100644
--- a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructEntitySets.java
+++ b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructEntitySets.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2015 SAP SE.
+ * 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:
+ *
+ *******************************************************************************/
package org.eclipse.ogee.utils.olingo.parser;
import java.util.List;
diff --git a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructEntityType.java b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructEntityType.java
index 8173b96..6475168 100644
--- a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructEntityType.java
+++ b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructEntityType.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2015 SAP SE.
+ * 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:
+ *
+ *******************************************************************************/
package org.eclipse.ogee.utils.olingo.parser;
import java.util.List;
diff --git a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructFunctionImport.java b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructFunctionImport.java
index 2ec7c01..5e8ad02 100644
--- a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructFunctionImport.java
+++ b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructFunctionImport.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2015 SAP SE.
+ * 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:
+ *
+ *******************************************************************************/
package org.eclipse.ogee.utils.olingo.parser;
import java.util.List;
diff --git a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructFunctionImportParameter.java b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructFunctionImportParameter.java
index 109680c..0dd5e4f 100644
--- a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructFunctionImportParameter.java
+++ b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructFunctionImportParameter.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2015 SAP SE.
+ * 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:
+ *
+ *******************************************************************************/
package org.eclipse.ogee.utils.olingo.parser;
import java.util.List;
diff --git a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructKey.java b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructKey.java
index f5b0b3b..5f4a132 100644
--- a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructKey.java
+++ b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructKey.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2015 SAP SE.
+ * 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:
+ *
+ *******************************************************************************/
package org.eclipse.ogee.utils.olingo.parser;
import java.util.List;
diff --git a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructNavigationProperty.java b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructNavigationProperty.java
index d154e88..ba5d902 100644
--- a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructNavigationProperty.java
+++ b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructNavigationProperty.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2015 SAP SE.
+ * 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:
+ *
+ *******************************************************************************/
package org.eclipse.ogee.utils.olingo.parser;
import java.util.List;
diff --git a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructPropRef.java b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructPropRef.java
index bfce67a..60b31aa 100644
--- a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructPropRef.java
+++ b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructPropRef.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2015 SAP SE.
+ * 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:
+ *
+ *******************************************************************************/
package org.eclipse.ogee.utils.olingo.parser;
import java.util.List;
diff --git a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructProperty.java b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructProperty.java
index 82363a1..2a30bcd 100644
--- a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructProperty.java
+++ b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructProperty.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2015 SAP SE.
+ * 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:
+ *
+ *******************************************************************************/
package org.eclipse.ogee.utils.olingo.parser;
import java.util.List;
@@ -41,8 +51,8 @@
property.setName(propertyOlingo.getName());
if (null != propertyOlingo.getCustomizableFeedMappings()) {
- property.setmFC_KeepInContent(propertyOlingo
- .getCustomizableFeedMappings().getFcKeepInContent());
+ Boolean fcKeepInContent = propertyOlingo.getCustomizableFeedMappings().getFcKeepInContent();
+ if (fcKeepInContent != null) property.setmFC_KeepInContent(fcKeepInContent);
if (null != propertyOlingo.getCustomizableFeedMappings()
.getFcTargetPath()) {
property.setmFC_TargetPath(propertyOlingo
diff --git a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructReferentialConstraint.java b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructReferentialConstraint.java
index 951cee6..22cff78 100644
--- a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructReferentialConstraint.java
+++ b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructReferentialConstraint.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2015 SAP SE.
+ * 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:
+ *
+ *******************************************************************************/
package org.eclipse.ogee.utils.olingo.parser;
import org.eclipse.ogee.client.model.edmx.Dependent;
diff --git a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructUsing.java b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructUsing.java
index 6535893..32edf74 100644
--- a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructUsing.java
+++ b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConstructUsing.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2015 SAP SE.
+ * 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:
+ *
+ *******************************************************************************/
package org.eclipse.ogee.utils.olingo.parser;
import java.util.List;
diff --git a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConvertOlingoEdmToEdmx.java b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConvertOlingoEdmToEdmx.java
index 115eaf2..0af4fde 100644
--- a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConvertOlingoEdmToEdmx.java
+++ b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/olingo/parser/ConvertOlingoEdmToEdmx.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2015 SAP SE.
+ * 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:
+ *
+ *******************************************************************************/
package org.eclipse.ogee.utils.olingo.parser;
import java.util.List;
