335872: Renamed org.eclipse.m2e.logging->org.eclipse.m2e.logback.configuration and org.eclipse.m2e.logging.feature->org.eclipse.m2e.logback.feature

27 files changed, 32 insertions, 16 deletions

diff --git a/org.eclipse.m2e.logging/.classpath b/org.eclipse.m2e.logback.configuration/.classpath
index 798048dd..798048dd 100644
--- a/org.eclipse.m2e.logging/.classpath
+++ b/org.eclipse.m2e.logback.configuration/.classpath
diff --git a/org.eclipse.m2e.logging/.gitignore b/org.eclipse.m2e.logback.configuration/.gitignore
index 934e0e06..934e0e06 100644
--- a/org.eclipse.m2e.logging/.gitignore
+++ b/org.eclipse.m2e.logback.configuration/.gitignore
diff --git a/org.eclipse.m2e.logging/.project b/org.eclipse.m2e.logback.configuration/.project
index e172170f..9260845b 100644
--- a/org.eclipse.m2e.logging/.project
+++ b/org.eclipse.m2e.logback.configuration/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.m2e.logging</name>
+	<name>org.eclipse.m2e.logback.configuration</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/org.eclipse.m2e.logging/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.logback.configuration/.settings/org.eclipse.jdt.core.prefs
index fdc43568..fdc43568 100644
--- a/org.eclipse.m2e.logging/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.m2e.logback.configuration/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.m2e.logging/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.m2e.logback.configuration/.settings/org.eclipse.jdt.ui.prefs
index fb3a058c..fb3a058c 100644
--- a/org.eclipse.m2e.logging/.settings/org.eclipse.jdt.ui.prefs
+++ b/org.eclipse.m2e.logback.configuration/.settings/org.eclipse.jdt.ui.prefs
diff --git a/org.eclipse.m2e.logback.configuration/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.m2e.logback.configuration/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000..d8b81469
--- /dev/null
+++ b/org.eclipse.m2e.logback.configuration/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,5 @@
+#Mon Feb 14 10:53:08 EST 2011
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.m2e.logging/META-INF/MANIFEST.MF b/org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF
index 66f2fb89..f88c1104 100644
--- a/org.eclipse.m2e.logging/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-SymbolicName: org.eclipse.m2e.logging;singleton:=true
+Bundle-SymbolicName: org.eclipse.m2e.logback.configuration;singleton:=true
 Bundle-Version: 0.13.0.qualifier
 Bundle-Activator: org.eclipse.m2e.internal.logging.LogPlugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
diff --git a/org.eclipse.m2e.logging/META-INF/p2.inf b/org.eclipse.m2e.logback.configuration/META-INF/p2.inf
index 87f20205..87f20205 100644
--- a/org.eclipse.m2e.logging/META-INF/p2.inf
+++ b/org.eclipse.m2e.logback.configuration/META-INF/p2.inf
diff --git a/org.eclipse.m2e.logback.configuration/OSGI-INF/l10n/bundle.properties b/org.eclipse.m2e.logback.configuration/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 00000000..8e5195c5
--- /dev/null
+++ b/org.eclipse.m2e.logback.configuration/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.m2e.logback.configuration
+Bundle-Name = m2e logback configuration
+Bundle-Vendor = Eclipse.org
\ No newline at end of file
diff --git a/org.eclipse.m2e.logging/build.properties b/org.eclipse.m2e.logback.configuration/build.properties
index e5f876ad..e5f876ad 100644
--- a/org.eclipse.m2e.logging/build.properties
+++ b/org.eclipse.m2e.logback.configuration/build.properties
diff --git a/org.eclipse.m2e.logging/defaultLogbackConfiguration/logback.xml b/org.eclipse.m2e.logback.configuration/defaultLogbackConfiguration/logback.xml
index b305dae7..b305dae7 100644
--- a/org.eclipse.m2e.logging/defaultLogbackConfiguration/logback.xml
+++ b/org.eclipse.m2e.logback.configuration/defaultLogbackConfiguration/logback.xml
diff --git a/org.eclipse.m2e.logging/pom.xml b/org.eclipse.m2e.logback.configuration/pom.xml
index ace48673..3ae76e37 100644
--- a/org.eclipse.m2e.logging/pom.xml
+++ b/org.eclipse.m2e.logback.configuration/pom.xml
@@ -16,6 +16,6 @@
     <relativePath>../org.eclipse.m2e.parent</relativePath>
   </parent>
 
-  <artifactId>org.eclipse.m2e.logging</artifactId>
+  <artifactId>org.eclipse.m2e.logback.configuration</artifactId>
   <packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/org.eclipse.m2e.logging/src/org/eclipse/m2e/internal/logging/LogHelper.java b/org.eclipse.m2e.logback.configuration/src/org/eclipse/m2e/internal/logging/LogHelper.java
index eb0fbf18..eb0fbf18 100644
--- a/org.eclipse.m2e.logging/src/org/eclipse/m2e/internal/logging/LogHelper.java
+++ b/org.eclipse.m2e.logback.configuration/src/org/eclipse/m2e/internal/logging/LogHelper.java
diff --git a/org.eclipse.m2e.logging/src/org/eclipse/m2e/internal/logging/LogPlugin.java b/org.eclipse.m2e.logback.configuration/src/org/eclipse/m2e/internal/logging/LogPlugin.java
index d0cbde0d..e70f1724 100644
--- a/org.eclipse.m2e.logging/src/org/eclipse/m2e/internal/logging/LogPlugin.java
+++ b/org.eclipse.m2e.logback.configuration/src/org/eclipse/m2e/internal/logging/LogPlugin.java
@@ -30,7 +30,7 @@ import org.eclipse.core.runtime.Plugin;
 import org.eclipse.core.runtime.Status;
 
 public class LogPlugin extends Plugin {
-  private static final String PLUGIN_ID = "org.eclipse.m2e.logging"; //$NON-NLS-1$
+  private static final String PLUGIN_ID = "org.eclipse.m2e.logback.configuration"; //$NON-NLS-1$
 
   // This has to match the log directory in defaultLogbackConfiguration/logback.xml
   public static final String PROPERTY_LOG_DIRECTORY = "org.eclipse.m2e.log.dir"; //$NON-NLS-1$
diff --git a/org.eclipse.m2e.logging.feature/.gitignore b/org.eclipse.m2e.logback.feature/.gitignore
index 4dc00917..4dc00917 100644
--- a/org.eclipse.m2e.logging.feature/.gitignore
+++ b/org.eclipse.m2e.logback.feature/.gitignore
diff --git a/org.eclipse.m2e.logging.feature/.project b/org.eclipse.m2e.logback.feature/.project
index c4c0a7e0..b7ccf94d 100644
--- a/org.eclipse.m2e.logging.feature/.project
+++ b/org.eclipse.m2e.logback.feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.m2e.logging.feature</name>
+	<name>org.eclipse.m2e.logback.feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.FeatureNature</nature>
 	</natures>
 </projectDescription>
diff --git a/org.eclipse.m2e.logback.feature/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.m2e.logback.feature/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000..d8b81469
--- /dev/null
+++ b/org.eclipse.m2e.logback.feature/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,5 @@
+#Mon Feb 14 10:53:08 EST 2011
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.m2e.logging.feature/build.properties b/org.eclipse.m2e.logback.feature/build.properties
index 39b0777e..39b0777e 100644
--- a/org.eclipse.m2e.logging.feature/build.properties
+++ b/org.eclipse.m2e.logback.feature/build.properties
diff --git a/org.eclipse.m2e.logging.feature/epl-v10.html b/org.eclipse.m2e.logback.feature/epl-v10.html
index ed4b1966..ed4b1966 100644
--- a/org.eclipse.m2e.logging.feature/epl-v10.html
+++ b/org.eclipse.m2e.logback.feature/epl-v10.html
diff --git a/org.eclipse.m2e.logging.feature/feature.properties b/org.eclipse.m2e.logback.feature/feature.properties
index 09872827..09872827 100644
--- a/org.eclipse.m2e.logging.feature/feature.properties
+++ b/org.eclipse.m2e.logback.feature/feature.properties
diff --git a/org.eclipse.m2e.logging.feature/feature.xml b/org.eclipse.m2e.logback.feature/feature.xml
index ef6b8965..60e56912 100644
--- a/org.eclipse.m2e.logging.feature/feature.xml
+++ b/org.eclipse.m2e.logback.feature/feature.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.eclipse.m2e.logging.feature"
+      id="org.eclipse.m2e.logback.feature"
       label="%featureName"
       version="0.13.0.qualifier"
       provider-name="%providerName"
-      plugin="org.eclipse.m2e.logging">
+      plugin="org.eclipse.m2e.logback.configuration">
 
    <description>
       %description
@@ -19,7 +19,7 @@
    </license>
    
    <plugin
-         id="org.eclipse.m2e.logging"
+         id="org.eclipse.m2e.logback.configuration"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/org.eclipse.m2e.logging.feature/license.html b/org.eclipse.m2e.logback.feature/license.html
index 61d632d9..61d632d9 100644
--- a/org.eclipse.m2e.logging.feature/license.html
+++ b/org.eclipse.m2e.logback.feature/license.html
diff --git a/org.eclipse.m2e.logging.feature/pom.xml b/org.eclipse.m2e.logback.feature/pom.xml
index 7f3f6477..7e78b795 100644
--- a/org.eclipse.m2e.logging.feature/pom.xml
+++ b/org.eclipse.m2e.logback.feature/pom.xml
@@ -16,7 +16,7 @@
     <relativePath>../org.eclipse.m2e.parent</relativePath>
   </parent>
 
-  <artifactId>org.eclipse.m2e.logging.feature</artifactId>
+  <artifactId>org.eclipse.m2e.logback.feature</artifactId>
   <packaging>eclipse-feature</packaging>
 
   <name>Maven Integration for Eclipse slf4j over logback logging (Optional)</name>
diff --git a/org.eclipse.m2e.logging/OSGI-INF/l10n/bundle.properties b/org.eclipse.m2e.logging/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index d0a47237..00000000
--- a/org.eclipse.m2e.logging/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.m2e.logging
-Bundle-Name = m2e logging configuration
-Bundle-Vendor = Eclipse.org
\ No newline at end of file
diff --git a/org.eclipse.m2e.parent/pom.xml b/org.eclipse.m2e.parent/pom.xml
index 784883cf..f80521bf 100644
--- a/org.eclipse.m2e.parent/pom.xml
+++ b/org.eclipse.m2e.parent/pom.xml
@@ -114,13 +114,13 @@
 
     <!-- Logging -->
     <module>../org.eclipse.m2e.logback.appender</module>
-    <module>../org.eclipse.m2e.logging</module>
+    <module>../org.eclipse.m2e.logback.configuration</module>
     <module>../org.eclipse.m2e.slf4j.bridge</module>
 
     <!-- features -->
     <module>../org.eclipse.m2e.feature</module>
     <module>../org.eclipse.m2e.sdk.feature</module>
-    <module>../org.eclipse.m2e.logging.feature</module>
+    <module>../org.eclipse.m2e.logback.feature</module>
 
     <module>../org.eclipse.m2e.site</module>
 
diff --git a/org.eclipse.m2e.site/category.xml b/org.eclipse.m2e.site/category.xml
index edc70e55..c0342bff 100644
--- a/org.eclipse.m2e.site/category.xml
+++ b/org.eclipse.m2e.site/category.xml
@@ -6,7 +6,7 @@
    <feature url="features/org.eclipse.m2e.feature_0.0.0.jar" id="org.eclipse.m2e.feature" version="0.0.0">
       <category name="m2e"/>
    </feature>
-   <feature url="features/org.eclipse.m2e.logging.feature_0.0.0.jar" id="org.eclipse.m2e.logging.feature" version="0.0.0">
+   <feature url="features/org.eclipse.m2e.logback.feature_0.0.0.jar" id="org.eclipse.m2e.logback.feature" version="0.0.0">
       <category name="m2e"/>
    </feature>
    <category-def name="m2e" label="Maven Integration for Eclipse"/>
diff --git a/org.eclipse.m2e.site/feature.xml b/org.eclipse.m2e.site/feature.xml
index a32a728b..95c6fe55 100644
--- a/org.eclipse.m2e.site/feature.xml
+++ b/org.eclipse.m2e.site/feature.xml
@@ -14,6 +14,6 @@
          version="0.0.0"/>
 
    <includes
-         id="org.eclipse.m2e.logging.feature"
+         id="org.eclipse.m2e.logback.feature"
          version="0.0.0"/>
 </feature>