Fix repositore stricure. Fix packaging GWT App

lu-chi · Mar 31, 2015 · fbe0a7e · fbe0a7e
2 parents 9d950d7 + 09af05d
commit fbe0a7e
Show file tree

Hide file tree

Showing 307 changed files with 140 additions and 14,139 deletions.
diff --git a/sdk/README.md → README.md b/sdk/README.md → README.md
diff --git a/sdk/assembly-ide/pom.xml → assembly-ide/pom.xml b/sdk/assembly-ide/pom.xml → assembly-ide/pom.xml
@@ -14,13 +14,13 @@
 <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>
-        <artifactId>codenvy-sdk-parent</artifactId>
+        <artifactId>che-sdk-parent</artifactId>
         <groupId>org.eclipse.che.sdk</groupId>
         <version>3.9.0-SNAPSHOT</version>
     </parent>
     <artifactId>assembly-ide</artifactId>
     <packaging>war</packaging>
-    <name>Codenvy SDK :: Application</name>
+    <name>Che SDK :: Compiling GWT Application</name>
     <properties>
         <generated.sources.directory>${project.build.directory}/generated-sources/gen</generated.sources.directory>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -33,67 +33,67 @@
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
-            <artifactId>codenvy-api-account</artifactId>
+            <artifactId>che-core-api-account</artifactId>
             <version>${che.core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
-            <artifactId>codenvy-api-account-gwt-client</artifactId>
+            <artifactId>che-core-api-factory</artifactId>
             <version>${che.core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
-            <artifactId>codenvy-api-analytics-gwt-client</artifactId>
+            <artifactId>che-core-api-user</artifactId>
             <version>${che.core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
-            <artifactId>codenvy-api-factory</artifactId>
+            <artifactId>che-core-client-gwt-account</artifactId>
             <version>${che.core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
-            <artifactId>codenvy-api-factory-gwt-client</artifactId>
+            <artifactId>che-core-client-gwt-analytics</artifactId>
             <version>${che.core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
-            <artifactId>codenvy-api-project-gwt-client</artifactId>
+            <artifactId>che-core-client-gwt-commons</artifactId>
             <version>${che.core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
-            <artifactId>codenvy-api-user</artifactId>
+            <artifactId>che-core-client-gwt-factory</artifactId>
             <version>${che.core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
-            <artifactId>codenvy-api-user-gwt-client</artifactId>
+            <artifactId>che-core-client-gwt-project</artifactId>
             <version>${che.core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
-            <artifactId>codenvy-api-vfs-gwt-client</artifactId>
+            <artifactId>che-core-client-gwt-user</artifactId>
             <version>${che.core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
-            <artifactId>codenvy-api-workspace-gwt-client</artifactId>
+            <artifactId>che-core-client-gwt-vfs</artifactId>
             <version>${che.core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
-            <artifactId>che-plugin-builder-ext-builder</artifactId>
+            <artifactId>che-core-client-gwt-workspace</artifactId>
             <version>${che.core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
-            <artifactId>che-plugin-web-ext-web</artifactId>
+            <artifactId>che-core-commons-gwt</artifactId>
             <version>${che.core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
-            <artifactId>codenvy-gwt-client-commons</artifactId>
+            <artifactId>che-core-ide-api</artifactId>
             <version>${che.core.version}</version>
         </dependency>
         <dependency>
@@ -103,75 +103,85 @@
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
-            <artifactId>codenvy-ide-jseditor</artifactId>
+            <artifactId>che-core-ide-jseditor</artifactId>
             <version>${che.core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>codenvy-ext-ant</artifactId>
+            <artifactId>che-plugin-builder-ext-builder</artifactId>
             <version>${che.plugins.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>codenvy-ext-debugger-java</artifactId>
+            <artifactId>che-plugin-codemirror-editorwidget</artifactId>
             <version>${che.plugins.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>tools</artifactId>
-                    <groupId>sun.jdt</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>codenvy-ext-git</artifactId>
+            <artifactId>che-plugin-git-ext-git</artifactId>
             <version>${che.plugins.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>codenvy-ext-github</artifactId>
+            <artifactId>che-plugin-github-ext-github</artifactId>
             <version>${che.plugins.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>codenvy-ext-java</artifactId>
+            <artifactId>che-plugin-java-ext-ant</artifactId>
             <version>${che.plugins.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>codenvy-ext-maven</artifactId>
+            <artifactId>che-plugin-java-ext-debugger-java</artifactId>
             <version>${che.plugins.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>tools</artifactId>
+                    <groupId>sun.jdt</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>codenvy-plugin-java-jseditor</artifactId>
+            <artifactId>che-plugin-java-ext-java</artifactId>
             <version>${che.plugins.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>codenvy-plugin-runner</artifactId>
+            <artifactId>che-plugin-java-ext-maven</artifactId>
             <version>${che.plugins.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>plugin-editor-codemirror</artifactId>
+            <artifactId>che-plugin-java-jseditor</artifactId>
             <version>${che.plugins.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>plugin-editor-orion</artifactId>
+            <artifactId>che-plugin-orion-editor</artifactId>
             <version>${che.plugins.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.che.sdk</groupId>
-            <artifactId>codenvy-ext-plugins</artifactId>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-runner-ext-runner</artifactId>
+            <version>${che.plugins.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-sdk-env-local</artifactId>
             <version>${che.sdk.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.che.sdk</groupId>
-            <artifactId>codenvy-ide-env-local</artifactId>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-sdk-ext-plugins</artifactId>
             <version>${che.sdk.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-web-ext-web</artifactId>
+            <version>${che.plugins.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.google.gwt</groupId>
             <artifactId>gwt-user</artifactId>
@@ -180,19 +190,13 @@
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
-            <artifactId>codenvy-api-project</artifactId>
-            <version>${che.core.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.core</groupId>
-            <artifactId>codenvy-api-vfs</artifactId>
+            <artifactId>che-core-api-project</artifactId>
             <version>${che.core.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
-            <artifactId>codenvy-ide-client</artifactId>
+            <artifactId>che-core-api-vfs</artifactId>
             <version>${che.core.version}</version>
             <scope>provided</scope>
         </dependency>

diff --git a/...resources/org/eclipse/che/ide/IDE.gwt.xml → ...resources/org/eclipse/che/ide/IDE.gwt.xml b/...resources/org/eclipse/che/ide/IDE.gwt.xml → ...resources/org/eclipse/che/ide/IDE.gwt.xml
diff --git a/...ources/org/eclipse/che/ide/public/IDE.css → ...ources/org/eclipse/che/ide/public/IDE.css b/...ources/org/eclipse/che/ide/public/IDE.css → ...ources/org/eclipse/che/ide/public/IDE.css
diff --git a/sdk/assembly-ide/src/main/webapp/IDE.jsp → assembly-ide/src/main/webapp/IDE.jsp b/sdk/assembly-ide/src/main/webapp/IDE.jsp → assembly-ide/src/main/webapp/IDE.jsp
diff --git a/...yPlatform/src/main/webapp/WEB-INF/web.xml → assembly-ide/src/main/webapp/WEB-INF/web.xml b/...yPlatform/src/main/webapp/WEB-INF/web.xml → assembly-ide/src/main/webapp/WEB-INF/web.xml
diff --git a/...c/main/webapp/_app/browserNotSupported.js → ...c/main/webapp/_app/browserNotSupported.js b/...c/main/webapp/_app/browserNotSupported.js → ...c/main/webapp/_app/browserNotSupported.js
diff --git a/...m/src/main/webapp/_app/facebook-like.html → ...e/src/main/webapp/_app/facebook-like.html b/...m/src/main/webapp/_app/facebook-like.html → ...e/src/main/webapp/_app/facebook-like.html
diff --git a/...Platform/src/main/webapp/_app/favicon.ico → ...mbly-ide/src/main/webapp/_app/favicon.ico b/...Platform/src/main/webapp/_app/favicon.ico → ...mbly-ide/src/main/webapp/_app/favicon.ico
diff --git a/...orm/src/main/webapp/_app/google-like.html → ...ide/src/main/webapp/_app/google-like.html b/...orm/src/main/webapp/_app/google-like.html → ...ide/src/main/webapp/_app/google-like.html
diff --git a/...de/src/main/webapp/_app/logoCodenvy2x.png → ...de/src/main/webapp/_app/logoCodenvy2x.png b/...de/src/main/webapp/_app/logoCodenvy2x.png → ...de/src/main/webapp/_app/logoCodenvy2x.png
diff --git a/sdk/assembly-java-codeassistant/pom.xml → assembly-java-codeassistant/pom.xml b/sdk/assembly-java-codeassistant/pom.xml → assembly-java-codeassistant/pom.xml
@@ -14,7 +14,7 @@
 <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>
     <parent>
-        <artifactId>codenvy-sdk-parent</artifactId>
+        <artifactId>che-sdk-parent</artifactId>
         <groupId>org.eclipse.che.sdk</groupId>
         <version>3.9.0-SNAPSHOT</version>
     </parent>
@@ -33,13 +33,13 @@
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>codenvy-ext-java-codeassistant</artifactId>
+            <artifactId>che-plugin-java-ext-java-codeassistant</artifactId>
             <version>${che.plugins.version}</version>
             <type>jar</type>
         </dependency>
         <dependency>
             <groupId>org.eclipse.che.sdk</groupId>
-            <artifactId>codenvy-ide-env-local</artifactId>
+            <artifactId>che-plugin-sdk-env-local</artifactId>
             <version>${che.sdk.version}</version>
         </dependency>
     </dependencies>

diff --git a/...ide/ext/java/server/ApiServletModule.java → ...ide/ext/java/server/ApiServletModule.java b/...ide/ext/java/server/ApiServletModule.java → ...ide/ext/java/server/ApiServletModule.java
diff --git a/.../java/server/JavaCodeAssistantModule.java → .../java/server/JavaCodeAssistantModule.java b/.../java/server/JavaCodeAssistantModule.java → .../java/server/JavaCodeAssistantModule.java
diff --git a/...va-codeassistant-configuration.properties → ...va-codeassistant-configuration.properties b/...va-codeassistant-configuration.properties → ...va-codeassistant-configuration.properties
diff --git a/...k-api-war/src/main/webapp/WEB-INF/web.xml → ...assistant/src/main/webapp/WEB-INF/web.xml b/...k-api-war/src/main/webapp/WEB-INF/web.xml → ...assistant/src/main/webapp/WEB-INF/web.xml