Renamed features/feature to features/core, which will make more sense if we add more features later (which was the intent of having a features directory in the first place).

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@683794 13f79535-47bb-0310-9956-ffa450edef68

14 files changed, 21 insertions, 21 deletions

diff --git a/java/sca/tools/eclipse/features/feature/.project b/java/sca/tools/eclipse/features/core/.project
index b333add441..762ebae4a1 100644
--- a/java/sca/tools/eclipse/features/feature/.project
+++ b/java/sca/tools/eclipse/features/core/.project
@@ -1,5 +1,5 @@
 <projectDescription>
-  <name>org.apache.tuscany.sca.feature</name>
+  <name>org.apache.tuscany.sca.feature.core</name>
   <comment>The Apache Software Foundation provides support for the Apache community of open-source software projects.
     The Apache projects are characterized by a collaborative, consensus based development process, an open and
     pragmatic software license, and a desire to create high quality software that leads the way in its field.
diff --git a/java/sca/tools/eclipse/features/feature/LICENSE b/java/sca/tools/eclipse/features/core/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca/tools/eclipse/features/feature/LICENSE
+++ b/java/sca/tools/eclipse/features/core/LICENSE
diff --git a/java/sca/tools/eclipse/features/core/META-INF/MANIFEST.MF b/java/sca/tools/eclipse/features/core/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..63215d7c6f
--- /dev/null
+++ b/java/sca/tools/eclipse/features/core/META-INF/MANIFEST.MF
@@ -0,0 +1,6 @@
+Manifest-Version: 1.0

+Bundle-ManifestVersion: 2

+Bundle-Name: Apache Tuscany SCA Tools Core Feature

+Bundle-SymbolicName: org.apache.tuscany.sca.feature.core

+Bundle-Version: 1.4.0

+Bundle-Vendor: Apache Software Foundation

diff --git a/java/sca/tools/eclipse/features/feature/NOTICE b/java/sca/tools/eclipse/features/core/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/java/sca/tools/eclipse/features/feature/NOTICE
+++ b/java/sca/tools/eclipse/features/core/NOTICE
diff --git a/java/sca/tools/eclipse/features/feature/build.properties b/java/sca/tools/eclipse/features/core/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/java/sca/tools/eclipse/features/feature/build.properties
+++ b/java/sca/tools/eclipse/features/core/build.properties
diff --git a/java/sca/tools/eclipse/features/feature/feature.xml b/java/sca/tools/eclipse/features/core/feature.xml
index 81928c304e..d6f10a0fd6 100644
--- a/java/sca/tools/eclipse/features/feature/feature.xml
+++ b/java/sca/tools/eclipse/features/core/feature.xml
@@ -18,14 +18,14 @@
     * under the License.    
 -->
 <feature
-      id="org.apache.tuscany.sca.feature"
-      label="Apache Tuscany SCA Tools"
+      id="org.apache.tuscany.sca.feature.core"
+      label="Apache Tuscany SCA Tools Core Feature"
       version="1.4.0"
       provider-name="Apache Software Foundation">
    <install-handler handler="org.eclipse.update.core.DefaultInstallHandler"/>
 
    <description url="http://incubator.apache.org/tuscany">
-      Apache Tuscany SCA Tools.
+      Apache Tuscany SCA Tools Core Feature.
    </description>
 
    <license url="http://www.apache.org/licenses/LICENSE-2.0">
diff --git a/java/sca/tools/eclipse/features/feature/pom.xml b/java/sca/tools/eclipse/features/core/pom.xml
index 9c27356ad2..30756fe9d6 100644
--- a/java/sca/tools/eclipse/features/feature/pom.xml
+++ b/java/sca/tools/eclipse/features/core/pom.xml
@@ -25,8 +25,8 @@
         <version>1.4-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <artifactId>org.apache.tuscany.sca.feature</artifactId>
-    <name>Apache Tuscany SCA Eclipse Tools Feature</name>
+    <artifactId>org.apache.tuscany.sca.feature.core</artifactId>
+    <name>Apache Tuscany SCA Eclipse Tools Core Feature</name>
 
     <build>
        <resources>
diff --git a/java/sca/tools/eclipse/features/feature/META-INF/MANIFEST.MF b/java/sca/tools/eclipse/features/feature/META-INF/MANIFEST.MF
deleted file mode 100644
index 8177e148f9..0000000000
--- a/java/sca/tools/eclipse/features/feature/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Apache Tuscany SCA Tools

-Bundle-SymbolicName: org.apache.tuscany.sca.feature

-Bundle-Version: 1.4.0

-Bundle-Vendor: Apache Software Foundation

diff --git a/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java b/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java
index 7450e4c682..81ba746fd5 100644
--- a/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java
+++ b/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java
@@ -46,7 +46,7 @@ public class ClasspathUtil {
 

     private static final String TUSCANY_RUNTIME_LIBRARIES = "org.apache.tuscany.sca.core.runtimeLibraries";

 

-    private static final String TUSCANY_FEATURE = "org.apache.tuscany.sca.feature";

+    private static final String TUSCANY_FEATURE = "org.apache.tuscany.sca.feature.core";

     private static final String TUSCANY_VERSION = "1.4.0";

     

     /**

diff --git a/java/sca/tools/eclipse/pom.xml b/java/sca/tools/eclipse/pom.xml
index 95632753f0..ef096ac09b 100644
--- a/java/sca/tools/eclipse/pom.xml
+++ b/java/sca/tools/eclipse/pom.xml
@@ -37,7 +37,7 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>features/feature</module>
+                <module>features/core</module>
                 <module>plugins/core</module>
                 <module>site/updatesite</module>
             </modules>
diff --git a/java/sca/tools/eclipse/site/updatesite/.project b/java/sca/tools/eclipse/site/updatesite/.project
index 2761d7c6d9..fd6959f412 100644
--- a/java/sca/tools/eclipse/site/updatesite/.project
+++ b/java/sca/tools/eclipse/site/updatesite/.project
@@ -7,7 +7,7 @@
     and users.</comment>
   <projects>
     <project>org.apache.tuscany.sca.core</project>
-    <project>org.apache.tuscany.sca.feature</project>
+    <project>org.apache.tuscany.sca.feature.core</project>
   </projects>
   <buildSpec>
     <buildCommand>
diff --git a/java/sca/tools/eclipse/site/updatesite/pom.xml b/java/sca/tools/eclipse/site/updatesite/pom.xml
index 341319f2c6..32c0ec6f16 100644
--- a/java/sca/tools/eclipse/site/updatesite/pom.xml
+++ b/java/sca/tools/eclipse/site/updatesite/pom.xml
@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>org.apache.tuscany.sca.feature</artifactId>
+            <artifactId>org.apache.tuscany.sca.feature.core</artifactId>
             <version>1.4-SNAPSHOT</version>
         </dependency>
     </dependencies>
diff --git a/java/sca/tools/eclipse/site/updatesite/site.xml b/java/sca/tools/eclipse/site/updatesite/site.xml
index d1382d0ceb..fdcdeaed54 100644
--- a/java/sca/tools/eclipse/site/updatesite/site.xml
+++ b/java/sca/tools/eclipse/site/updatesite/site.xml
@@ -22,15 +22,15 @@
       Apache Tuscany SCA Tools.
    </description>
    
-   <feature id="org.apache.tuscany.sca.feature" version="1.4.0"
-      url="features/org.apache.tuscany.sca.feature-1.4-SNAPSHOT.jar"/>
+   <feature id="org.apache.tuscany.sca.feature.core" version="1.4.0"
+      url="features/org.apache.tuscany.sca.feature.core-1.4-SNAPSHOT.jar"/>
    
    <archive path="plugins/org.apache.tuscany.sca.core_1.4.0.jar"
       url="plugins/org.apache.tuscany.sca.core-1.4-SNAPSHOT.jar"/>
 
-   <archive path="features/org.apache.tuscany.sca.feature_1.4.0/runtime/apache-tuscany-sca-1.4-SNAPSHOT.jar"
+   <archive path="features/org.apache.tuscany.sca.feature.core_1.4.0/runtime/apache-tuscany-sca-1.4-SNAPSHOT.jar"
       url="../apache-tuscany-sca-1.4-SNAPSHOT.zip"/>
 
-   <archive path="features/org.apache.tuscany.sca.feature_1.4.0/src/apache-tuscany-sca-1.4-SNAPSHOT-src.zip"
+   <archive path="features/org.apache.tuscany.sca.feature.core_1.4.0/src/apache-tuscany-sca-1.4-SNAPSHOT-src.zip"
       url="../apache-tuscany-sca-1.4-SNAPSHOT-src.zip"/>   
 </site>
diff --git a/java/sca/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml b/java/sca/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
index 845e7a926b..1ba06af971 100644
--- a/java/sca/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
+++ b/java/sca/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
@@ -49,7 +49,7 @@
             <outputDirectory>tuscany-sca-${tuscany.version}-updatesite/features</outputDirectory>
             <unpack>false</unpack>
             <includes>
-                <include>org.apache.tuscany.sca:org.apache.tuscany.sca.feature</include>
+                <include>org.apache.tuscany.sca:org.apache.tuscany.sca.feature.core</include>
             </includes>
             <scope>runtime</scope>
         </dependencySet>