Normalized LBC feature names

Signed-off-by: Alexander Fedorov <[email protected]>
eclipse-passage · Nov 4, 2019 · a250dec · a250dec
1 parent 319e7a8
commit a250dec
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 32 deletions.
diff --git a/features/org.eclipse.passage.lbc.execute.feature/build.properties b/features/org.eclipse.passage.lbc.execute.feature/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 019 ArSysOp and others
+# Copyright (c) 2018-2019 ArSysOp and others
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at

diff --git a/features/org.eclipse.passage.lbc.execute.feature/feature.properties b/features/org.eclipse.passage.lbc.execute.feature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2019 ArSysOp and others
+# Copyright (c) 2018-2019 ArSysOp and others
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -10,7 +10,7 @@
 # Contributors:
 #     ArSysOp - initial API and implementation
 ###############################################################################
-featureName=Passage LBC Execute
+featureName=Passage LBC Server 
 providerName=Eclipse Passage
 description=Passage Licensing Back-end Components: OSGi-based server to manage licensing data.
 copyright=Copyright (c) 2018-2019 ArSysOp and others.\n\

diff --git a/features/org.eclipse.passage.lbc.execute.feature/feature.xml b/features/org.eclipse.passage.lbc.execute.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-	Copyright (c) 2019 ArSysOp and others
+	Copyright (c) 2018-2019 ArSysOp and others
 
 	This program and the accompanying materials are made available under the
 	terms of the Eclipse Public License 2.0 which is available at
@@ -31,43 +31,40 @@
       %license
    </license>
 
-   <plugin
-         id="javax.inject"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+   <requires>
+      <import feature="org.eclipse.passage.lbc.target.feature"/>
+   </requires>
 
    <plugin
-         id="org.tukaani.xz"
+         id="org.eclipse.passage.lbc.api"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.equinox.concurrent"
+         id="org.eclipse.passage.lbc.base"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.equinox.event"
+         id="org.eclipse.passage.lbc.equinox"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.core.runtime"
+         id="org.eclipse.passage.lbc.jetty"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.core.contenttype"
+         id="org.eclipse.passage.lbc.server"
          download-size="0"
          install-size="0"
          version="0.0.0"

diff --git a/...lipse.passage.lbc.server.feature/.project → ...lipse.passage.lbc.target.feature/.project b/...lipse.passage.lbc.server.feature/.project → ...lipse.passage.lbc.target.feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.passage.lbc.server.feature</name>
+	<name>org.eclipse.passage.lbc.target.feature</name>
 	<comment></comment>
 	<projects>
 	</projects>

diff --git a/...ssage.lbc.server.feature/build.properties → ...ssage.lbc.target.feature/build.properties b/...ssage.lbc.server.feature/build.properties → ...ssage.lbc.target.feature/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2018-2019 ArSysOp and others
+# Copyright (c) 019 ArSysOp and others
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at

diff --git a/...age.lbc.server.feature/feature.properties → ...age.lbc.target.feature/feature.properties b/...age.lbc.server.feature/feature.properties → ...age.lbc.target.feature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2018-2019 ArSysOp and others
+# Copyright (c) 2019 ArSysOp and others
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -10,10 +10,10 @@
 # Contributors:
 #     ArSysOp - initial API and implementation
 ###############################################################################
-featureName=Passage LBC Server 
+featureName=Passage LBC Target
 providerName=Eclipse Passage
-description=Passage Licensing Back-end Components: OSGi-based server to manage licensing data.
-copyright=Copyright (c) 2018-2019 ArSysOp and others.\n\
+description=Passage Licensing Back-end Components: required target dependencies.
+copyright=Copyright (c) 2019 ArSysOp and others.\n\
 \n\
 This program and the accompanying materials are made\n\
 available under the terms of the Eclipse Public License 2.0\n\

diff --git a/...se.passage.lbc.server.feature/feature.xml → ...se.passage.lbc.target.feature/feature.xml b/...se.passage.lbc.server.feature/feature.xml → ...se.passage.lbc.target.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-	Copyright (c) 2018-2019 ArSysOp and others
+	Copyright (c) 2019 ArSysOp and others
 
 	This program and the accompanying materials are made available under the
 	terms of the Eclipse Public License 2.0 which is available at
@@ -12,7 +12,7 @@
 		ArSysOp - initial API and implementation
 -->
 <feature
-      id="org.eclipse.passage.lbc.server.feature"
+      id="org.eclipse.passage.lbc.target.feature"
       label="%featureName"
       version="0.6.0.qualifier"
       provider-name="%providerName"
@@ -32,35 +32,42 @@
    </license>
 
    <plugin
-         id="org.eclipse.passage.lbc.api"
+         id="javax.inject"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.passage.lbc.base"
+         id="org.tukaani.xz"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.passage.lbc.equinox"
+         id="org.eclipse.equinox.concurrent"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.passage.lbc.jetty"
+         id="org.eclipse.equinox.event"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.passage.lbc.server"
+         id="org.eclipse.core.runtime"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.contenttype"
          download-size="0"
          install-size="0"
          version="0.0.0"

diff --git a/products/org.eclipse.passage.lbc.server.product/org.eclipse.passage.lbc.server.product b/products/org.eclipse.passage.lbc.server.product/org.eclipse.passage.lbc.server.product
@@ -37,10 +37,10 @@
       <feature id="org.eclipse.ecf.core.feature"/>
       <feature id="org.eclipse.ecf.filetransfer.feature"/>
       <feature id="org.eclipse.ecf.filetransfer.httpclient45.feature" installMode="root"/>
-      <feature id="org.eclipse.passage.lbc.server.feature"/>
       <feature id="org.eclipse.passage.lic.net.feature" installMode="root"/>
       <feature id="org.eclipse.passage.lic.equinox.feature" installMode="root"/>
       <feature id="org.eclipse.passage.lic.oshi.feature" installMode="root"/>
+      <feature id="org.eclipse.passage.lbc.target.feature"/>
       <feature id="org.eclipse.passage.lbc.execute.feature"/>
     </features>
 

diff --git a/releng/org.eclipse.passage.lbc.aggregator/pom.xml b/releng/org.eclipse.passage.lbc.aggregator/pom.xml
@@ -27,12 +27,13 @@
 		<relativePath>../../releng/org.eclipse.passage.parent</relativePath>
 	</parent>
 	<modules>
+		<module>../../features/org.eclipse.passage.lbc.target.feature</module>
+
 		<module>../../bundles/org.eclipse.passage.lbc.api</module>
 		<module>../../bundles/org.eclipse.passage.lbc.base</module>
 		<module>../../bundles/org.eclipse.passage.lbc.equinox</module>
 		<module>../../bundles/org.eclipse.passage.lbc.jetty</module>
 		<module>../../bundles/org.eclipse.passage.lbc.server</module>
-		<module>../../features/org.eclipse.passage.lbc.server.feature</module>
 		<module>../../features/org.eclipse.passage.lbc.execute.feature</module>
 
 		<module>../../tests/org.eclipse.passage.lbc.server.test</module>

diff --git a/releng/org.eclipse.passage.lbc.repository/category.xml b/releng/org.eclipse.passage.lbc.repository/category.xml
@@ -20,7 +20,7 @@
 		</description>
 	</category-def>
 	<feature 
-		id="org.eclipse.passage.lbc.server.feature">
+		id="org.eclipse.passage.lbc.target.feature">
 		<category name="org.eclipse.passage.lbc.category" />
 	</feature>
 	<feature 
@@ -36,7 +36,7 @@
 		</description>
 	</category-def>
 	<feature 
-		id="org.eclipse.passage.lbc.server.feature.source">
+		id="org.eclipse.passage.lbc.execute.feature.source">
 		<category name="org.eclipse.passage.lbc.category.source" />
 	</feature>
 </site>