Merge "Make the Google login an independet plugin." into idea133

4 files changed, 49 insertions, 19 deletions

diff --git a/google-cloud-tools.iml b/google-cloud-tools.iml
index 2613b4a..e07f852 100644
--- a/google-cloud-tools.iml
+++ b/google-cloud-tools.iml
@@ -26,7 +26,6 @@
     <orderEntry type="module" module-name="gradle" />
     <orderEntry type="module" module-name="jetgroovy" />
     <orderEntry type="library" scope="TEST" name="mockito" level="project" />
-    <orderEntry type="module" module-name="login" />
     <orderEntry type="module-library">
       <library>
         <CLASSES>
diff --git a/login/src/META-INF/plugin.xml b/login/src/META-INF/plugin.xml
new file mode 100644
index 0000000..1bd7803
--- /dev/null
+++ b/login/src/META-INF/plugin.xml
@@ -0,0 +1,48 @@
+<!--
+  ~ Copyright (C) 2014 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<idea-plugin version="2">
+  <id>com.google.gct.login</id>
+  <name>Google Login</name>
+  <version>1.0</version>
+  <vendor>Google</vendor>
+
+  <description>Provides Google authentication support.</description>
+
+  <!-- please see http://confluence.jetbrains.net/display/IDEADEV/Build+Number+Ranges for description -->
+  <idea-version since-build="107.105"/>
+
+  <application-components>
+  </application-components>
+
+  <project-components>
+  </project-components>
+
+  <actions>
+    <action id="GoogleLogin.LoginService"
+            class="com.google.gct.login.ui.GoogleLoginAction"
+            text="Google Login">
+      <add-to-group group-id="MainToolBar" anchor="first"  />
+    </action>
+  </actions>
+
+  <extensions defaultExtensionNs="com.intellij">
+  </extensions>
+
+  <extensionPoints>
+    <extensionPoint name="googleLoginListener" interface="com.google.gct.login.GoogleLoginListener"/>
+  </extensionPoints>
+
+</idea-plugin>
\ No newline at end of file
diff --git a/login/src/com/google/gct/login/GoogleLoginListener.java b/login/src/com/google/gct/login/GoogleLoginListener.java
index 11c4f4c..8964fe5 100644
--- a/login/src/com/google/gct/login/GoogleLoginListener.java
+++ b/login/src/com/google/gct/login/GoogleLoginListener.java
@@ -23,5 +23,5 @@ import com.intellij.openapi.extensions.ExtensionPointName;
  */
 public interface GoogleLoginListener extends LoginListener {
   public static ExtensionPointName<GoogleLoginListener> EP_NAME =
-    new ExtensionPointName<GoogleLoginListener>("com.google.gct.googleLoginListener");
+    new ExtensionPointName<GoogleLoginListener>("com.google.gct.login.googleLoginListener");
 }
diff --git a/src/META-INF/plugin.xml b/src/META-INF/plugin.xml
index 72f3034..c34f079 100644
--- a/src/META-INF/plugin.xml
+++ b/src/META-INF/plugin.xml
@@ -121,23 +121,6 @@
       <reference id="GoogleCloudTools.GenerateEndpoint"/>
       <add-to-group group-id="ToolsMenu" anchor="last"/>
     </group>
-
-    <!-- Google Login -->
-    <!--
-    <action id="GoogleLogin.UserProfile"
-            class="com.google.gct.login.ui.GoogleLoginAction"
-            text="Google Login">
-      <add-to-group group-id="MainToolBar" anchor="first"  />
-    </action>
-    -->
-
   </actions>
 
-  <!-- Extension point for Google Login Listener -->
-  <!--
-  <extensionPoints>
-    <extensionPoint name="googleLoginListener" interface="com.google.gct.login.GoogleLoginListener"/>
-  </extensionPoints>
-  -->
-
 </idea-plugin>