Add common modules back which should be supported in Azure Functions, F…

…ix microsoft#4307
andxu · Jun 19, 2020 · 7dde468 · 7dde468
1 parent 0cad996
commit 7dde468
Show file tree

Hide file tree

Showing 12 changed files with 148 additions and 140 deletions.
diff --git a/PluginsAndFeatures/AddLibrary/AppInsights/com.microsoft.applicationinsights.feature/pom.xml b/PluginsAndFeatures/AddLibrary/AppInsights/com.microsoft.applicationinsights.feature/pom.xml
@@ -3,7 +3,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-	<relativePath>../../../azure-toolkit-for-eclipse/pom.xml</relativePath>
+  <relativePath>../../../azure-toolkit-for-eclipse/pom.xml</relativePath>
     <groupId>com.microsoft.azuretools.wap4ej.build</groupId>
     <artifactId>parent</artifactId>
     <version>${azuretool.eclipse.version}</version>

diff --git a/PluginsAndFeatures/AddLibrary/AppInsights/com.microsoft.applicationinsights.ui/plugin.xml b/PluginsAndFeatures/AddLibrary/AppInsights/com.microsoft.applicationinsights.ui/plugin.xml
@@ -12,13 +12,13 @@
 
 
    <extension point="org.eclipse.ui.commands">
-	  <command
-	  		description="Configure Application Insights"
-	        id="com.microsoft.ui.ai.config"
-	        name="Configure Application Insights...">
-	  </command>
-	</extension>
-	
+      <command
+              description="Configure Application Insights"
+            id="com.microsoft.ui.ai.config"
+            name="Configure Application Insights...">
+      </command>
+    </extension>
+    
     <extension point="org.eclipse.ui.menus">
         <menuContribution locationURI="popup:org.eclipse.ui.popup.any?after=additions">
             <menu label="Azure" icon="icons/small/windowsAzure.png" id="com.microsoft.azuretools.webprojmenu">
@@ -41,27 +41,27 @@
         </menuContribution>
     </extension>
   <extension point="org.eclipse.ui.handlers">
-	  <handler
-	        class="com.microsoft.applicationinsights.ui.config.AIConfigCommandHandler"
-	        commandId="com.microsoft.ui.ai.config">
-		<enabledWhen>
-			<with
-				variable="selection">
-				<count value="1"/>
-				<iterate
-					operator="or">
-            		<adapt type="org.eclipse.core.resources.IProject">
-        				<test property="com.microsoft.ui.ai.property.isWebProj"/>
-            		</adapt>
-				</iterate>
-		    </with>
-		</enabledWhen>
-	  </handler>
-	  </extension>
+      <handler
+            class="com.microsoft.applicationinsights.ui.config.AIConfigCommandHandler"
+            commandId="com.microsoft.ui.ai.config">
+        <enabledWhen>
+            <with
+                variable="selection">
+                <count value="1"/>
+                <iterate
+                    operator="or">
+                    <adapt type="org.eclipse.core.resources.IProject">
+                        <test property="com.microsoft.ui.ai.property.isWebProj"/>
+                    </adapt>
+                </iterate>
+            </with>
+        </enabledWhen>
+      </handler>
+      </extension>
 
    <!-- Property testers -->
   <extension point="org.eclipse.core.expressions.propertyTesters">
-  	<propertyTester
+      <propertyTester
       id="com.microsoft.ui.ai.property.testWebProj"
       type="org.eclipse.core.resources.IProject"
       namespace="com.microsoft.ui.ai.property"
@@ -73,10 +73,10 @@
   <!-- Application Insights preference page -->
   <extension point = "org.eclipse.ui.preferencePages">
      <page
-       	id="com.microsoft.ui.preferencepage.applicationinsights"
-       	class="com.microsoft.applicationinsights.preference.ApplicationInsightsPreferencePage"
-       	name="Application Insights"
-       	category="com.persistent.ui.preferencepage.windowsazure">
+           id="com.microsoft.ui.preferencepage.applicationinsights"
+           class="com.microsoft.applicationinsights.preference.ApplicationInsightsPreferencePage"
+           name="Application Insights"
+           category="com.persistent.ui.preferencepage.windowsazure">
      </page>
  </extension>
  </plugin>
diff --git a/PluginsAndFeatures/AddLibrary/AppInsights/com.microsoft.applicationinsights.ui/pom.xml b/PluginsAndFeatures/AddLibrary/AppInsights/com.microsoft.applicationinsights.ui/pom.xml
@@ -3,7 +3,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-	<relativePath>../../../azure-toolkit-for-eclipse/pom.xml</relativePath>
+  <relativePath>../../../azure-toolkit-for-eclipse/pom.xml</relativePath>
     <groupId>com.microsoft.azuretools.wap4ej.build</groupId>
     <artifactId>parent</artifactId>
     <version>${azuretool.eclipse.version}</version>

diff --git a/PluginsAndFeatures/AddLibrary/AzureLibraries/com.microsoft.azuretools.sdk/pom.xml b/PluginsAndFeatures/AddLibrary/AzureLibraries/com.microsoft.azuretools.sdk/pom.xml
@@ -3,7 +3,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-	<relativePath>../../../azure-toolkit-for-eclipse/pom.xml</relativePath>
+  <relativePath>../../../azure-toolkit-for-eclipse/pom.xml</relativePath>
     <groupId>com.microsoft.azuretools.wap4ej.build</groupId>
     <artifactId>parent</artifactId>
     <version>${azuretool.eclipse.version}</version>

diff --git a/.../AddLibrary/AzureLibraries/com.microsoft.azuretools.sdk/resources/ApplicationInsights.xml b/.../AddLibrary/AzureLibraries/com.microsoft.azuretools.sdk/resources/ApplicationInsights.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE ApplicationInsights>
 <ApplicationInsights xmlns="http://schemas.microsoft.com/ApplicationInsights/2013/Settings" schemaVersion="2014-05-30">
   <!--
-	Please do not modify below instrumentation key.
-	Use of this instrumentation key by any application other than Azure Toolkit for Eclipse is strictly prohibited.
+  Please do not modify below instrumentation key.
+  Use of this instrumentation key by any application other than Azure Toolkit for Eclipse is strictly prohibited.
   -->
   <InstrumentationKey>${instrkey}</InstrumentationKey>
   <ContextInitializers>
   </ContextInitializers>
   <TelemetryInitializers>
     <Add type="com.microsoft.applicationinsights.web.extensibility.initializers.WebOperationIdTelemetryInitializer"/>
     <Add type="com.microsoft.applicationinsights.web.extensibility.initializers.WebOperationNameTelemetryInitializer"/>
-	<Add type="com.microsoft.applicationinsights.web.extensibility.initializers.WebSessionTelemetryInitializer"/>
-	<Add type="com.microsoft.applicationinsights.web.extensibility.initializers.WebUserTelemetryInitializer"/>
-	<Add type="com.microsoft.applicationinsights.web.extensibility.initializers.WebUserAgentTelemetryInitializer"/>
+  <Add type="com.microsoft.applicationinsights.web.extensibility.initializers.WebSessionTelemetryInitializer"/>
+  <Add type="com.microsoft.applicationinsights.web.extensibility.initializers.WebUserTelemetryInitializer"/>
+  <Add type="com.microsoft.applicationinsights.web.extensibility.initializers.WebUserAgentTelemetryInitializer"/>
   </TelemetryInitializers>
   <TelemetryModules>
     <Add type="com.microsoft.applicationinsights.web.extensibility.modules.WebRequestTrackingTelemetryModule"/>

diff --git a/PluginsAndFeatures/AddLibrary/AzureLibraries/com.microsoft.azuretools.wasdkjava.ui/pom.xml b/PluginsAndFeatures/AddLibrary/AzureLibraries/com.microsoft.azuretools.wasdkjava.ui/pom.xml
@@ -3,7 +3,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-	<relativePath>../../../azure-toolkit-for-eclipse/pom.xml</relativePath>
+  <relativePath>../../../azure-toolkit-for-eclipse/pom.xml</relativePath>
     <groupId>com.microsoft.azuretools.wap4ej.build</groupId>
     <artifactId>parent</artifactId>
     <version>${azuretool.eclipse.version}</version>

diff --git a/PluginsAndFeatures/AddLibrary/AzureLibraries/pom.xml b/PluginsAndFeatures/AddLibrary/AzureLibraries/pom.xml
@@ -56,7 +56,7 @@
             <groupId>com.microsoft.azuretools</groupId>
             <artifactId>hdinsight-node-common</artifactId>
             <version>${azuretool.version}</version>
-        </dependency>            
+        </dependency>
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
@@ -80,7 +80,7 @@
             <execution>
             <id>bundle-manifest</id>
             <phase>process-classes</phase>
-            <goals>    
+            <goals>
                 <goal>manifest</goal>
             </goals>
             </execution>
@@ -105,22 +105,22 @@
           </instructions>
         </configuration>
       </plugin>
-      <plugin>		
-        <artifactId>maven-antrun-plugin</artifactId>		
-          <version>1.8</version>		
-            <executions>		
-              <execution>			
-                <phase>package</phase>		
-                  <configuration>		
-                    <target>		
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+          <version>1.8</version>
+            <executions>
+              <execution>
+                <phase>package</phase>
+                  <configuration>
+                    <target>
                       <copy file="${project.build.outputDirectory}/META-INF/MANIFEST.MF" tofile="${project.basedir}/com.microsoft.azuretools.sdk/META-INF/MANIFEST.MF" overwrite="true" />
-                    </target>		
-                  </configuration>		
-                <goals>		
-                  <goal>run</goal>		
-                </goals>		
-              </execution>		
-            </executions>		
+                    </target>
+                  </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
          </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

diff --git a/PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.hdinsight/plugin.xml b/PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.hdinsight/plugin.xml
@@ -1,66 +1,66 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <plugin>
-	<extension
-      	point="org.eclipse.core.resources.natures"
-      	id="hdinsight.projectnature"
-      	name="hdinsight.projectnature">
-      	<runtime>
-        	<run class="com.microsoft.azuretools.hdinsight.projects.HDInsightProjectNature">
-         	</run>
-      	</runtime>
-	</extension>
-	
-	<extension
+    <extension
+          point="org.eclipse.core.resources.natures"
+          id="hdinsight.projectnature"
+          name="hdinsight.projectnature">
+          <runtime>
+            <run class="com.microsoft.azuretools.hdinsight.projects.HDInsightProjectNature">
+             </run>
+          </runtime>
+    </extension>
+    
+    <extension
         point="org.eclipse.ui.newWizards">
         <category
-        	name="HDInsight Project"
-        	id="com.microsoft.azure.hdinsight.projwizard.category">
+            name="HDInsight Project"
+            id="com.microsoft.azure.hdinsight.projwizard.category">
         </category>
         <wizard
-        	name="Spark on HDInsight (Scala)"
+            name="Spark on HDInsight (Scala)"
             category="com.microsoft.azure.hdinsight.projwizard.category"
             icon="icons/Spark-Scala.png"
             project="true"
             class="com.microsoft.azuretools.hdinsight.projects.HDInsightsScalaProjectWizard"
             id="com.microsoft.azure.hdinsight.scala.projwizard">
-        	<description>Spark on HDInsight (Scala)</description>
+            <description>Spark on HDInsight (Scala)</description>
          </wizard>
         <wizard
-        	name="Spark on HDInsight (Java)"
+            name="Spark on HDInsight (Java)"
             category="com.microsoft.azure.hdinsight.projwizard.category"
             icon="icons/Spark-Java.png"
             project="true"
             class="com.microsoft.azuretools.hdinsight.projects.HDInsightsJavaProjectWizard"
             id="com.microsoft.azure.hdinsight.java.projwizard">
-        	<description>Spark on HDInsight (Java)</description>
+            <description>Spark on HDInsight (Java)</description>
          </wizard>
          <wizard
-        	name="Spark on HDInsight Local Run Sample (Scala)"
+            name="Spark on HDInsight Local Run Sample (Scala)"
             category="com.microsoft.azure.hdinsight.projwizard.category"
             icon="icons/Spark-Scala.png"
             project="true"
             class="com.microsoft.azuretools.hdinsight.projects.HDInsightsScalaProjectWizard"
             id="com.microsoft.azure.hdinsight.local-scala.projwizard">
-        	<description>Spark on HDInsight Local Run Sample (Scala)</description>
+            <description>Spark on HDInsight Local Run Sample (Scala)</description>
          </wizard>
          <wizard
-        	name="Spark on HDInsight Local Run Sample (Java)"
+            name="Spark on HDInsight Local Run Sample (Java)"
             category="com.microsoft.azure.hdinsight.projwizard.category"
             icon="icons/Spark-Java.png"
             project="true"
             class="com.microsoft.azuretools.hdinsight.projects.HDInsightsJavaProjectWizard"
             id="com.microsoft.azure.hdinsight.local-java.projwizard">
-        	<description>Spark on HDInsight Local Run Sample (Java)</description>
+            <description>Spark on HDInsight Local Run Sample (Java)</description>
          </wizard>
          <wizard
-        	name="Spark on HDInsight Cluster Run Sample (Scala)"
+            name="Spark on HDInsight Cluster Run Sample (Scala)"
             category="com.microsoft.azure.hdinsight.projwizard.category"
             icon="icons/Spark-Scala.png"
             project="true"
             class="com.microsoft.azuretools.hdinsight.projects.HDInsightsScalaProjectWizard"
             id="com.microsoft.azure.hdinsight.cluster-scala.projwizard">
-        	<description>Spark on HDInsight Cluster Run Sample (Scala)</description>
+            <description>Spark on HDInsight Cluster Run Sample (Scala)</description>
          </wizard>
     </extension>
 
@@ -72,45 +72,45 @@
                id="com.microsoft.azure.hdinsight.projwizard">
          </newWizardShortcut>
       </perspectiveExtension>
-   	</extension>
+       </extension>
 
     <extension point="org.eclipse.ui.commands">
-	  <command
-	  		description="Submit Spark Application to HDInsight"
-	        id="com.microsoft.azure.hdinsight.submit"
-	        name="Submit Spark Application to HDInsight"
-	        icon="icons/Spark.png">
-	  </command>
-	</extension>  
+      <command
+              description="Submit Spark Application to HDInsight"
+            id="com.microsoft.azure.hdinsight.submit"
+            name="Submit Spark Application to HDInsight"
+            icon="icons/Spark.png">
+      </command>
+    </extension>  
 
     <extension point="org.eclipse.ui.handlers">
         <handler class="com.microsoft.azuretools.hdinsight.spark.actions.SubmitHandler"
             commandId="com.microsoft.azure.hdinsight.submit">
-      	</handler>
+          </handler>
     </extension>
 
     <extension point="org.eclipse.ui.menus">
-  		<menuContribution locationURI="popup:org.eclipse.ui.popup.any?after=additions">
-			<command commandId="com.microsoft.azure.hdinsight.submit" icon="icons/Spark.png" label="Submit Spark Application to HDInsight"/>
-			<visibleWhen>
-   				<with variable="selection"> 
-					<iterate operator="or"> 
-						<adapt type="org.eclipse.core.resources.IProject">
-        					<test property="org.eclipse.core.resources.projectNature" value="hdinsight.projectnature"/>
-            			</adapt>
-					</iterate> 
-		    	</with>
-		    </visibleWhen>
-    	</menuContribution>
-  	</extension>
-  	
-  	<extension point="org.eclipse.ui.views">
+          <menuContribution locationURI="popup:org.eclipse.ui.popup.any?after=additions">
+            <command commandId="com.microsoft.azure.hdinsight.submit" icon="icons/Spark.png" label="Submit Spark Application to HDInsight"/>
+            <visibleWhen>
+                   <with variable="selection"> 
+                    <iterate operator="or"> 
+                        <adapt type="org.eclipse.core.resources.IProject">
+                            <test property="org.eclipse.core.resources.projectNature" value="hdinsight.projectnature"/>
+                        </adapt>
+                    </iterate> 
+                </with>
+            </visibleWhen>
+        </menuContribution>
+      </extension>
+      
+      <extension point="org.eclipse.ui.views">
       <view
             category="com.microsoft.azuretools"
             class="com.microsoft.azuretools.hdinsight.SparkSubmissionToolWindowView"
             id="com.microsoft.azuretools.hdinsight.SparkSubmissionToolWindowView"
             name="Spark Submision"
             icon="icons/Spark.png">
       </view>
-	</extension>   
+    </extension>   
 </plugin>
diff --git a/...Features/azure-toolkit-for-intellij/resources/applicationinsights/ApplicationInsights.xml b/...Features/azure-toolkit-for-intellij/resources/applicationinsights/ApplicationInsights.xml
@@ -7,9 +7,9 @@
   <TelemetryInitializers>
     <Add type="com.microsoft.applicationinsights.web.extensibility.initializers.WebOperationIdTelemetryInitializer"/>
     <Add type="com.microsoft.applicationinsights.web.extensibility.initializers.WebOperationNameTelemetryInitializer"/>
-	<Add type="com.microsoft.applicationinsights.web.extensibility.initializers.WebSessionTelemetryInitializer"/>
-	<Add type="com.microsoft.applicationinsights.web.extensibility.initializers.WebUserTelemetryInitializer"/>
-	<Add type="com.microsoft.applicationinsights.web.extensibility.initializers.WebUserAgentTelemetryInitializer"/>
+    <Add type="com.microsoft.applicationinsights.web.extensibility.initializers.WebSessionTelemetryInitializer"/>
+    <Add type="com.microsoft.applicationinsights.web.extensibility.initializers.WebUserTelemetryInitializer"/>
+    <Add type="com.microsoft.applicationinsights.web.extensibility.initializers.WebUserAgentTelemetryInitializer"/>
   </TelemetryInitializers>
   <TelemetryModules>
     <Add type="com.microsoft.applicationinsights.web.extensibility.modules.WebRequestTrackingTelemetryModule"/>