Merge branch 'master' of git.labs.intellij.net:idea/community

This commit is contained in:
anna
2009-09-30 15:05:02 +04:00
13 changed files with 43 additions and 1620 deletions
@@ -101,7 +101,7 @@ public class TurnRefsToSuperTest extends MultiFileTestCase {
doTest("Xyz", "Xint", false);
}
public void testIDEADEV5517Noop() throws Exception {
public void testIDEADEV5517NOOP() throws Exception {
doTest("Xyz", "Xint", false);
}
@@ -12,6 +12,7 @@ import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.pom.PomTargetPsiElement;
import com.intellij.psi.*;
import com.intellij.psi.meta.PsiMetaData;
import com.intellij.psi.meta.PsiMetaOwner;
@@ -23,10 +24,8 @@ import com.intellij.refactoring.util.*;
import com.intellij.usageView.UsageInfo;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.containers.HashMap;
import com.intellij.pom.PomTargetPsiElement;
import org.jetbrains.annotations.NotNull;
import java.io.File;
import java.util.*;
public class RenameUtil {
@@ -283,7 +282,7 @@ public class RenameUtil {
return inputValidator.value(newName);
}
if (psiElement instanceof PsiFile || psiElement instanceof PsiDirectory) {
return newName.indexOf(File.separatorChar) < 0 && newName.indexOf('/') < 0;
return newName.indexOf('\\') < 0 && newName.indexOf('/') < 0;
}
if (psiElement instanceof PomTargetPsiElement) {
return !StringUtil.isEmptyOrSpaces(newName);
@@ -24,10 +24,7 @@ import com.intellij.openapi.project.*;
import com.intellij.openapi.roots.CollectingContentIterator;
import com.intellij.openapi.roots.ContentIterator;
import com.intellij.openapi.roots.ProjectRootManager;
import com.intellij.openapi.util.Factory;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.ShutDownTracker;
import com.intellij.openapi.util.*;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.vfs.*;
@@ -1100,6 +1097,8 @@ public class FileBasedIndex implements ApplicationComponent {
PsiFile psiFile = null;
final Ref<ProcessCanceledException> pce = Ref.create(null);
final List<Runnable> tasks = new ArrayList<Runnable>();
for (final ID<?, ?> indexId : myIndices.keySet()) {
if (shouldIndexFile(file, indexId)) {
@@ -1132,8 +1131,7 @@ public class FileBasedIndex implements ApplicationComponent {
updateSingleIndex(indexId, file, _fc);
}
catch (ProcessCanceledException e) {
LOG.info("Re-scheduling file indexing for " + file.getPresentableUrl(), e);
myChangedFilesUpdater.scheduleForUpdate(file);
pce.set(e);
}
catch (StorageException e) {
requestRebuild(indexId);
@@ -1164,6 +1162,10 @@ public class FileBasedIndex implements ApplicationComponent {
}
}
if (!pce.isNull()) {
throw pce.get();
}
if (psiFile != null) {
psiFile.putUserData(PsiFileImpl.BUILDING_STUB, null);
}
-607
View File
@@ -1,607 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project relativePaths="false" version="4">
<component name="AntConfiguration">
<defaultAnt bundledAnt="true" />
<buildFile url="file://$PROJECT_DIR$/src/org/jetbrains/plugins/groovy/lang/lexer/build.xml">
<additionalClassPath />
<antReference projectDefault="true" />
<customJdkName value="" />
<maximumHeapSize value="128" />
<maximumStackSize value="32" />
<properties />
</buildFile>
<buildFile url="file://$PROJECT_DIR$/src/org/jetbrains/plugins/grails/lang/gsp/lexer/core/build.xml">
<additionalClassPath />
<antReference projectDefault="true" />
<customJdkName value="" />
<maximumHeapSize value="128" />
<maximumStackSize value="32" />
<properties />
</buildFile>
<buildFile url="file://$PROJECT_DIR$/packagePlugin.xml">
<additionalClassPath />
<antReference projectDefault="true" />
<customJdkName value="" />
<maximumHeapSize value="128" />
<maximumStackSize value="32" />
<properties />
</buildFile>
</component>
<component name="BuildJarProjectSettings">
<option name="BUILD_JARS_ON_MAKE" value="false" />
</component>
<component name="CodeStyleProjectProfileManger">
<option name="PROJECT_PROFILE" />
<option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
</component>
<component name="CodeStyleSettingsManager">
<option name="PER_PROJECT_SETTINGS">
<value>
<option name="JAVA_INDENT_OPTIONS">
<value>
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="4" />
<option name="TAB_SIZE" value="2" />
<option name="USE_TAB_CHARACTER" value="false" />
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
</value>
</option>
<option name="FIELD_NAME_PREFIX" value="my" />
<ADDITIONAL_INDENT_OPTIONS fileType="">
<option name="INDENT_SIZE" value="4" />
<option name="CONTINUATION_INDENT_SIZE" value="8" />
<option name="TAB_SIZE" value="4" />
<option name="USE_TAB_CHARACTER" value="false" />
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="groovy">
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="8" />
<option name="TAB_SIZE" value="4" />
<option name="USE_TAB_CHARACTER" value="false" />
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="gsp">
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="8" />
<option name="TAB_SIZE" value="4" />
<option name="USE_TAB_CHARACTER" value="false" />
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="java">
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="4" />
<option name="TAB_SIZE" value="2" />
<option name="USE_TAB_CHARACTER" value="false" />
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="jsp">
<option name="INDENT_SIZE" value="4" />
<option name="CONTINUATION_INDENT_SIZE" value="8" />
<option name="TAB_SIZE" value="4" />
<option name="USE_TAB_CHARACTER" value="false" />
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="txt">
<option name="INDENT_SIZE" value="4" />
<option name="CONTINUATION_INDENT_SIZE" value="8" />
<option name="TAB_SIZE" value="4" />
<option name="USE_TAB_CHARACTER" value="false" />
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="xml">
<option name="INDENT_SIZE" value="4" />
<option name="CONTINUATION_INDENT_SIZE" value="8" />
<option name="TAB_SIZE" value="4" />
<option name="USE_TAB_CHARACTER" value="false" />
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
</value>
</option>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
</component>
<component name="CompilerConfiguration">
<option name="DEFAULT_COMPILER" value="Javac" />
<option name="DEPLOY_AFTER_MAKE" value="0" />
<resourceExtensions>
<entry name=".+\.(properties|xml|html|dtd|tld)" />
<entry name=".+\.(gif|png|jpeg|jpg)" />
</resourceExtensions>
<wildcardResourcePatterns>
<entry name="?*.properties" />
<entry name="?*.xml" />
<entry name="?*.gif" />
<entry name="?*.png" />
<entry name="?*.jpeg" />
<entry name="?*.jpg" />
<entry name="?*.html" />
<entry name="?*.ft" />
<entry name="?*.dtd" />
<entry name="?*.tld" />
<entry name="?*.groovy" />
</wildcardResourcePatterns>
</component>
<component name="CopyrightManager" default="">
<module2copyright />
</component>
<component name="DependenciesAnalyzeManager">
<option name="myForwardDirection" value="false" />
</component>
<component name="DependencyValidationManager">
<option name="SKIP_IMPORT_STATEMENTS" value="false" />
</component>
<component name="EclipseCompilerSettings">
<option name="DEBUGGING_INFO" value="true" />
<option name="GENERATE_NO_WARNINGS" value="true" />
<option name="DEPRECATION" value="false" />
<option name="ADDITIONAL_OPTIONS_STRING" value="" />
<option name="MAXIMUM_HEAP_SIZE" value="128" />
</component>
<component name="EclipseEmbeddedCompilerSettings">
<option name="DEBUGGING_INFO" value="true" />
<option name="GENERATE_NO_WARNINGS" value="true" />
<option name="DEPRECATION" value="false" />
<option name="ADDITIONAL_OPTIONS_STRING" value="" />
<option name="MAXIMUM_HEAP_SIZE" value="128" />
</component>
<component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
<component name="EntryPointsManager">
<entry_points version="2.0" />
</component>
<component name="ExportToHTMLSettings">
<option name="PRINT_LINE_NUMBERS" value="false" />
<option name="OPEN_IN_BROWSER" value="false" />
<option name="OUTPUT_DIRECTORY" />
</component>
<component name="FacetAutodetectingManager">
<autodetection-disabled>
<facet-type id="Groovy" />
</autodetection-disabled>
</component>
<component name="IdProvider" IDEtalkID="CA57306CD032AD7AF462C2DE24318A97" />
<component name="InspectionProjectProfileManager">
<option name="PROJECT_PROFILE" value="Project Default" />
<option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
<scopes />
<profiles>
<profile version="1.0" is_locked="false">
<option name="myName" value="Project Default" />
<option name="myLocal" value="false" />
</profile>
</profiles>
<list size="4">
<item index="0" class="java.lang.String" itemvalue="SERVER PROBLEM" />
<item index="1" class="java.lang.String" itemvalue="INFO" />
<item index="2" class="java.lang.String" itemvalue="WARNING" />
<item index="3" class="java.lang.String" itemvalue="ERROR" />
</list>
</component>
<component name="JavacSettings">
<option name="DEBUGGING_INFO" value="true" />
<option name="GENERATE_NO_WARNINGS" value="false" />
<option name="DEPRECATION" value="true" />
<option name="ADDITIONAL_OPTIONS_STRING" value="" />
<option name="MAXIMUM_HEAP_SIZE" value="128" />
</component>
<component name="JavadocGenerationManager">
<option name="OUTPUT_DIRECTORY" />
<option name="OPTION_SCOPE" value="protected" />
<option name="OPTION_HIERARCHY" value="true" />
<option name="OPTION_NAVIGATOR" value="true" />
<option name="OPTION_INDEX" value="true" />
<option name="OPTION_SEPARATE_INDEX" value="true" />
<option name="OPTION_DOCUMENT_TAG_USE" value="false" />
<option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
<option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
<option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
<option name="OPTION_DEPRECATED_LIST" value="true" />
<option name="OTHER_OPTIONS" value="" />
<option name="HEAP_SIZE" />
<option name="LOCALE" />
<option name="OPEN_IN_BROWSER" value="true" />
</component>
<component name="JikesSettings">
<option name="JIKES_PATH" value="" />
<option name="DEBUGGING_INFO" value="true" />
<option name="DEPRECATION" value="true" />
<option name="GENERATE_NO_WARNINGS" value="false" />
<option name="IS_EMACS_ERRORS_MODE" value="true" />
<option name="ADDITIONAL_OPTIONS_STRING" value="" />
</component>
<component name="LogConsolePreferences">
<option name="FILTER_ERRORS" value="false" />
<option name="FILTER_WARNINGS" value="false" />
<option name="FILTER_INFO" value="true" />
<option name="CUSTOM_FILTER" />
</component>
<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>
<component name="ProjectDetails">
<option name="projectName" value="Groovy" />
</component>
<component name="ProjectFileVersion" converted="true" />
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/groovy.iml" filepath="$PROJECT_DIR$/groovy.iml" />
<module fileurl="file://$PROJECT_DIR$/rt/rt.iml" filepath="$PROJECT_DIR$/rt/rt.iml" />
</modules>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="JetGroovy IDEA SDK" project-jdk-type="IDEA JDK">
<output url="file://$PROJECT_DIR$/classes" />
</component>
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="JetGroovy" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
<module name="groovy" />
<option name="VM_PARAMETERS" value=" -Xms32m -Xmx500m -XX:MaxPermSize=190m -ea -agentlib:yjpagent=disablej2ee,disablecounts,disablealloc,sessionname=IntelliJIDEA -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005" />
<option name="PROGRAM_PARAMETERS" value="" />
<log_file path="$APPLICATION_HOME_DIR$/system/plugins-sandbox/system/log/idea.log" checked="false" skipped="true" show_all="false" alias="IDEA LOG" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="1670" />
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="true" />
</RunnerSettings>
<RunnerSettings RunnerId="Profile ">
<option name="myExternalizedOptions" value="&#13;&#10;additional-options=&#13;&#10;snapshots-dir=&#13;&#10;" />
</RunnerSettings>
<ConfigurationWrapper RunnerId="Debug" />
<method>
<option name="Make" value="true" />
</method>
</configuration>
</component>
<component name="ResourceManagerContainer">
<option name="myResourceBundles">
<value>
<list size="0" />
</value>
</option>
</component>
<component name="RmicSettings">
<option name="IS_EANABLED" value="false" />
<option name="DEBUGGING_INFO" value="true" />
<option name="GENERATE_NO_WARNINGS" value="false" />
<option name="GENERATE_IIOP_STUBS" value="false" />
<option name="ADDITIONAL_OPTIONS_STRING" value="" />
</component>
<component name="SvnBranchConfigurationManager">
<option name="myConfigurationMap">
<map>
<entry key="$PROJECT_DIR$">
<value>
<SvnBranchConfiguration>
<option name="branchUrls">
<list>
<option value="http://svn.jetbrains.org/idea/BRANCHES" />
<option value="http://svn.jetbrains.org/idea/Test" />
<option value="http://svn.jetbrains.org/idea/TestSSL" />
</list>
</option>
<option name="trunkUrl" value="http://svn.jetbrains.org/idea/Trunk" />
</SvnBranchConfiguration>
</value>
</entry>
</map>
</option>
<option name="myVersion" value="124" />
<option name="mySupportsUserInfoFilter" value="true" />
</component>
<component name="TeamCityRootDirectoryHolder">
<option name="myRelativeRootDirectory" />
</component>
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="svn" />
</component>
<component name="WebServicesPlugin" addRequiredLibraries="true" />
<component name="com.intellij.jsf.UserDefinedFacesConfigs">
<option name="USER_DEFINED_CONFIGS">
<value>
<list size="0" />
</value>
</option>
</component>
<component name="copyright">
<Base>
<setting name="state" value="1" />
</Base>
<LanguageOptions name="HTML">
<option name="templateOptions">
<value>
<option name="block" value="true" />
<option name="separateBefore" value="false" />
<option name="separateAfter" value="false" />
<option name="prefixLines" value="true" />
<option name="lenBefore" value="80" />
<option name="lenAfter" value="80" />
<option name="box" value="false" />
<option name="filler" value=" " />
</value>
</option>
<option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
<option name="keyword" value="Copyright" />
<option name="fileTypeOverride" value="2" />
<option name="relativeBefore" value="true" />
<option name="addBlankAfter" value="true" />
<option name="fileLocation" value="1" />
<option name="useAlternate" value="false" />
</LanguageOptions>
<LanguageOptions name="JAVA">
<option name="templateOptions">
<value>
<option name="block" value="true" />
<option name="separateBefore" value="false" />
<option name="separateAfter" value="false" />
<option name="prefixLines" value="true" />
<option name="lenBefore" value="80" />
<option name="lenAfter" value="80" />
<option name="box" value="false" />
<option name="filler" value=" " />
</value>
</option>
<option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
<option name="keyword" value="Copyright" />
<option name="fileTypeOverride" value="3" />
<option name="relativeBefore" value="true" />
<option name="addBlankAfter" value="true" />
<option name="fileLocation" value="1" />
<option name="useAlternate" value="false" />
</LanguageOptions>
<LanguageOptions name="JSP">
<option name="templateOptions">
<value>
<option name="block" value="true" />
<option name="separateBefore" value="false" />
<option name="separateAfter" value="false" />
<option name="prefixLines" value="true" />
<option name="lenBefore" value="80" />
<option name="lenAfter" value="80" />
<option name="box" value="false" />
<option name="filler" value=" " />
</value>
</option>
<option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
<option name="keyword" value="Copyright" />
<option name="fileTypeOverride" value="2" />
<option name="relativeBefore" value="true" />
<option name="addBlankAfter" value="true" />
<option name="fileLocation" value="1" />
<option name="useAlternate" value="false" />
</LanguageOptions>
<LanguageOptions name="JavaScript">
<option name="templateOptions">
<value>
<option name="block" value="true" />
<option name="separateBefore" value="false" />
<option name="separateAfter" value="false" />
<option name="prefixLines" value="true" />
<option name="lenBefore" value="80" />
<option name="lenAfter" value="80" />
<option name="box" value="false" />
<option name="filler" value=" " />
</value>
</option>
<option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
<option name="keyword" value="Copyright" />
<option name="fileTypeOverride" value="2" />
<option name="relativeBefore" value="true" />
<option name="addBlankAfter" value="true" />
<option name="fileLocation" value="1" />
<option name="useAlternate" value="false" />
</LanguageOptions>
<LanguageOptions name="Properties">
<option name="templateOptions">
<value>
<option name="block" value="true" />
<option name="separateBefore" value="false" />
<option name="separateAfter" value="false" />
<option name="prefixLines" value="true" />
<option name="lenBefore" value="80" />
<option name="lenAfter" value="80" />
<option name="box" value="false" />
<option name="filler" value=" " />
</value>
</option>
<option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
<option name="keyword" value="Copyright" />
<option name="fileTypeOverride" value="2" />
<option name="relativeBefore" value="true" />
<option name="addBlankAfter" value="true" />
<option name="fileLocation" value="1" />
<option name="useAlternate" value="false" />
</LanguageOptions>
<LanguageOptions name="XML">
<option name="templateOptions">
<value>
<option name="block" value="true" />
<option name="separateBefore" value="false" />
<option name="separateAfter" value="false" />
<option name="prefixLines" value="true" />
<option name="lenBefore" value="80" />
<option name="lenAfter" value="80" />
<option name="box" value="false" />
<option name="filler" value=" " />
</value>
</option>
<option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
<option name="keyword" value="Copyright" />
<option name="fileTypeOverride" value="2" />
<option name="relativeBefore" value="true" />
<option name="addBlankAfter" value="true" />
<option name="fileLocation" value="1" />
<option name="useAlternate" value="false" />
</LanguageOptions>
</component>
<component name="libraryTable">
<library name="Groovy">
<CLASSES>
<root url="jar://$GROOVY_SDK_PATH$/lib/ant-1.7.0.jar!/" />
<root url="jar://$GROOVY_SDK_PATH$/lib/ant-junit-1.7.0.jar!/" />
<root url="jar://$GROOVY_SDK_PATH$/lib/ant-launcher-1.7.0.jar!/" />
<root url="jar://$GROOVY_SDK_PATH$/lib/antlr-2.7.6.jar!/" />
<root url="jar://$GROOVY_SDK_PATH$/lib/asm-2.2.jar!/" />
<root url="jar://$GROOVY_SDK_PATH$/lib/asm-analysis-2.2.jar!/" />
<root url="jar://$GROOVY_SDK_PATH$/lib/asm-tree-2.2.jar!/" />
<root url="jar://$GROOVY_SDK_PATH$/lib/asm-util-2.2.jar!/" />
<root url="jar://$GROOVY_SDK_PATH$/lib/bsf-2.4.0.jar!/" />
<root url="jar://$GROOVY_SDK_PATH$/lib/commons-cli-1.0.jar!/" />
<root url="jar://$GROOVY_SDK_PATH$/lib/commons-logging-1.1.jar!/" />
<root url="jar://$GROOVY_SDK_PATH$/lib/groovy-1.5.7.jar!/" />
<root url="jar://$GROOVY_SDK_PATH$/lib/jline-0.9.94.jar!/" />
<root url="jar://$GROOVY_SDK_PATH$/lib/jsp-api-2.0.jar!/" />
<root url="jar://$GROOVY_SDK_PATH$/lib/junit-3.8.2.jar!/" />
<root url="jar://$GROOVY_SDK_PATH$/lib/mockobjects-core-0.09.jar!/" />
<root url="jar://$GROOVY_SDK_PATH$/lib/mx4j-3.0.2.jar!/" />
<root url="jar://$GROOVY_SDK_PATH$/lib/servlet-api-2.4.jar!/" />
<root url="jar://$GROOVY_SDK_PATH$/lib/xpp3_min-1.1.3.4.O.jar!/" />
<root url="jar://$GROOVY_SDK_PATH$/lib/xstream-1.2.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="file://$GROOVY_SDK_PATH$/src/main" />
</SOURCES>
</library>
<library name="IDEA">
<CLASSES />
<JAVADOC />
<SOURCES />
</library>
</component>
<UsedPathMacros>
<macro name="GROOVY_SDK_PATH" description="Path to Groovy distribution directory, used in JetGroovy plugin dependencies " />
</UsedPathMacros>
</project>
-347
View File
@@ -1,347 +0,0 @@
<!--
~ Copyright 2000-2007 JetBrains s.r.o.
~ 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.
-->
<!--
This script is designed to be run as part of TeamCity build process. If you want to build plugin
locally, use packagePlugin.xml
-->
<project name="Generating the build of groovy language plugin" default="make.project">
<property file="groovy.properties"/>
<property environment="env"/>
<property name="project.dir" location="${basedir}"/>
<property name="src.dir" location="${project.dir}/src"/>
<property name="production.dest" location="${project.dir}/classes/production"/>
<property name="production.dest.groovy" location="${production.dest}/groovy"/>
<property name="production.dest.groovy_rt" location="${production.dest}/groovy_rt"/>
<property name="idea.dir" value="${project.dir}/lib/idea"/>
<property name="idea.lib" location="${idea.dir}/lib"/>
<property name="idea.plugins" location="${idea.dir}/plugins"/>
<property name="groovy.lib" value="${project.dir}/GDK"/>
<property name="test.dir" value="${project.dir}/test"/>
<property name="test.dest" value="${project .dir}/classes/test/groovy"/>
<property name="tools.jar.dir" value="${env.JAVA_HOME}/lib"/>
<property name="resources.file" value="resources_en.jar"/>
<property name="0" value="unknown"/>
<property name="build.vcs.number.Groovy_open_svn" value="unknown"/>
<property name="plugin.revision" value="${build.vcs.number.Groovy_open_svn}"/>
<property name="plugin.version" value="${groovy.plugin.version}.${plugin.revision}"/>
<property name="output" value="${basedir}/dist"/>
<path id="idea.lib.path">
<fileset dir="${idea.lib}">
<include name="**/*.jar"/>
<exclude name="boot.jar"/>
</fileset>
<fileset dir="${idea.plugins}">
<include name="CSS/lib/*.jar"/>
<include name="**/JavascriptLanguage.jar"/>
<include name="**/JavaScriptLanguage/lib/resurces_en.jar"/>
</fileset>
</path>
<path id="tools.path">
<fileset dir="${tools.jar.dir}">
<include name="**/*tools.jar"/>
</fileset>
</path>
<path id="groovy.path">
<fileset dir="${groovy.lib}">
<include name="**/*.jar"/>
</fileset>
</path>
<target name="unzip.last.successful.IDEA.build">
<unzip dest="${idea.dir}">
<fileset dir="${idea.pack}">
<include name="*.zip"/>
</fileset>
</unzip>
</target>
<target name="clear.all" description="clears all files">
<mkdir dir="${production.dest.groovy}"/>
<delete includeemptydirs="true">
<fileset dir="${production.dest.groovy}"/>
</delete>
</target>
<target name="build.lexer" description="makes lexer file">
<ant dir="${src.dir}/org/jetbrains/plugins/groovy/lang/lexer/" antfile="build.xml" target="generate.lexer"/>
<ant dir="${src.dir}/org/jetbrains/plugins/grails/lang/gsp/lexer/core" antfile="build.xml" target="generate.lexer"/>
</target>
<property name="stubsOutput" value="${project.dir}/stubs"/>
<path id="rtFiles">
<pathelement path="${project.dir}/rt/src/"/>
</path>
<path id="rtFiles.output">
<pathelement path="${production.dest.groovy_rt}"/>
</path>
<taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="groovy.path"/>
<target name="make.rt" description="makes runtime classes" depends="build.lexer, unzip.last.successful.IDEA.build">
<mkdir dir="${production.dest.groovy_rt}"/>
<javac destdir="${production.dest.groovy_rt}" target="1.3" debug="on">
<src refId="rtFiles"/>
<classpath refid="groovy.path"/>
</javac>
</target>
<target name="make.stubs">
<taskdef name="generateStubs" classname="org.codehaus.groovy.ant.GenerateStubsTask" classpathref="groovy.path"/>
<mkdir dir="${stubsOutput}"/>
<generateStubs destdir="${stubsOutput}" srcDir="${src.dir}">
<include name="**/*.groovy"/>
<include name="**/*.java"/>
<classpath>
<!--<path refid="idea.lib.path"/>-->
<path refid="groovy.path"/>
</classpath>
<configuration targetBytecode="1.5"/>
</generateStubs>
</target>
<target name="make.project" description="makes project" depends="make.rt, make.stubs">
<copy todir="${production.dest.groovy}/META-INF">
<fileset dir="${src.dir}/META-INF"/>
</copy>
<copy todir="${production.dest.groovy}">
<fileset dir="${project.dir}/resources"/>
</copy>
<copy todir="${production.dest.groovy}" flatten="false">
<fileset dir="${src.dir}">
<include name="**/*Bundle.properties"/>
</fileset>
</copy>
<taskdef name="javac2" classname="com.intellij.ant.Javac2" classpathref="idea.lib.path"/>
<path id="javaToCompile">
<pathelement path="${src.dir}"/>
<pathelement path="${stubsOutput}"/>
</path>
<javac2 destdir="${production.dest.groovy}" debug="on">
<src refId="javaToCompile"/>
<classpath refid="idea.lib.path"/>
<classpath refid="groovy.path"/>
<classpath refid="rtFiles.output"/>
</javac2>
<path id="output.path">
<pathelement path="${production.dest.groovy}"/>
</path>
<!--<touch>
<fileset dir=".">
<include name="**/*.groovy"/>
</fileset>
</touch>-->
<!--<groovyc destdir="${production.dest.groovy}" srcDir=".">
<classpath>
<path refid="idea.lib.path"/>
<path refid="groovy.path"/>
<path refid="output.path"/>
</classpath>
</groovyc>-->
<replace file="${production.dest.groovy}/META-INF/plugin.xml" token="VERSION" value="${plugin.version}"/>
</target>
<target name="build.project" depends="clear.all, make.project" description="builds project"/>
<target name="rebuild.all" depends="build.project, jar.groovy, zip.sources.groovy"
description="builds and jar project and zip sources"/>
<target name="jar.groovy" depends="make.project" description="makes groovy jar">
<mkdir dir="${project.dir}/tempzip/Groovy/lib"/>
<mkdir dir="${project.dir}/tempjar/lib/"/>
<jar destfile="${project.dir}/tempzip/Groovy/lib/groovy_rt.jar">
<fileset dir="${production.dest.groovy_rt}">
</fileset>
</jar>
<jar destfile="${project.dir}/tempzip/Groovy/lib/Groovy.jar">
<fileset dir="${production.dest.groovy}" excludes="**/*build.xml, **/groovy.properties">
</fileset>
<fileset dir="${project.dir}/tempjar">
</fileset>
<manifest>
<attribute name="Revision" value="${plugin.revision}"/>
<attribute name="Build" value="${plugin.version}"/>
</manifest>
</jar>
<copy todir="${project.dir}/tempzip/Groovy/lib">
<fileset dir="${groovy.lib}">
<include name="groovy-all*.jar"/>
</fileset>
</copy>
<zip destfile="${project.dir}/jetgroovy-bin-${plugin.version}.zip" basedir="${project.dir}/tempzip"/>
<delete dir="${project.dir}/tempzip"/>
<delete dir="${project.dir}/tempjar"/>
</target>
<target name="zip.sources.groovy" description="zips sources">
<zip destfile="${project.dir}/jetgroovy-src-${plugin.version}.zip"
basedir="${project.dir}"
includes="src/**/*.java,
src/**/*.properties,
src/**/*.flex,
src/**/*.jar,
src/**/*.skeleton,
src/**/*.xml,
resources/**/*.*,
META-INF/**/*.xml"
excludes="src/**/*junit*"
/>
</target>
<target name="build tests" depends="make.project">
<mkdir dir="${test.dest}"/>
<mkdir dir="${test.dest}/groovy"/>
<javac srcdir="${project.dir}/test"
destdir="${test.dest}"
debug="on">
<classpath refid="idea.lib.path"/>
<classpath refid="groovy.path"/>
<classpath>
<path location="${production.dest.groovy}"/>
</classpath>
</javac>
<path id="output.path">
<pathelement path="${production.dest.groovy}"/>
</path>
<path id="test.out">
<pathelement path="${test.dest}"/>
</path>
<groovyc destdir="${project.dir}/test" srcDir="${project.dir}/test">
<include name="**/Groovy*Test.groovy"/>
<classpath>
<path refid="idea.lib.path"/>
<path refid="test.out"/>
<path refid="groovy.path"/>
<path refid="output.path"/>
</classpath>
</groovyc>
<groovyc destdir="${test.dest}" srcDir="${project.dir}/test">
<include name="**/Groovy*Test.groovy"/>
<classpath>
<path refid="idea.lib.path"/>
<path refid="test.out"/>
<path refid="groovy.path"/>
<path refid="output.path"/>
</classpath>
</groovyc>
<copy toDir="${idea.dir}/svnPlugins/groovy/testdata">
<fileset dir="${project.dir}/testdata"/>
</copy>
<copy toDir="${idea.dir}/svnPlugins/groovy/test">
<fileset dir="${project.dir}/test"/>
</copy>
</target>
<target name="run.tests" description="runs all tests" depends="build tests">
<mkdir dir="${project.dir}/logs"/>
<echo message="${idea.lib}"/>
<junit fork="yes"
dir="${project.dir}"
printsummary="yes"
haltonerror="no"
haltonfailure="no"
description="runs junit tests">
<classpath>
<path location="${test.dest}"/>
<path location="${test.dir}"/>
<path location="${production.dest.groovy}"/>
<path refid="idea.lib.path"/>
<path refid="groovy.path"/>
<path refid="tools.path"/>
</classpath>
<jvmarg value="-Xbootclasspath/a:${idea.lib}/boot.jar"/>
<jvmarg value="-Djava.awt.headless=true"/>
<jvmarg value="-Xmx256M"/>
<jvmarg value="-ea"/>
<jvmarg value="-Xdebug"/>
<jvmarg value="-Djava.compiler=NONE"/>
<jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5006"/>
<jvmarg value="-Didea.config.path=${output}/config"/>
<jvmarg value="-Didea.system.path=${output}/system"/>
<jvmarg value="-Didea.plugins.path=${production.dest}"/>
<jvmarg value="-Didea.load.plugins.id=org.intellij.groovy"/>
<formatter type="plain"/>
<batchtest todir="${project.dir}/logs">
<fileset dir="${test.dir}">
<include name="**/*Test.java"/>
</fileset>
<fileset dir="${test.dir}">
<include name="**/Groovy*Test.class"/>
</fileset>
</batchtest>
</junit>
<!--cleanup-->
<delete dir="${project.dir}/test">
<include name="**/Groovy*.class"/>
</delete>
</target>
</project>
-149
View File
@@ -1,149 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module relativePaths="true" type="PLUGIN_MODULE" version="4">
<component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/src/META-INF/plugin.xml" />
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
</content>
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="inheritedJdk" />
<orderEntry type="module" module-name="rt" />
<orderEntry type="library" name="Groovy" level="project" />
<orderEntry type="library" name="IDEA" level="project" />
</component>
<component name="copyright">
<Base>
<setting name="state" value="1" />
</Base>
<LanguageOptions name="HTML">
<option name="templateOptions">
<value>
<option name="block" value="true" />
<option name="separateBefore" value="false" />
<option name="separateAfter" value="false" />
<option name="prefixLines" value="true" />
<option name="lenBefore" value="80" />
<option name="lenAfter" value="80" />
<option name="box" value="false" />
<option name="filler" value=" " />
</value>
</option>
<option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
<option name="keyword" value="Copyright" />
<option name="fileTypeOverride" value="2" />
<option name="relativeBefore" value="true" />
<option name="addBlankAfter" value="true" />
<option name="fileLocation" value="1" />
<option name="useAlternate" value="false" />
</LanguageOptions>
<LanguageOptions name="JAVA">
<option name="templateOptions">
<value>
<option name="block" value="true" />
<option name="separateBefore" value="false" />
<option name="separateAfter" value="false" />
<option name="prefixLines" value="true" />
<option name="lenBefore" value="80" />
<option name="lenAfter" value="80" />
<option name="box" value="false" />
<option name="filler" value=" " />
</value>
</option>
<option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
<option name="keyword" value="Copyright" />
<option name="fileTypeOverride" value="3" />
<option name="relativeBefore" value="true" />
<option name="addBlankAfter" value="true" />
<option name="fileLocation" value="1" />
<option name="useAlternate" value="false" />
</LanguageOptions>
<LanguageOptions name="JSP">
<option name="templateOptions">
<value>
<option name="block" value="true" />
<option name="separateBefore" value="false" />
<option name="separateAfter" value="false" />
<option name="prefixLines" value="true" />
<option name="lenBefore" value="80" />
<option name="lenAfter" value="80" />
<option name="box" value="false" />
<option name="filler" value=" " />
</value>
</option>
<option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
<option name="keyword" value="Copyright" />
<option name="fileTypeOverride" value="2" />
<option name="relativeBefore" value="true" />
<option name="addBlankAfter" value="true" />
<option name="fileLocation" value="1" />
<option name="useAlternate" value="false" />
</LanguageOptions>
<LanguageOptions name="JavaScript">
<option name="templateOptions">
<value>
<option name="block" value="true" />
<option name="separateBefore" value="false" />
<option name="separateAfter" value="false" />
<option name="prefixLines" value="true" />
<option name="lenBefore" value="80" />
<option name="lenAfter" value="80" />
<option name="box" value="false" />
<option name="filler" value=" " />
</value>
</option>
<option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
<option name="keyword" value="Copyright" />
<option name="fileTypeOverride" value="2" />
<option name="relativeBefore" value="true" />
<option name="addBlankAfter" value="true" />
<option name="fileLocation" value="1" />
<option name="useAlternate" value="false" />
</LanguageOptions>
<LanguageOptions name="Properties">
<option name="templateOptions">
<value>
<option name="block" value="true" />
<option name="separateBefore" value="false" />
<option name="separateAfter" value="false" />
<option name="prefixLines" value="true" />
<option name="lenBefore" value="80" />
<option name="lenAfter" value="80" />
<option name="box" value="false" />
<option name="filler" value=" " />
</value>
</option>
<option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
<option name="keyword" value="Copyright" />
<option name="fileTypeOverride" value="2" />
<option name="relativeBefore" value="true" />
<option name="addBlankAfter" value="true" />
<option name="fileLocation" value="1" />
<option name="useAlternate" value="false" />
</LanguageOptions>
<LanguageOptions name="XML">
<option name="templateOptions">
<value>
<option name="block" value="true" />
<option name="separateBefore" value="false" />
<option name="separateAfter" value="false" />
<option name="prefixLines" value="true" />
<option name="lenBefore" value="80" />
<option name="lenAfter" value="80" />
<option name="box" value="false" />
<option name="filler" value=" " />
</value>
</option>
<option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
<option name="keyword" value="Copyright" />
<option name="fileTypeOverride" value="2" />
<option name="relativeBefore" value="true" />
<option name="addBlankAfter" value="true" />
<option name="fileLocation" value="1" />
<option name="useAlternate" value="false" />
</LanguageOptions>
</component>
</module>
@@ -1,15 +0,0 @@
# Path to Groovy distribution
path.variable.groovy_sdk_path=D:/dev/Groovy-1.5.6
# Path to IDEA distribution, used in groovy module SDK
jdk.home.jetgroovy_idea_sdk=C:/Program Files/JetBrains/IntelliJ IDEA 9712
# Path to JDK 1.6 (or higher) installation
jdk.home.jetgroovy_compile_with_jdk=D:/dev/jdk1.6
# rt module needs to be run against any JDK the user will have in her Groovy project in IntelliJ IDEA.
# So it should compile against JDK 1.4. Ideally, this variable should point to such a JDK.
jdk.home.jetgroovy_runtime_jdk=C:/sdks/j2sdk1.4.2_08
# Whether to skip the tests or not
skip.tests=true
-461
View File
@@ -1,461 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="Package JetGroovy plugin" default="all">
<!--
In order for plugin packaging to work, you should have a groovy.properties file
next to this one, under the module content root. The template file is groovy.template.properties
-->
<property file="groovy.properties"/>
<property name="idea.home" value="${jdk.home.jetgroovy_idea_sdk}"/>
<property name="javac2.home" value="${idea.home}/lib"/>
<path id="javac2.classpath">
<pathelement location="${javac2.home}/javac2.jar"/>
<pathelement location="${javac2.home}/jdom.jar"/>
<pathelement location="${javac2.home}/jgoodies-forms.jar"/>
<pathelement location="${javac2.home}/asm.jar"/>
<pathelement location="${javac2.home}/asm-commons.jar"/>
</path>
<taskdef name="javac2" classname="com.intellij.ant.Javac2" classpathref="javac2.classpath"/>
<taskdef name="instrumentIdeaExtensions" classname="com.intellij.ant.InstrumentIdeaExtensions" classpathref="javac2.classpath"/>
<!-- Compiler options -->
<property name="compiler.debug" value="on"/>
<property name="compiler.generate.no.warnings" value="off"/>
<property name="compiler.args" value=""/>
<property name="compiler.max.memory" value="128m"/>
<patternset id="ignored.files">
<exclude name="**/CVS/**"/>
<exclude name="**/SCCS/**"/>
<exclude name="**/RCS/**"/>
<exclude name="**/rcs/**"/>
<exclude name="**/.DS_Store/**"/>
<exclude name="**/.svn/**"/>
<exclude name="**/vssver.scc/**"/>
<exclude name="**/vssver2.scc/**"/>
<exclude name="**/.sbas/**"/>
<exclude name="**/.IJI.*/**"/>
<exclude name="**/.pyc/**"/>
<exclude name="**/.pyo/**"/>
<exclude name="**/*.pyc/**"/>
<exclude name="**/*.pyo/**"/>
<exclude name="**/.git/**"/>
</patternset>
<patternset id="library.patterns">
<include name="*.zip"/>
<include name="*.war"/>
<include name="*.egg"/>
<include name="*.ear"/>
<include name="*.swc"/>
<include name="*.jar"/>
</patternset>
<patternset id="compiler.resources">
<include name="**/?*.properties"/>
<include name="**/?*.xml"/>
<include name="**/?*.gif"/>
<include name="**/?*.png"/>
<include name="**/?*.jpeg"/>
<include name="**/?*.jpg"/>
<include name="**/?*.html"/>
<include name="**/?*.ft"/>
<include name="**/?*.dtd"/>
<include name="**/?*.tld"/>
<include name="**/?*.groovy"/>
</patternset>
<!-- JDK definitions -->
<property name="jdk.bin.jetgroovy_idea_sdk" value="${jdk.home.jetgroovy_compile_with_jdk}/bin"/>
<path id="jdk.classpath.jetgroovy_idea_sdk">
<fileset dir="${jdk.home.jetgroovy_idea_sdk}">
<include name="lib/alloy.jar"/>
<include name="lib/annotations.jar"/>
<include name="lib/asm-commons.jar"/>
<include name="lib/asm-tree-3.0.jar"/>
<include name="lib/asm.jar"/>
<include name="lib/boot.jar"/>
<include name="lib/bootstrap.jar"/>
<include name="lib/cglib-nodep-2.1_3.jar"/>
<include name="lib/commons-codec-1.3.jar"/>
<include name="lib/commons-collections.jar"/>
<include name="lib/commons-lang-2.4.jar"/>
<include name="lib/commons-net-1.4.1.jar"/>
<include name="lib/coverage-agent.jar"/>
<include name="lib/emma-agent.jar"/>
<include name="lib/emma.jar"/>
<include name="lib/extensions.jar"/>
<include name="lib/forms_rt.jar"/>
<include name="lib/icons.jar"/>
<include name="lib/idea_rt.jar"/>
<include name="lib/j2ee.jar"/>
<include name="lib/jasper21_rt.jar"/>
<include name="lib/jasper2_rt.jar"/>
<include name="lib/javac2.jar"/>
<include name="lib/javaee.jar"/>
<include name="lib/jaxen-1.1.1.jar"/>
<include name="lib/jdom.jar"/>
<include name="lib/jgoodies-forms.jar"/>
<include name="lib/jh.jar"/>
<include name="lib/jna-utils.jar"/>
<include name="lib/jna.jar"/>
<include name="lib/JNIWrap.jar"/>
<include name="lib/jsf-api.jar"/>
<include name="lib/jsp-api.jar"/>
<include name="lib/junit-4.6.jar"/>
<include name="lib/junit.jar"/>
<include name="lib/log4j.jar"/>
<include name="lib/microba.jar"/>
<include name="lib/nanoxml-2.2.3.jar"/>
<include name="lib/openapi.jar"/>
<include name="lib/org.eclipse.jdt.core*.jar"/>
<include name="lib/oromatcher.jar"/>
<include name="lib/picocontainer.jar"/>
<include name="lib/resolver.jar"/>
<include name="lib/resources.jar"/>
<include name="lib/resources_en.jar"/>
<include name="lib/serviceMessages.jar"/>
<include name="lib/servlet-api.jar"/>
<include name="lib/trove4j.jar"/>
<include name="lib/trove4j_src.jar"/>
<include name="lib/util.jar"/>
<include name="lib/velocity.jar"/>
<include name="lib/xerces.jar"/>
<include name="lib/xml-apis.jar"/>
<include name="lib/xmlrpc-2.0.jar"/>
<include name="lib/xpp3-1.1.4-min.jar"/>
<include name="lib/xstream.jar"/>
<include name="lib/yjp-controller-api-redist.jar"/>
<include name="plugins/JavaEE/lib/javaee-openapi.jar"/>
<include name="plugins/JavaEE/lib/resources_en.jar"/>
<include name="plugins/JSF/lib/jsf-openapi.jar"/>
<include name="plugins/JSF/lib/resources_en.jar"/>
<include name="plugins/PersistenceSupport/lib/persistence-openapi.jar"/>
<include name="plugins/PersistenceSupport/lib/resources_en.jar"/>
<include name="lib/idea.jar"/>
<include name="plugins/Spring/lib/spring.jar"/>
<include name="plugins/JavaEE/lib/javaee-impl.jar"/>
<include name="plugins/JavaScriptLanguage/lib/JavascriptLanguage.jar"/>
<include name="plugins/CSS/lib/css-openapi.jar"/>
<include name="plugins/CSS/lib/css.jar"/>
<include name="${jdk.home.jetgroovy_compile_with_jdk}/lib/tools.jar"/>
<include name="lib/ant/lib/ant.jar"/>
<include name="lib/groovy-all-1.6.3.jar"/>
<include name="${jdk.home.jetgroovy_compile_with_jdk}/jre/lib/charsets.jar"/>
<include name="${jdk.home.jetgroovy_compile_with_jdk}/jre/lib/deploy.jar"/>
<include name="${jdk.home.jetgroovy_compile_with_jdk}/jre/lib/javaws.jar"/>
<include name="${jdk.home.jetgroovy_compile_with_jdk}/jre/lib/jce.jar"/>
<include name="${jdk.home.jetgroovy_compile_with_jdk}/jre/lib/jsse.jar"/>
<include name="${jdk.home.jetgroovy_compile_with_jdk}/jre/lib/plugin.jar"/>
<include name="${jdk.home.jetgroovy_compile_with_jdk}/jre/lib/rt.jar"/>
<include name="${jdk.home.jetgroovy_compile_with_jdk}/jre/lib/ext/dnsns.jar"/>
<include name="${jdk.home.jetgroovy_compile_with_jdk}/jre/lib/ext/localedata.jar"/>
<include name="${jdk.home.jetgroovy_compile_with_jdk}/jre/lib/ext/sunjce_provider.jar"/>
<include name="${jdk.home.jetgroovy_compile_with_jdk}/jre/lib/ext/sunpkcs11.jar"/>
</fileset>
</path>
<property name="jdk.bin.jetgroovy_runtime_jdk" value="${jdk.home.jetgroovy_runtime_jdk}/bin"/>
<path id="jdk.classpath.jetgroovy_runtime_jdk">
<fileset dir="${jdk.home.jetgroovy_runtime_jdk}">
<include name="jre/lib/charsets.jar"/>
<include name="jre/lib/deploy.jar"/>
<include name="jre/lib/javaws.jar"/>
<include name="jre/lib/jce.jar"/>
<include name="jre/lib/jsse.jar"/>
<include name="jre/lib/plugin.jar"/>
<include name="jre/lib/rt.jar"/>
<include name="jre/lib/ext/dnsns.jar"/>
<include name="jre/lib/ext/localedata.jar"/>
<include name="jre/lib/ext/sunjce_provider.jar"/>
<include name="jre/lib/ext/sunpkcs11.jar"/>
<include name="${path.variable.groovy_sdk_path}/lib/groovy-all*.jar"/>
</fileset>
</path>
<property name="project.jdk.home" value="${jdk.home.jetgroovy_idea_sdk}"/>
<property name="project.jdk.bin" value="${jdk.bin.jetgroovy_idea_sdk}"/>
<property name="project.jdk.classpath" value="jdk.classpath.jetgroovy_idea_sdk"/>
<!-- Project Libraries -->
<path id="library.groovy.classpath">
<fileset dir="${path.variable.groovy_sdk_path}/lib" includes="ant-*.jar"/>
<fileset dir="${path.variable.groovy_sdk_path}/lib" includes="antlr-*.jar"/>
<fileset dir="${path.variable.groovy_sdk_path}/lib" includes="asm-*.jar"/>
<fileset dir="${path.variable.groovy_sdk_path}/lib" includes="bsf-*.jar"/>
<fileset dir="${path.variable.groovy_sdk_path}/lib" includes="commons-cli-*.jar"/>
<fileset dir="${path.variable.groovy_sdk_path}/lib" includes="commons-logging-*.jar"/>
<fileset dir="${path.variable.groovy_sdk_path}/lib" includes="groovy-*.jar"/>
<fileset dir="${path.variable.groovy_sdk_path}/lib" includes="jline-*.jar"/>
<fileset dir="${path.variable.groovy_sdk_path}/lib" includes="jsp-api-*.jar"/>
<fileset dir="${path.variable.groovy_sdk_path}/lib" includes="junit-*.jar"/>
<fileset dir="${path.variable.groovy_sdk_path}/lib" includes="mockobjects-core-*.jar"/>
<fileset dir="${path.variable.groovy_sdk_path}/lib" includes="mx4j-*.jar"/>
<fileset dir="${path.variable.groovy_sdk_path}/lib" includes="servlet-api-*.jar"/>
<fileset dir="${path.variable.groovy_sdk_path}/lib" includes="xpp3_min-*.jar"/>
<fileset dir="${path.variable.groovy_sdk_path}/lib" includes="xstream-*.jar"/>
</path>
<path id="library.idea.classpath"/>
<!-- Global Libraries -->
<!-- Modules -->
<!-- Module rt -->
<dirname property="module.rt.basedir" file="${ant.file}"/>
<property name="module.jdk.home.rt" value="${jdk.home.jetgroovy_runtime_jdk}"/>
<property name="module.jdk.bin.rt" value="${jdk.bin.jetgroovy_runtime_jdk}"/>
<property name="module.jdk.classpath.rt" value="jdk.classpath.jetgroovy_runtime_jdk"/>
<property name="compiler.args.rt" value="${compiler.args}"/>
<property name="rt.output.dir" value="${module.rt.basedir}/classes/production/rt"/>
<property name="rt.testoutput.dir" value="${module.rt.basedir}/classes/test/rt"/>
<path id="rt.module.bootclasspath">
<!-- Paths to be included in compilation bootclasspath -->
</path>
<path id="rt.module.classpath">
<path refid="${module.jdk.classpath.rt}"/>
<path refid="library.groovy.classpath"/>
</path>
<path id="rt.runtime.module.classpath">
<pathelement location="${rt.output.dir}"/>
<pathelement location="${rt.testoutput.dir}"/>
<path refid="library.groovy.classpath"/>
</path>
<patternset id="excluded.from.module.rt">
<patternset refid="ignored.files"/>
</patternset>
<patternset id="excluded.from.compilation.rt">
<patternset refid="excluded.from.module.rt"/>
</patternset>
<path id="rt.module.sourcepath">
<dirset dir="${module.rt.basedir}/rt">
<include name="src"/>
</dirset>
</path>
<target name="compile.module.rt" depends="compile.module.rt.production,compile.module.rt.tests" description="Compile module rt"/>
<target name="compile.module.rt.production" description="Compile module rt; production classes">
<mkdir dir="${rt.output.dir}"/>
<javac2 destdir="${rt.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true" executable="${module.jdk.bin.rt}/javac">
<compilerarg line="${compiler.args.rt}"/>
<bootclasspath refid="rt.module.bootclasspath"/>
<classpath refid="rt.module.classpath"/>
<src refid="rt.module.sourcepath"/>
<patternset refid="excluded.from.compilation.rt"/>
</javac2>
<copy todir="${rt.output.dir}">
<fileset dir="${module.rt.basedir}/rt/src">
<patternset refid="compiler.resources"/>
<type type="file"/>
</fileset>
</copy>
</target>
<target name="compile.module.rt.tests" depends="compile.module.rt.production" description="compile module rt; test classes" unless="skip.tests"/>
<target name="clean.module.rt" description="cleanup module">
<delete dir="${rt.output.dir}"/>
<delete dir="${rt.testoutput.dir}"/>
</target>
<!-- Module groovy -->
<dirname property="module.groovy.basedir" file="${ant.file}"/>
<property name="module.jdk.home.groovy" value="${project.jdk.home}"/>
<property name="module.jdk.bin.groovy" value="${project.jdk.bin}"/>
<property name="module.jdk.classpath.groovy" value="${project.jdk.classpath}"/>
<property name="compiler.args.groovy" value="${compiler.args}"/>
<property name="groovy.output.dir" value="${module.groovy.basedir}/classes/production/groovy"/>
<property name="groovy.testoutput.dir" value="${module.groovy.basedir}/classes/test/groovy"/>
<path id="groovy.module.bootclasspath">
<!-- Paths to be included in compilation bootclasspath -->
</path>
<path id="groovy.module.classpath">
<path refid="${module.jdk.classpath.groovy}"/>
<pathelement location="${rt.output.dir}"/>
<pathelement location="${rt.testoutput.dir}"/>
<path refid="library.groovy.classpath"/>
<path refid="library.idea.classpath"/>
</path>
<path id="groovy.runtime.module.classpath">
<pathelement location="${groovy.output.dir}"/>
<pathelement location="${groovy.testoutput.dir}"/>
<path refid="rt.runtime.module.classpath"/>
<path refid="library.groovy.classpath"/>
<path refid="library.idea.classpath"/>
</path>
<patternset id="excluded.from.module.groovy">
<patternset refid="ignored.files"/>
</patternset>
<patternset id="excluded.from.compilation.groovy">
<patternset refid="excluded.from.module.groovy"/>
</patternset>
<path id="groovy.module.sourcepath">
<dirset dir="${module.groovy.basedir}">
<include name="resources"/>
<include name="src"/>
</dirset>
</path>
<path id="groovy.module.test.sourcepath">
<dirset dir="${module.groovy.basedir}">
<include name="test"/>
</dirset>
</path>
<target name="compile.module.groovy" depends="compile.module.groovy.production,compile.module.groovy.tests" description="Compile module groovy"/>
<target name="compile.module.groovy.production" depends="compile.module.rt" description="Compile module groovy; production classes">
<mkdir dir="${groovy.output.dir}"/>
<javac2 destdir="${groovy.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true" executable="${module.jdk.bin.groovy}/javac">
<compilerarg line="${compiler.args.groovy}"/>
<bootclasspath refid="groovy.module.bootclasspath"/>
<classpath refid="groovy.module.classpath"/>
<src refid="groovy.module.sourcepath"/>
<patternset refid="excluded.from.compilation.groovy"/>
</javac2>
<copy todir="${groovy.output.dir}">
<fileset dir="${module.groovy.basedir}/resources">
<patternset refid="compiler.resources"/>
<type type="file"/>
</fileset>
<fileset dir="${module.groovy.basedir}/src">
<patternset refid="compiler.resources"/>
<type type="file"/>
</fileset>
</copy>
</target>
<target name="compile.module.groovy.tests" depends="compile.module.groovy.production" description="compile module groovy; test classes" unless="skip.tests">
<mkdir dir="${groovy.testoutput.dir}"/>
<javac2 destdir="${groovy.testoutput.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true" executable="${module.jdk.bin.groovy}/javac">
<compilerarg line="${compiler.args.groovy}"/>
<classpath refid="groovy.module.classpath"/>
<classpath>
<path refid="groovy.module.classpath"/>
<pathelement location="${groovy.output.dir}"/>
</classpath>
<src refid="groovy.module.test.sourcepath"/>
<patternset refid="excluded.from.compilation.groovy"/>
</javac2>
<copy todir="${groovy.testoutput.dir}">
<fileset dir="${module.groovy.basedir}/test">
<patternset refid="compiler.resources"/>
<type type="file"/>
</fileset>
</copy>
</target>
<target name="clean.module.groovy" description="cleanup module">
<delete dir="${groovy.output.dir}"/>
<delete dir="${groovy.testoutput.dir}"/>
</target>
<property name="groovy.plugin.exploded.dir" value="${idea.home}/system/plugins-sandbox/plugins/groovy"/>
<property name="groovy.path.jar" value="${module.groovy.basedir}/Groovy.zip"/>
<target name="plugin.build.groovy" depends="compile.module.groovy" description="Build configured plugin directories and archives for module &apos;groovy&apos;">
<antcall target="plugin.build.exploded.groovy">
<param name="plugin.dir.exploded" value="${groovy.plugin.exploded.dir}"/>
</antcall>
<antcall target="plugin.build.jar.groovy">
<param name="plugin.path.jar" value="${groovy.path.jar}"/>
</antcall>
</target>
<!-- Call the target to build exploded directory for module 'groovy'.\n Path to the exploded directory is specified by parameter 'plugin.dir.exploded' -->
<target name="plugin.build.exploded.groovy" description="Plugin exploded directory for module &apos;groovy&apos;">
<copy todir="${plugin.dir.exploded}/lib/">
<fileset dir="${path.variable.groovy_sdk_path}/lib/">
<include name="xstream-*.jar"/>
<include name="xpp3_min-*.jar"/>
<include name="servlet-api-*.jar"/>
<include name="mx4j-*.jar"/>
<include name="mockobjects-core-*.jar"/>
<include name="junit-*.jar"/>
<include name="jsp-api-*.jar"/>
<include name="jline-*.jar"/>
<include name="groovy-*.jar"/>
<include name="commons-logging-*.jar"/>
<include name="commons-cli-*.jar"/>
<include name="bsf-*.jar"/>
<include name="asm-*.jar"/>
<include name="antlr-*.jar"/>
<include name="ant-*.jar"/>
</fileset>
</copy>
<copy todir="${plugin.dir.exploded}/classes">
<fileset dir="${module.groovy.basedir}/classes/production/rt"/>
</copy>
<copy todir="${plugin.dir.exploded}/classes">
<fileset dir="${module.groovy.basedir}/classes/production/groovy"/>
</copy>
<copy file="${module.groovy.basedir}/src/META-INF/groovy-javaee-integration.xml" tofile="${plugin.dir.exploded}/META-INF/groovy-javaee-integration.xml"/>
<copy file="${module.groovy.basedir}/src/META-INF/groovy-spring-integration.xml" tofile="${plugin.dir.exploded}/META-INF/groovy-spring-integration.xml"/>
<copy file="${module.groovy.basedir}/src/META-INF/groovy-js-integration.xml" tofile="${plugin.dir.exploded}/META-INF/groovy-js-integration.xml"/>
<copy file="${module.groovy.basedir}/src/META-INF/plugin.xml" tofile="${plugin.dir.exploded}/META-INF/plugin.xml"/>
</target>
<!-- Call the target to build archive for module 'groovy'.\n Path to the archive file is specified by parameter 'plugin.path.jar' -->
<target name="plugin.build.jar.groovy" description="Build plugin archive for module &apos;groovy&apos;">
<property name="tmp.dir.groovy" value="${module.groovy.basedir}/temp"/>
<mkdir dir="${tmp.dir.groovy}"/>
<mkdir dir="${tmp.dir.groovy}/lib"/>
<jar destfile="${tmp.dir.groovy}/lib/Groovy.jar" duplicate="preserve">
<zipfileset dir="${module.groovy.basedir}/classes/production/groovy" prefix=""/>
</jar>
<jar destfile="${tmp.dir.groovy}/lib/groovy-rt.jar" duplicate="preserve">
<zipfileset dir="${module.groovy.basedir}/classes/production/rt" prefix=""/>
</jar>
<copy file="${module.groovy.basedir}/resources/conf/groovy-starter.conf" todir="${tmp.dir.groovy}/lib"/>
<zip destfile="${groovy.path.jar}">
<fileset dir="${module.groovy.basedir}/temp"/>
</zip>
<delete dir="${tmp.dir.groovy}"/>
</target>
<target name="init" description="Build initialization">
<!-- Perform any build initialization in this target -->
</target>
<target name="clean" depends="clean.module.rt, clean.module.groovy" description="cleanup all"/>
<target name="all" depends="init, clean, compile.module.rt, plugin.build.groovy" description="build all"/>
</project>
@@ -22,6 +22,7 @@ import com.intellij.openapi.application.Application;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.command.CommandProcessor;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.VirtualFileManager;
import com.intellij.psi.*;
@@ -200,8 +201,8 @@ public class GroovyMoveClassTest extends LightCodeInsightFixtureTestCase {
final byte[] bytes1 = contentsToByteArray(f1);
final byte[] bytes2 = f2.contentsToByteArray();
String s1 = new String(bytes1);
String s2 = new String(bytes2);
String s1 = StringUtil.convertLineSeparators(new String(bytes1));
String s2 = StringUtil.convertLineSeparators(new String(bytes2));
try {
assertEquals(s1, s2);
@@ -43,15 +43,15 @@ public class MavenModelReadingAndWritingTest extends MavenImportingTestCase {
}
}, null, null);
assertEquals("<?xml version=\"1.0\"?>\r\n" +
"<project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\r\n" +
" xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd\">\r\n" +
" <modelVersion>4.0.0</modelVersion>\r\n" +
" <groupId>foo</groupId>\r\n" +
" <artifactId>bar</artifactId>\r\n" +
" <version>baz</version>\r\n" +
"</project>",
VfsUtil.loadText(myProjectPom));
assertSameLines("<?xml version=\"1.0\"?>\r\n" +
"<project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\r\n" +
" xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd\">\r\n" +
" <modelVersion>4.0.0</modelVersion>\r\n" +
" <groupId>foo</groupId>\r\n" +
" <artifactId>bar</artifactId>\r\n" +
" <version>baz</version>\r\n" +
"</project>",
VfsUtil.loadText(myProjectPom));
}
public void testAddingADependency() throws Exception {
@@ -68,21 +68,21 @@ public class MavenModelReadingAndWritingTest extends MavenImportingTestCase {
}
}, null, null);
assertEquals("<?xml version=\"1.0\"?>\r\n" +
"<project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\r\n" +
" xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd\">\r\n" +
" <modelVersion>4.0.0</modelVersion>\r\n" +
" <groupId>test</groupId>\r\n" +
" <artifactId>project</artifactId>\r\n" +
" <version>1</version>\r\n" +
" <dependencies>\r\n" +
" <dependency>\r\n" +
" <groupId>group</groupId>\r\n" +
" <artifactId>artifact</artifactId>\r\n" +
" <version>version</version>\r\n" +
" </dependency>\r\n" +
" </dependencies>\r\n" +
"</project>", VfsUtil.loadText(myProjectPom));
assertSameLines("<?xml version=\"1.0\"?>\r\n" +
"<project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\r\n" +
" xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd\">\r\n" +
" <modelVersion>4.0.0</modelVersion>\r\n" +
" <groupId>test</groupId>\r\n" +
" <artifactId>project</artifactId>\r\n" +
" <version>1</version>\r\n" +
" <dependencies>\r\n" +
" <dependency>\r\n" +
" <groupId>group</groupId>\r\n" +
" <artifactId>artifact</artifactId>\r\n" +
" <version>version</version>\r\n" +
" </dependency>\r\n" +
" </dependencies>\r\n" +
"</project>", VfsUtil.loadText(myProjectPom));
}
private MavenDomProjectModel getDomModel() {
@@ -62,23 +62,23 @@ public class XsltHighlightingTest extends TestBase {
doXsltHighlighting();
}
public void testInValidPattern1() throws Throwable {
public void testInvalidPattern1() throws Throwable {
doXsltHighlighting();
}
public void testInValidPattern2() throws Throwable {
public void testInvalidPattern2() throws Throwable {
doXsltHighlighting();
}
public void testInValidPattern3() throws Throwable {
public void testInvalidPattern3() throws Throwable {
doXsltHighlighting();
}
public void testInValidPattern4() throws Throwable {
public void testInvalidPattern4() throws Throwable {
doXsltHighlighting();
}
public void testInValidPattern5() throws Throwable {
public void testInvalidPattern5() throws Throwable {
doXsltHighlighting();
}