sort pom issues and license header issues fixed

Signed-off-by: rnavagamuwa <[email protected]>
eclipse-che · Aug 18, 2016 · bb0747e · bb0747e
1 parent 3dc8108
commit bb0747e
Show file tree

Hide file tree

Showing 16 changed files with 70 additions and 79 deletions.
diff --git a/assembly/assembly-ide-war/pom.xml b/assembly/assembly-ide-war/pom.xml
@@ -100,6 +100,10 @@
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-ext-dashboard-client</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-flux-live-edit</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-gdb-ide</artifactId>
@@ -216,10 +220,6 @@
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-web-ext-web</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-flux-live-edit</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.google.gwt</groupId>
             <artifactId>gwt-user</artifactId>

diff --git a/ide/che-core-ide-stacks/src/main/resources/images/type-flux.svg b/ide/che-core-ide-stacks/src/main/resources/images/type-flux.svg
diff --git a/plugins/plugin-pair-programming/che-plugin-flux-pair-programming/pom.xml b/plugins/plugin-pair-programming/che-plugin-flux-pair-programming/pom.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--                                                                                                                                                             
-                                                                                                                                                                 
-    Copyright (c) 2015 Serli SAS.                                                                                                                                
-    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:                                                                                                                                                
-      Sun Seng David TAN <[email protected]> - initial API and implementation
-      Randika Navagamuwa <[email protected]> - initial API and implementation
-                                                                                                                                                                 
+<!--
+
+    Copyright (c) 2012-2016 Codenvy, S.A.
+    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:
+      Codenvy, S.A. - initial API and implementation
+
 -->
 <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>

diff --git a/...programming/src/main/java/org/eclipse/che/ide/flux/liveedit/CheFluxLiveEditExtension.java b/...programming/src/main/java/org/eclipse/che/ide/flux/liveedit/CheFluxLiveEditExtension.java
@@ -1,13 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2016 Serli SAS.
+ * Copyright (c) 2012-2016 Codenvy, S.A.
  * 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:
- *   Sun Seng David TAN <[email protected]> - initial API and implementation
- *   Randika Navagamuwa <[email protected]> - initial API and implementation
+ *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
 package org.eclipse.che.ide.flux.liveedit;
 

diff --git a/...ming/src/main/java/org/eclipse/che/ide/flux/liveedit/CursorHandlerForPairProgramming.java b/...ming/src/main/java/org/eclipse/che/ide/flux/liveedit/CursorHandlerForPairProgramming.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2016 www.rnavagamuwa.com
+ * Copyright (c) 2012-2016 Codenvy, S.A.
  * 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:
- *   Randika Navagamuwa <[email protected]> - initial API and implementation
+ *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
 package org.eclipse.che.ide.flux.liveedit;
 

diff --git a/...amming/src/main/java/org/eclipse/che/ide/flux/liveedit/CursorModelForPairProgramming.java b/...amming/src/main/java/org/eclipse/che/ide/flux/liveedit/CursorModelForPairProgramming.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2016 www.rnavagamuwa.com
+ * Copyright (c) 2012-2016 Codenvy, S.A.
  * 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:
- *   Randika Navagamuwa <[email protected]> - initial API and implementation
+ *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
 package org.eclipse.che.ide.flux.liveedit;
 

diff --git a/...-pair-programming/src/main/java/org/eclipse/che/ide/flux/liveedit/FluxMessageBuilder.java b/...-pair-programming/src/main/java/org/eclipse/che/ide/flux/liveedit/FluxMessageBuilder.java
@@ -1,13 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2016 Serli SAS.
+ * Copyright (c) 2012-2016 Codenvy, S.A.
  * 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:
- *   Sun Seng David TAN <[email protected]> - initial API and implementation
- *   Randika Navagamuwa <[email protected]> - initial API and implementation
+ *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
 package org.eclipse.che.ide.flux.liveedit;
 
@@ -20,7 +19,7 @@
  * Che product information constant.
  *
  * @author Randika Navagamuwa
- * @author Sun
+ * @author Sun Seng David TAN
  */
 public class FluxMessageBuilder {
     private String fullPath;

diff --git a/.../src/main/java/org/eclipse/che/ide/flux/liveedit/FluxResourceChangedEventDataOverlay.java b/.../src/main/java/org/eclipse/che/ide/flux/liveedit/FluxResourceChangedEventDataOverlay.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2016 Serli SAS.
+ * Copyright (c) 2012-2016 Codenvy, S.A.
  * 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:
- *   Sun Seng David TAN <[email protected]> - initial API and implementation
+ *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
 package org.eclipse.che.ide.flux.liveedit;
 

diff --git a/...che-plugin-flux-pair-programming/src/main/java/org/eclipse/che/ide/socketio/Consumer.java b/...che-plugin-flux-pair-programming/src/main/java/org/eclipse/che/ide/socketio/Consumer.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2016 Serli SAS.
+ * Copyright (c) 2012-2016 Codenvy, S.A.
  * 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:
- *   Sun Seng David TAN <[email protected]> - initial API and implementation
+ *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
 package org.eclipse.che.ide.socketio;
 

diff --git a/.../che-plugin-flux-pair-programming/src/main/java/org/eclipse/che/ide/socketio/Message.java b/.../che-plugin-flux-pair-programming/src/main/java/org/eclipse/che/ide/socketio/Message.java
@@ -1,13 +1,14 @@
 /*******************************************************************************
- * Copyright (c) 2016 Serli SAS.
+ * Copyright (c) 2012-2016 Codenvy, S.A.
  * 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:
- *   Sun Seng David TAN <[email protected]> - initial API and implementation
- *******************************************************************************/package org.eclipse.che.ide.socketio;
+ *   Codenvy, S.A. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.che.ide.socketio;
 
 import com.google.gwt.core.client.JavaScriptObject;
 

diff --git a/...gin-flux-pair-programming/src/main/java/org/eclipse/che/ide/socketio/SocketIOOverlay.java b/...gin-flux-pair-programming/src/main/java/org/eclipse/che/ide/socketio/SocketIOOverlay.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2016 Serli SAS.
+ * Copyright (c) 2012-2016 Codenvy, S.A.
  * 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:
- *   Sun Seng David TAN <[email protected]> - initial API and implementation
+ *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
 package org.eclipse.che.ide.socketio;
 

diff --git a/...n-flux-pair-programming/src/main/java/org/eclipse/che/ide/socketio/SocketIOResources.java b/...n-flux-pair-programming/src/main/java/org/eclipse/che/ide/socketio/SocketIOResources.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2016 Serli SAS.
+ * Copyright (c) 2012-2016 Codenvy, S.A.
  * 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:
- *   Sun Seng David TAN <[email protected]> - initial API and implementation
+ *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
 package org.eclipse.che.ide.socketio;
 

diff --git a/...lugin-flux-pair-programming/src/main/java/org/eclipse/che/ide/socketio/SocketOverlay.java b/...lugin-flux-pair-programming/src/main/java/org/eclipse/che/ide/socketio/SocketOverlay.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2016 Serli SAS.
+ * Copyright (c) 2012-2016 Codenvy, S.A.
  * 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:
- *   Sun Seng David TAN <[email protected]> - initial API and implementation
+ *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
 package org.eclipse.che.ide.socketio;
 

diff --git a/...ing/src/main/resources/org/eclipse/che/ide/flux/liveedit/CheFluxLiveEditExtension.gwt.xml b/...ing/src/main/resources/org/eclipse/che/ide/flux/liveedit/CheFluxLiveEditExtension.gwt.xml
@@ -1,13 +1,13 @@
 <!--
 
-    Copyright (c) 2015 Serli SAS.
+    Copyright (c) 2012-2016 Codenvy, S.A.
     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:
-      Sun Seng David TAN <[email protected]> - initial API and implementation
+      Codenvy, S.A. - initial API and implementation
 
 -->
 <module>

diff --git a/plugins/plugin-pair-programming/pom.xml b/plugins/plugin-pair-programming/pom.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2016 www.rnavagamuwa.com
+    Copyright (c) 2012-2016 Codenvy, S.A.
     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:
-      Randika Navagamuwa <[email protected]> - initial API and implementation
+      Codenvy, S.A. - initial API and implementation
 
 -->
 <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">

diff --git a/pom.xml b/pom.xml
@@ -369,6 +369,11 @@
                 <artifactId>che-plugin-ext-dashboard-client</artifactId>
                 <version>${che.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.plugin</groupId>
+                <artifactId>che-plugin-flux-live-edit</artifactId>
+                <version>${che.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-gdb-ide</artifactId>
@@ -675,11 +680,6 @@
                 <artifactId>che-sample-plugin-json-server</artifactId>
                 <version>${che.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.eclipse.che.plugin</groupId>
-                <artifactId>che-plugin-flux-live-edit</artifactId>
-                <version>${che.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.sample</groupId>
                 <artifactId>che-sample-plugin-json-shared</artifactId>