Merge pull request #1 from GoogleCloudPlatform/benwu1 automerge: aeb16e1
automerge: ebea0fa
* commit 'ebea0fab0b8671cc9e362715e6b6a13ed87174df':
Adds root project and fixes some issues for local development.
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f192518
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/out
+.idea/workspace.xml
diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..4d80335
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+google-cloud-tools
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..3a595dc
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="CompilerConfiguration">
+ <option name="DEFAULT_COMPILER" value="Javac" />
+ <resourceExtensions />
+ <wildcardResourcePatterns>
+ <entry name="!?*.java" />
+ <entry name="!?*.form" />
+ <entry name="!?*.class" />
+ <entry name="!?*.groovy" />
+ <entry name="!?*.scala" />
+ <entry name="!?*.flex" />
+ <entry name="!?*.kt" />
+ <entry name="!?*.clj" />
+ </wildcardResourcePatterns>
+ <annotationProcessing>
+ <profile default="true" name="Default" enabled="false">
+ <processorPath useClasspath="true" />
+ </profile>
+ </annotationProcessing>
+ <bytecodeTargetLevel target="1.6" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
new file mode 100644
index 0000000..e7bedf3
--- /dev/null
+++ b/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,3 @@
+<component name="CopyrightManager">
+ <settings default="" />
+</component>
\ No newline at end of file
diff --git a/.idea/ct4ij.iml b/.idea/ct4ij.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/.idea/ct4ij.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$" />
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ </component>
+</module>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..74ca815
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="EntryPointsManager">
+ <entry_points version="2.0" />
+ </component>
+ <component name="NullableNotNullManager">
+ <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
+ <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
+ <option name="myNullables">
+ <value>
+ <list size="4">
+ <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+ <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+ <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+ <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+ </list>
+ </value>
+ </option>
+ <option name="myNotNulls">
+ <value>
+ <list size="4">
+ <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+ <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+ <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+ <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+ </list>
+ </value>
+ </option>
+ </component>
+ <component name="ProjectInspectionProfilesVisibleTreeState">
+ <entry key="Project Default">
+ <profile-state>
+ <expanded-state>
+ <State>
+ <id />
+ </State>
+ <State>
+ <id>Android Lint</id>
+ </State>
+ <State>
+ <id>General</id>
+ </State>
+ <State>
+ <id>Maven</id>
+ </State>
+ <State>
+ <id>Plugin DevKit</id>
+ </State>
+ <State>
+ <id>XPath</id>
+ </State>
+ </expanded-state>
+ <selected-state>
+ <State>
+ <id>Abstraction issues</id>
+ </State>
+ </selected-state>
+ </profile-state>
+ </entry>
+ </component>
+ <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+ <OptionsSetting value="true" id="Add" />
+ <OptionsSetting value="true" id="Remove" />
+ <OptionsSetting value="true" id="Checkout" />
+ <OptionsSetting value="true" id="Update" />
+ <OptionsSetting value="true" id="Status" />
+ <OptionsSetting value="true" id="Edit" />
+ <ConfirmationsSetting value="0" id="Add" />
+ <ConfirmationsSetting value="0" id="Remove" />
+ </component>
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="IntelliJ CE 141.1010.3" project-jdk-type="IDEA JDK">
+ <output url="file://$PROJECT_DIR$/out" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..3b1d462
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ProjectModuleManager">
+ <modules>
+ <module fileurl="file://$PROJECT_DIR$/android-studio-plugin/google-cloud-tools.iml" filepath="$PROJECT_DIR$/android-studio-plugin/google-cloud-tools.iml" />
+ <module fileurl="file://$PROJECT_DIR$/core-plugin/google-cloud-tools-core.iml" filepath="$PROJECT_DIR$/core-plugin/google-cloud-tools-core.iml" />
+ <module fileurl="file://$PROJECT_DIR$/google-login-plugin/google-login.iml" filepath="$PROJECT_DIR$/google-login-plugin/google-login.iml" />
+ </modules>
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/runConfigurations/CT4AS_Android_Studio.xml b/.idea/runConfigurations/CT4AS_Android_Studio.xml
new file mode 100644
index 0000000..44b8e29
--- /dev/null
+++ b/.idea/runConfigurations/CT4AS_Android_Studio.xml
@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="CT4AS-Android-Studio" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+ <module name="google-cloud-tools" />
+ <option name="VM_PARAMETERS" value="-Xms128m -Xmx750m -XX:MaxPermSize=350m -XX:ReservedCodeCacheSize=225m -XX:+UseConcMarkSweepGC -XX:SoftRefLRUPolicyMSPerMB=50 -ea -Dsun.io.useCanonCaches=false -Djava.net.preferIPv4Stack=true -Dawt.useSystemAAFontSettings=lcd" />
+ <option name="PROGRAM_PARAMETERS" value="" />
+ <log_file path="$USER_HOME$/.IdeaIC14/system/plugins-sandbox/system/log/idea.log" checked="false" skipped="true" show_all="false" alias="IDEA LOG" />
+ <method />
+ </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Core_IJ_Community.xml b/.idea/runConfigurations/Core_IJ_Community.xml
new file mode 100644
index 0000000..179a788
--- /dev/null
+++ b/.idea/runConfigurations/Core_IJ_Community.xml
@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="Core-IJ-Community" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+ <module name="google-cloud-tools-core" />
+ <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
+ <option name="PROGRAM_PARAMETERS" value="" />
+ <log_file path="$USER_HOME$/.IdeaIC14/system/plugins-sandbox/system/log/idea.log" checked="false" skipped="true" show_all="false" alias="IDEA LOG" />
+ <method />
+ </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 0000000..e96534f
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="Palette2">
+ <group name="Swing">
+ <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+ </item>
+ <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+ </item>
+ <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+ <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+ <initial-values>
+ <property name="text" value="Button" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="RadioButton" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="CheckBox" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="Label" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+ <preferred-size width="200" height="200" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+ <preferred-size width="200" height="200" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+ </item>
+ <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+ <preferred-size width="-1" height="20" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+ </item>
+ <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+ </item>
+ </group>
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="VcsDirectoryMappings">
+ <mapping directory="" vcs="Git" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/android-studio-plugin/google-cloud-tools-as.iml b/android-studio-plugin/google-cloud-tools-as.iml
new file mode 100644
index 0000000..c322d00
--- /dev/null
+++ b/android-studio-plugin/google-cloud-tools-as.iml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
+ </content>
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="module" module-name="openapi" />
+ <orderEntry type="module" module-name="platform-api" />
+ <orderEntry type="module" module-name="util" />
+ <orderEntry type="module" module-name="lang-api" />
+ <orderEntry type="module" module-name="debugger-openapi" />
+ <orderEntry type="module" module-name="compiler-impl" />
+ <orderEntry type="module" module-name="dom-openapi" />
+ <orderEntry type="module" module-name="java-impl" />
+ <orderEntry type="module" module-name="xml" />
+ <orderEntry type="module" module-name="android" />
+ <orderEntry type="module" module-name="idea-ui" />
+ <orderEntry type="module" module-name="external-system-impl" />
+ <orderEntry type="module" module-name="external-system-api" />
+ <orderEntry type="module" module-name="gradle" />
+ <orderEntry type="module" module-name="jetgroovy" />
+ <orderEntry type="library" scope="TEST" name="mockito" level="project" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib-working/org.eclipse.jgit-3.3.0.201403021825-r.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib-working/org.eclipse.jgit.junit-3.0.0.201306101825-r.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/gradle-appengine-builder-model-0.1.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module" module-name="bootstrap" />
+ <orderEntry type="module" module-name="execution-openapi" />
+ <orderEntry type="module" module-name="execution-impl" />
+ <orderEntry type="module" module-name="testFramework" scope="TEST" />
+ <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/google-api-services-developerprojects-v1-rev20140815212553-1.19.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="library" name="google-api-java-client" level="project" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/samplesindex-v1-1.0-SNAPSHOT.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module" module-name="git4idea" />
+ <orderEntry type="module" module-name="vcs-impl" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/google-api-services-source.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module" module-name="debugger-impl" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/google-api-services-debugger.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="file://$USER_HOME$/cdebugapi2" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module" module-name="xdebugger-impl" />
+ <orderEntry type="module" module-name="google-cloud-tools-core-as" />
+ </component>
+</module>
\ No newline at end of file
diff --git a/android-studio-plugin/google-cloud-tools.iml b/android-studio-plugin/google-cloud-tools.iml
index c322d00..3b5dee7 100644
--- a/android-studio-plugin/google-cloud-tools.iml
+++ b/android-studio-plugin/google-cloud-tools.iml
@@ -1,30 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module relativePaths="true" type="JAVA_MODULE" version="4">
+<module relativePaths="true" type="PLUGIN_MODULE" version="4">
+ <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/src/META-INF/plugin.xml" />
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
</content>
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="inheritedJdk" />
- <orderEntry type="module" module-name="openapi" />
- <orderEntry type="module" module-name="platform-api" />
- <orderEntry type="module" module-name="util" />
- <orderEntry type="module" module-name="lang-api" />
- <orderEntry type="module" module-name="debugger-openapi" />
- <orderEntry type="module" module-name="compiler-impl" />
- <orderEntry type="module" module-name="dom-openapi" />
- <orderEntry type="module" module-name="java-impl" />
- <orderEntry type="module" module-name="xml" />
- <orderEntry type="module" module-name="android" />
- <orderEntry type="module" module-name="idea-ui" />
- <orderEntry type="module" module-name="external-system-impl" />
- <orderEntry type="module" module-name="external-system-api" />
- <orderEntry type="module" module-name="gradle" />
- <orderEntry type="module" module-name="jetgroovy" />
- <orderEntry type="library" scope="TEST" name="mockito" level="project" />
+ <orderEntry type="jdk" jdkName="Android Studio 141" jdkType="IDEA JDK" />
<orderEntry type="module-library">
<library>
<CLASSES>
@@ -52,11 +36,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module" module-name="bootstrap" />
- <orderEntry type="module" module-name="execution-openapi" />
- <orderEntry type="module" module-name="execution-impl" />
- <orderEntry type="module" module-name="testFramework" scope="TEST" />
- <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
<orderEntry type="module-library">
<library>
<CLASSES>
@@ -66,7 +45,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="library" name="google-api-java-client" level="project" />
<orderEntry type="module-library">
<library>
<CLASSES>
@@ -76,8 +54,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module" module-name="git4idea" />
- <orderEntry type="module" module-name="vcs-impl" />
<orderEntry type="module-library">
<library>
<CLASSES>
@@ -87,7 +63,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module" module-name="debugger-impl" />
<orderEntry type="module-library">
<library>
<CLASSES>
@@ -99,7 +74,9 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module" module-name="xdebugger-impl" />
- <orderEntry type="module" module-name="google-cloud-tools-core-as" />
+ <orderEntry type="module" module-name="google-cloud-tools-core" scope="PROVIDED" />
+ <orderEntry type="module" module-name="google-login" scope="PROVIDED" />
+ <orderEntry type="library" scope="PROVIDED" name="android" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="groovy" level="application" />
</component>
</module>
\ No newline at end of file
diff --git a/android-studio-plugin/src/com/google/gct/idea/appengine/wizard/NewCloudModuleDynamicWizardStep.java b/android-studio-plugin/src/com/google/gct/idea/appengine/wizard/NewCloudModuleDynamicWizardStep.java
index 87a867e..1af209c 100644
--- a/android-studio-plugin/src/com/google/gct/idea/appengine/wizard/NewCloudModuleDynamicWizardStep.java
+++ b/android-studio-plugin/src/com/google/gct/idea/appengine/wizard/NewCloudModuleDynamicWizardStep.java
@@ -15,7 +15,6 @@
*/
package com.google.gct.idea.appengine.wizard;
-import com.android.annotations.VisibleForTesting;
import com.android.tools.idea.templates.Parameter;
import com.android.tools.idea.templates.TemplateMetadata;
import com.android.tools.idea.wizard.ComboBoxItem;
@@ -218,7 +217,6 @@
return true;
}
- @VisibleForTesting
static boolean isValidModuleName(@NotNull String moduleName) {
if (!moduleName.replaceAll(WizardConstants.INVALID_FILENAME_CHARS, "").equals(moduleName)) {
return false;
diff --git a/core-plugin/google-cloud-tools-core.iml b/core-plugin/google-cloud-tools-core.iml
index f00527c..36b8691 100644
--- a/core-plugin/google-cloud-tools-core.iml
+++ b/core-plugin/google-cloud-tools-core.iml
@@ -9,8 +9,8 @@
<sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
</content>
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="inheritedJdk" />
- <orderEntry type="library" scope="PROVIDED" name="gradle" level="application" />
+ <orderEntry type="jdk" jdkName="IntelliJ CE 141.1010.3" jdkType="IDEA JDK" />
+ <orderEntry type="library" exported="" scope="PROVIDED" name="gradle" level="application" />
<orderEntry type="library" scope="PROVIDED" name="git4idea" level="application" />
<orderEntry type="module-library">
<library>
@@ -45,7 +45,6 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="library" scope="PROVIDED" name="google-login" level="application" />
<orderEntry type="module-library" scope="PROVIDED">
<library>
<CLASSES>
@@ -64,5 +63,6 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module" module-name="google-login" scope="PROVIDED" />
</component>
</module>
\ No newline at end of file
diff --git a/core-plugin/src/com/google/gct/idea/debugger/CloudDebugConfigType.java b/core-plugin/src/com/google/gct/idea/debugger/CloudDebugConfigType.java
index c250502..276d0b2 100644
--- a/core-plugin/src/com/google/gct/idea/debugger/CloudDebugConfigType.java
+++ b/core-plugin/src/com/google/gct/idea/debugger/CloudDebugConfigType.java
@@ -32,8 +32,18 @@
*/
public class CloudDebugConfigType implements ConfigurationType {
public static final String GCT_DEBUGGER_ENABLE = "enable.gct.debugger";
+ public static final String GCT_DEBUGGER_USETOKEN = "enable.gct.debugger.token";
+
private final ConfigurationFactory myFactory;
+ public static boolean isFeatureEnabled() {
+ return Boolean.getBoolean(GCT_DEBUGGER_ENABLE);
+ }
+
+ public static boolean useWaitToken() {
+ return !Boolean.getBoolean(GCT_DEBUGGER_USETOKEN);
+ }
+
public CloudDebugConfigType() {
myFactory = new MyConfigurationFactory(this);
}
diff --git a/core-plugin/src/com/google/gct/idea/debugger/CloudDebugProcessStateController.java b/core-plugin/src/com/google/gct/idea/debugger/CloudDebugProcessStateController.java
index d901c7c..8facce9 100644
--- a/core-plugin/src/com/google/gct/idea/debugger/CloudDebugProcessStateController.java
+++ b/core-plugin/src/com/google/gct/idea/debugger/CloudDebugProcessStateController.java
@@ -329,14 +329,32 @@
private static List<Breakpoint> queryServerForBreakpoints(CloudDebugProcessState state,
Debugger client,
String tokenToSend) throws IOException {
- List<Breakpoint> currentList;
+ List<Breakpoint> currentList = null;
- ListBreakpointsResponse response =
- client.debuggees().breakpoints().list(state.getDebuggeeId()).setIncludeInactive(Boolean.TRUE).setAction("CAPTURE")
- .setStripResults(Boolean.TRUE).setWaitToken(tokenToSend).execute();
+ String responseWaitToken = tokenToSend;
- currentList = response.getBreakpoints();
- String responseWaitToken = response.getWaitToken();
+ while(tokenToSend == null || tokenToSend.equals(responseWaitToken)) {
+ ListBreakpointsResponse response =
+ client.debuggees().breakpoints().list(state.getDebuggeeId())
+ .setIncludeInactive(Boolean.TRUE).setAction("CAPTURE")
+ .setStripResults(Boolean.TRUE)
+ .setWaitToken(CloudDebugConfigType.useWaitToken() ? tokenToSend : null).execute();
+
+ currentList = response.getBreakpoints();
+ responseWaitToken = response.getWaitToken();
+ if (tokenToSend == null) {
+ break;
+ }
+
+ if (!CloudDebugConfigType.useWaitToken() && tokenToSend.equals(responseWaitToken)) {
+ try {
+ //our fallback polling mode has a 1 second loop.
+ Thread.currentThread().sleep(1000);
+ } catch (InterruptedException ex) {
+ return null;
+ }
+ }
+ }
state.setWaitToken(responseWaitToken);
if (currentList != null) {
diff --git a/core-plugin/src/com/google/gct/idea/debugger/CloudDebugProcessStateSerializer.java b/core-plugin/src/com/google/gct/idea/debugger/CloudDebugProcessStateSerializer.java
index ec4656f..bb95613 100644
--- a/core-plugin/src/com/google/gct/idea/debugger/CloudDebugProcessStateSerializer.java
+++ b/core-plugin/src/com/google/gct/idea/debugger/CloudDebugProcessStateSerializer.java
@@ -51,7 +51,7 @@
private CloudDebugProcessStateSerializer(@NotNull Project project) {
myProject = project;
- if (Boolean.getBoolean(CloudDebugConfigType.GCT_DEBUGGER_ENABLE)) {
+ if (CloudDebugConfigType.isFeatureEnabled()) {
// We listen on mouse events to calculate the line where we should add a cloud breakpoint
// in our right click menu action.
EditorFactory.getInstance().addEditorFactoryListener(new EditorFactoryListener() {
@@ -95,7 +95,7 @@
@Override
public CloudDebugProcessStateSerializer.ProjectState getState() {
ProjectState projectState = new ProjectState();
- if (Boolean.getBoolean(CloudDebugConfigType.GCT_DEBUGGER_ENABLE)) {
+ if (CloudDebugConfigType.isFeatureEnabled()) {
RunManager manager = RunManager.getInstance(myProject);
for (RunnerAndConfigurationSettings config : manager.getAllSettings()) {
if (config.getConfiguration() == null) {
@@ -143,7 +143,7 @@
*/
@Override
public void loadState(CloudDebugProcessStateSerializer.ProjectState state) {
- if (Boolean.getBoolean(CloudDebugConfigType.GCT_DEBUGGER_ENABLE) && state.CONFIG_STATES != null) {
+ if (CloudDebugConfigType.isFeatureEnabled() && state.CONFIG_STATES != null) {
for (RunConfigState configState : state.CONFIG_STATES) {
myStateMap.put(configState.CONFIG_NAME, configState.PROCESS_STATE);
}
diff --git a/core-plugin/src/com/google/gct/idea/debugger/CloudDebugProcessWatcher.java b/core-plugin/src/com/google/gct/idea/debugger/CloudDebugProcessWatcher.java
index cb3909e..2e1b4ab 100644
--- a/core-plugin/src/com/google/gct/idea/debugger/CloudDebugProcessWatcher.java
+++ b/core-plugin/src/com/google/gct/idea/debugger/CloudDebugProcessWatcher.java
@@ -20,6 +20,7 @@
import com.intellij.execution.ProgramRunnerUtil;
import com.intellij.execution.RunManager;
import com.intellij.execution.RunnerAndConfigurationSettings;
+import com.intellij.execution.executors.DefaultDebugExecutor;
import com.intellij.execution.executors.DefaultRunExecutor;
import com.intellij.notification.Notification;
import com.intellij.notification.NotificationGroup;
@@ -87,7 +88,7 @@
}
if (targetConfig != null) {
- Executor executor = DefaultRunExecutor.getRunExecutorInstance();
+ Executor executor = DefaultDebugExecutor.getDebugExecutorInstance();
ProgramRunnerUtil
.executeConfiguration(state.getProject(), targetConfig, executor);
}
diff --git a/core-plugin/src/com/google/gct/idea/debugger/DebuggerInitializationComponent.java b/core-plugin/src/com/google/gct/idea/debugger/DebuggerInitializationComponent.java
index 049cd8a..55a7919 100644
--- a/core-plugin/src/com/google/gct/idea/debugger/DebuggerInitializationComponent.java
+++ b/core-plugin/src/com/google/gct/idea/debugger/DebuggerInitializationComponent.java
@@ -37,7 +37,7 @@
@Override
public void initComponent() {
- if (Boolean.getBoolean(CloudDebugConfigType.GCT_DEBUGGER_ENABLE)) {
+ if (CloudDebugConfigType.isFeatureEnabled()) {
Extensions.getRootArea().getExtensionPoint(ConfigurationType.CONFIGURATION_TYPE_EP)
.registerExtension(new CloudDebugConfigType());
}
diff --git a/google-login-plugin/google-login.iml b/google-login-plugin/google-login.iml
index 84e024f..2a361da 100644
--- a/google-login-plugin/google-login.iml
+++ b/google-login-plugin/google-login.iml
@@ -8,7 +8,7 @@
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
</content>
- <orderEntry type="jdk" jdkName="IntelliJ IDEA Community Edition IC-141.1010.3" jdkType="IDEA JDK" />
+ <orderEntry type="jdk" jdkName="IntelliJ CE 141.1010.3" jdkType="IDEA JDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library" exported="">
<library>
@@ -41,7 +41,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/third_party/repackaged/google-api-java-client-min-repackaged-1.20.0.jar!/" />
