Rename scalariform.core -> scalariform

scala-ide · Jul 17, 2010 · 88b2ade · 88b2ade
1 parent 5160383
commit 88b2ade
Show file tree

Hide file tree

Showing 71 changed files with 25 additions and 22 deletions.
diff --git a/corpusscan/.classpath b/corpusscan/.classpath
@@ -4,7 +4,7 @@
 	<classpathentry kind="con" path="sbt.eclipse.CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/scalariform.core"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/scalariform"/>
 	<classpathentry kind="lib" path="lib_managed/scala_2.8.0.RC6/compile/commons-io-1.4.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/gui/.classpath b/gui/.classpath
@@ -4,7 +4,7 @@
 	<classpathentry kind="con" path="sbt.eclipse.CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/scalariform.core"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/scalariform"/>
 	<classpathentry kind="lib" path="lib_managed/scala_2.8.0.RC6/compile/miglayout-3.7.1.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>com.github.mdr</groupId>
+  <groupId>org.scalariform</groupId>
   <artifactId>scalariform.parent</artifactId>
   <version>0.0.5-SNAPSHOT</version>
   <packaging>pom</packaging>
@@ -13,8 +13,7 @@
     <encoding>UTF-8</encoding>
   </properties>
   <modules>
-    <module>scalariform.core</module>
-<!--    <module>scalariform.eclipse</module> -->
+    <module>scalariform</module>
     <module>scalariform.feature</module>
     <module>scalariform.update</module>
   </modules>

diff --git a/project/build.properties b/project/build.properties
@@ -1,9 +1,9 @@
 #Project properties
-#Thu Jul 15 13:00:04 BST 2010
+#Sat Jul 17 12:34:01 BST 2010
 project.organization=-
 project.name=scalariform
 sbt.version=0.7.4
-project.version=0.0.5
+project.version=0.0.5-SNAPSHOT
 def.scala.version=2.7.7
 build.scala.versions=2.8.0
 project.initialize=false
diff --git a/project/build/Project.scala b/project/build/Project.scala
@@ -2,7 +2,7 @@ import sbt._
 
 class Project(info: ProjectInfo) extends ParentProject(info) {
 
-  lazy val main = project("scalariform.core", "scalariform.core", new CoreProject(_))
+  lazy val main = project("scalariform", "scalariform", new CoreProject(_))
   lazy val gui = project("gui", "gui", new GuiProject(_), main)
   lazy val corpusScan = project("corpusscan", "corpusscan", new CorpusScanProject(_), main)
 

diff --git a/scalariform.eclipse/META-INF/MANIFEST.MF b/scalariform.eclipse/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Scalariform for Eclipse
 Bundle-SymbolicName: scalariform.eclipse;singleton:=true
 Bundle-Version: 0.0.5.qualifier
 Require-Bundle: 
- scalariform.core,
+ scalariform,
  org.eclipse.core.resources,
  org.eclipse.core.runtime,
  org.eclipse.jdt.core,

diff --git a/scalariform.eclipse/pom.xml b/scalariform.eclipse/pom.xml
@@ -4,16 +4,16 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>scalariform.parent</artifactId>
-    <groupId>com.github.mdr</groupId>
+    <groupId>org.scalariform</groupId>
     <version>0.0.5-SNAPSHOT</version>
   </parent>
-  <groupId>com.github.mdr</groupId>
+  <groupId>org.scalariform</groupId>
   <artifactId>scalariform.eclipse</artifactId>
   <version>0.0.5-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
     <dependencies>
       <dependency>
-        <groupId>com.github.mdr</groupId>
+        <groupId>org.scalariform</groupId>
         <artifactId>core</artifactId>
         <version>0.0.5-SNAPSHOT</version>
      </dependency>

diff --git a/scalariform.feature/feature.xml b/scalariform.feature/feature.xml
@@ -56,7 +56,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
          unpack="false"/>
 -->
    <plugin
-         id="scalariform.core"
+         id="scalariform"
          download-size="0"
          install-size="0"
          version="0.0.0"

diff --git a/scalariform.feature/pom.xml b/scalariform.feature/pom.xml
@@ -8,7 +8,7 @@
 	<version>0.0.5-SNAPSHOT</version>
 	<parent>
 		<artifactId>scalariform.parent</artifactId>
-		<groupId>com.github.mdr</groupId>
+		<groupId>org.scalariform</groupId>
 		<version>0.0.5-SNAPSHOT</version>
 	</parent>
 </project>

diff --git a/scalariform.update/pom.xml b/scalariform.update/pom.xml
@@ -8,7 +8,7 @@
 	<version>0.0.5-SNAPSHOT</version>
 	<parent>
 		<artifactId>scalariform.parent</artifactId>
-		<groupId>com.github.mdr</groupId>
+		<groupId>org.scalariform</groupId>
 		<version>0.0.5-SNAPSHOT</version>
 	</parent>
 </project>

diff --git a/scalariform.core/.classpath → scalariform/.classpath b/scalariform.core/.classpath → scalariform/.classpath
diff --git a/scalariform.core/.project → scalariform/.project b/scalariform.core/.project → scalariform/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>scalariform.core</name>
+	<name>scalariform</name>
 	<comment>scalariform 0.1</comment>
 	<projects>
 	</projects>

diff --git a/scalariform.core/META-INF/MANIFEST.MF → scalariform/META-INF/MANIFEST.MF b/scalariform.core/META-INF/MANIFEST.MF → scalariform/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Scalariform
-Bundle-SymbolicName: scalariform.core
+Bundle-SymbolicName: scalariform
 Bundle-Version: 0.0.5.qualifier
 Require-Bundle: 
  org.scala-ide.scala.library

diff --git a/scalariform.core/build.properties → scalariform/build.properties b/scalariform.core/build.properties → scalariform/build.properties
diff --git a/scalariform.core/pom.xml → scalariform/pom.xml b/scalariform.core/pom.xml → scalariform/pom.xml
@@ -2,13 +2,13 @@
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>com.github.mdr</groupId>
-  <artifactId>scalariform.core</artifactId>
+  <groupId>org.scalariform</groupId>
+  <artifactId>scalariform</artifactId>
   <version>0.0.5-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <parent>
     <artifactId>scalariform.parent</artifactId>
-    <groupId>com.github.mdr</groupId>
+    <groupId>org.scalariform</groupId>
     <version>0.0.5-SNAPSHOT</version>
   </parent>
   <dependencies>

diff --git a/scalariform/project/build.properties b/scalariform/project/build.properties
@@ -0,0 +1,4 @@
+#Project properties
+#Sat Jul 17 12:32:14 BST 2010
+project.name=scalariform
+project.version=0.0.5.SNAPSHOT
diff --git a/...commandline/CommandLineOptionParser.scala → ...commandline/CommandLineOptionParser.scala b/...commandline/CommandLineOptionParser.scala → ...commandline/CommandLineOptionParser.scala
diff --git a/.../scala/scalariform/commandline/Main.scala → .../scala/scalariform/commandline/Main.scala b/.../scala/scalariform/commandline/Main.scala → .../scala/scalariform/commandline/Main.scala
diff --git a/...iform/formatter/AnnotationFormatter.scala → ...iform/formatter/AnnotationFormatter.scala b/...iform/formatter/AnnotationFormatter.scala → ...iform/formatter/AnnotationFormatter.scala
diff --git a/...scalariform/formatter/ExprFormatter.scala → ...scalariform/formatter/ExprFormatter.scala b/...scalariform/formatter/ExprFormatter.scala → ...scalariform/formatter/ExprFormatter.scala
diff --git a/.../scalariform/formatter/FormatResult.scala → .../scalariform/formatter/FormatResult.scala b/.../scalariform/formatter/FormatResult.scala → .../scalariform/formatter/FormatResult.scala
diff --git a/.../formatter/FormatterDirectiveParser.scala → .../formatter/FormatterDirectiveParser.scala b/.../formatter/FormatterDirectiveParser.scala → .../formatter/FormatterDirectiveParser.scala
diff --git a/...calariform/formatter/FormatterState.scala → ...calariform/formatter/FormatterState.scala b/...calariform/formatter/FormatterState.scala → ...calariform/formatter/FormatterState.scala
diff --git a/...calariform/formatter/ScalaFormatter.scala → ...calariform/formatter/ScalaFormatter.scala b/...calariform/formatter/ScalaFormatter.scala → ...calariform/formatter/ScalaFormatter.scala
diff --git a/...ariform/formatter/SpecificFormatter.scala → ...ariform/formatter/SpecificFormatter.scala b/...ariform/formatter/SpecificFormatter.scala → ...ariform/formatter/SpecificFormatter.scala
diff --git a/...ariform/formatter/TemplateFormatter.scala → ...ariform/formatter/TemplateFormatter.scala b/...ariform/formatter/TemplateFormatter.scala → ...ariform/formatter/TemplateFormatter.scala
diff --git a/...scalariform/formatter/TypeFormatter.scala → ...scalariform/formatter/TypeFormatter.scala b/...scalariform/formatter/TypeFormatter.scala → ...scalariform/formatter/TypeFormatter.scala
diff --git a/.../scalariform/formatter/XmlFormatter.scala → .../scalariform/formatter/XmlFormatter.scala b/.../scalariform/formatter/XmlFormatter.scala → .../scalariform/formatter/XmlFormatter.scala
diff --git a/.../preferences/IFormattingPreferences.scala → .../preferences/IFormattingPreferences.scala b/.../preferences/IFormattingPreferences.scala → .../preferences/IFormattingPreferences.scala
diff --git a/...er/preferences/PreferenceDescriptor.scala → ...er/preferences/PreferenceDescriptor.scala b/...er/preferences/PreferenceDescriptor.scala → ...er/preferences/PreferenceDescriptor.scala
diff --git a/...cala/scalariform/lexer/HiddenTokens.scala → ...cala/scalariform/lexer/HiddenTokens.scala b/...cala/scalariform/lexer/HiddenTokens.scala → ...cala/scalariform/lexer/HiddenTokens.scala
diff --git a/...in/scala/scalariform/lexer/Keywords.scala → ...in/scala/scalariform/lexer/Keywords.scala b/...in/scala/scalariform/lexer/Keywords.scala → ...in/scala/scalariform/lexer/Keywords.scala
diff --git a/.../main/scala/scalariform/lexer/Lexer.scala → .../main/scala/scalariform/lexer/Lexer.scala b/.../main/scala/scalariform/lexer/Lexer.scala → .../main/scala/scalariform/lexer/Lexer.scala
diff --git a/...scalariform/lexer/NewlineInferencer.scala → ...scalariform/lexer/NewlineInferencer.scala b/...scalariform/lexer/NewlineInferencer.scala → ...scalariform/lexer/NewlineInferencer.scala
diff --git a/.../scala/scalariform/lexer/ScalaLexer.scala → .../scala/scalariform/lexer/ScalaLexer.scala b/.../scala/scalariform/lexer/ScalaLexer.scala → .../scala/scalariform/lexer/ScalaLexer.scala
diff --git a/...alariform/lexer/ScalaLexerException.scala → ...alariform/lexer/ScalaLexerException.scala b/...alariform/lexer/ScalaLexerException.scala → ...alariform/lexer/ScalaLexerException.scala
diff --git a/.../scalariform/lexer/ScalaLexerReader.scala → .../scalariform/lexer/ScalaLexerReader.scala b/.../scalariform/lexer/ScalaLexerReader.scala → .../scalariform/lexer/ScalaLexerReader.scala
diff --git a/...la/scalariform/lexer/ScalaOnlyLexer.scala → ...la/scalariform/lexer/ScalaOnlyLexer.scala b/...la/scalariform/lexer/ScalaOnlyLexer.scala → ...la/scalariform/lexer/ScalaOnlyLexer.scala
diff --git a/.../main/scala/scalariform/lexer/Token.scala → .../main/scala/scalariform/lexer/Token.scala b/.../main/scala/scalariform/lexer/Token.scala → .../main/scala/scalariform/lexer/Token.scala
diff --git a/...main/scala/scalariform/lexer/Tokens.scala → ...main/scala/scalariform/lexer/Tokens.scala b/...main/scala/scalariform/lexer/Tokens.scala → ...main/scala/scalariform/lexer/Tokens.scala
diff --git a/...alariform/lexer/UnicodeEscapeReader.scala → ...alariform/lexer/UnicodeEscapeReader.scala b/...alariform/lexer/UnicodeEscapeReader.scala → ...alariform/lexer/UnicodeEscapeReader.scala
diff --git a/.../lexer/WhitespaceAndCommentsGrouper.scala → .../lexer/WhitespaceAndCommentsGrouper.scala b/.../lexer/WhitespaceAndCommentsGrouper.scala → .../lexer/WhitespaceAndCommentsGrouper.scala
diff --git a/...in/scala/scalariform/lexer/XmlLexer.scala → ...in/scala/scalariform/lexer/XmlLexer.scala b/...in/scala/scalariform/lexer/XmlLexer.scala → ...in/scala/scalariform/lexer/XmlLexer.scala
diff --git a/...n/scala/scalariform/parser/AstNodes.scala → ...n/scala/scalariform/parser/AstNodes.scala b/...n/scala/scalariform/parser/AstNodes.scala → ...n/scala/scalariform/parser/AstNodes.scala
diff --git a/...riform/parser/ScalaCombinatorParser.scala → ...riform/parser/ScalaCombinatorParser.scala b/...riform/parser/ScalaCombinatorParser.scala → ...riform/parser/ScalaCombinatorParser.scala
diff --git a/...ariform/parser/ScalaParserException.scala → ...ariform/parser/ScalaParserException.scala b/...ariform/parser/ScalaParserException.scala → ...ariform/parser/ScalaParserException.scala
diff --git a/...scala/scalariform/utils/BooleanLang.scala → ...scala/scalariform/utils/BooleanLang.scala b/...scala/scalariform/utils/BooleanLang.scala → ...scala/scalariform/utils/BooleanLang.scala
diff --git a/...calariform/utils/CaseClassReflector.scala → ...calariform/utils/CaseClassReflector.scala b/...calariform/utils/CaseClassReflector.scala → ...calariform/utils/CaseClassReflector.scala
diff --git a/...n/scala/scalariform/utils/TextEdits.scala → ...n/scala/scalariform/utils/TextEdits.scala b/...n/scala/scalariform/utils/TextEdits.scala → ...n/scala/scalariform/utils/TextEdits.scala
diff --git a/...ain/scala/scalariform/utils/Trimmed.scala → ...ain/scala/scalariform/utils/Trimmed.scala b/...ain/scala/scalariform/utils/Trimmed.scala → ...ain/scala/scalariform/utils/Trimmed.scala
diff --git a/.../main/scala/scalariform/utils/Utils.scala → .../main/scala/scalariform/utils/Utils.scala b/.../main/scala/scalariform/utils/Utils.scala → .../main/scala/scalariform/utils/Utils.scala
diff --git a/...ter/AbstractExpressionFormatterTest.scala → ...ter/AbstractExpressionFormatterTest.scala b/...ter/AbstractExpressionFormatterTest.scala → ...ter/AbstractExpressionFormatterTest.scala
diff --git a/...orm/formatter/AbstractFormatterTest.scala → ...orm/formatter/AbstractFormatterTest.scala b/...orm/formatter/AbstractFormatterTest.scala → ...orm/formatter/AbstractFormatterTest.scala
diff --git a/...rm/formatter/BlockExprFormatterTest.scala → ...rm/formatter/BlockExprFormatterTest.scala b/...rm/formatter/BlockExprFormatterTest.scala → ...rm/formatter/BlockExprFormatterTest.scala
diff --git a/.../formatter/CaseClausesFormatterTest.scala → .../formatter/CaseClausesFormatterTest.scala b/.../formatter/CaseClausesFormatterTest.scala → .../formatter/CaseClausesFormatterTest.scala
diff --git a/...orm/formatter/DefOrDclFormatterTest.scala → ...orm/formatter/DefOrDclFormatterTest.scala b/...orm/formatter/DefOrDclFormatterTest.scala → ...orm/formatter/DefOrDclFormatterTest.scala
diff --git a/...form/formatter/ForExprFormatterTest.scala → ...form/formatter/ForExprFormatterTest.scala b/...form/formatter/ForExprFormatterTest.scala → ...form/formatter/ForExprFormatterTest.scala
diff --git a/...matter/FormatterDirectiveParserTest.scala → ...matter/FormatterDirectiveParserTest.scala b/...matter/FormatterDirectiveParserTest.scala → ...matter/FormatterDirectiveParserTest.scala
diff --git a/...iform/formatter/IfExprFormatterTest.scala → ...iform/formatter/IfExprFormatterTest.scala b/...iform/formatter/IfExprFormatterTest.scala → ...iform/formatter/IfExprFormatterTest.scala
diff --git a/...iform/formatter/ImportFormatterTest.scala → ...iform/formatter/ImportFormatterTest.scala b/...iform/formatter/ImportFormatterTest.scala → ...iform/formatter/ImportFormatterTest.scala
diff --git a/...rmatter/MiscExpressionFormatterTest.scala → ...rmatter/MiscExpressionFormatterTest.scala b/...rmatter/MiscExpressionFormatterTest.scala → ...rmatter/MiscExpressionFormatterTest.scala
diff --git a/...form/formatter/PackageFormatterTest.scala → ...form/formatter/PackageFormatterTest.scala b/...form/formatter/PackageFormatterTest.scala → ...form/formatter/PackageFormatterTest.scala
diff --git a/...orm/formatter/TemplateFormatterTest.scala → ...orm/formatter/TemplateFormatterTest.scala b/...orm/formatter/TemplateFormatterTest.scala → ...orm/formatter/TemplateFormatterTest.scala
diff --git a/...form/formatter/TryExprFormatterTest.scala → ...form/formatter/TryExprFormatterTest.scala b/...form/formatter/TryExprFormatterTest.scala → ...form/formatter/TryExprFormatterTest.scala
diff --git a/...ariform/formatter/TypeFormatterTest.scala → ...ariform/formatter/TypeFormatterTest.scala b/...ariform/formatter/TypeFormatterTest.scala → ...ariform/formatter/TypeFormatterTest.scala
diff --git a/...rm/formatter/WhileExprFormatterTest.scala → ...rm/formatter/WhileExprFormatterTest.scala b/...rm/formatter/WhileExprFormatterTest.scala → ...rm/formatter/WhileExprFormatterTest.scala
diff --git a/...ormatter/XmlExpressionFormatterTest.scala → ...ormatter/XmlExpressionFormatterTest.scala b/...ormatter/XmlExpressionFormatterTest.scala → ...ormatter/XmlExpressionFormatterTest.scala
diff --git a/...la/scalariform/lexer/ScalaLexerTest.scala → ...la/scalariform/lexer/ScalaLexerTest.scala b/...la/scalariform/lexer/ScalaLexerTest.scala → ...la/scalariform/lexer/ScalaLexerTest.scala
diff --git a/...cala/scalariform/utils/TextEditTest.scala → ...cala/scalariform/utils/TextEditTest.scala b/...cala/scalariform/utils/TextEditTest.scala → ...cala/scalariform/utils/TextEditTest.scala
diff --git a/...scala/scalariform/utils/TrimmedTest.scala → ...scala/scalariform/utils/TrimmedTest.scala b/...scala/scalariform/utils/TrimmedTest.scala → ...scala/scalariform/utils/TrimmedTest.scala
diff --git a/scripts/version-list.txt b/scripts/version-list.txt
@@ -1,11 +1,11 @@
 project/build.properties
 pom.xml
 scalariform.eclipse/pom.xml
-scalariform.core/pom.xml
+scalariform/pom.xml
 scalariform.feature/pom.xml
 scalariform.update/pom.xml
 docs/source/conf.py
-scalariform.core/META-INF/MANIFEST.MF
+scalariform/META-INF/MANIFEST.MF
 scalariform.eclipse/META-INF/MANIFEST.MF
 scalariform.feature/feature.xml
 scalariform.update/site.xml