Author: [email protected]
Date: Thu Feb 2 14:37:28 2012
New Revision: 2050
Log:
AMDATU-545 Changed bundle plugin default Bundle-Symbolicname heuristic to
${project.artifactId}
Modified:
trunk/amdatu-core/configadmin/pom.xml
trunk/amdatu-core/deployment-tenantconf/pom.xml
trunk/amdatu-core/eventadmin/pom.xml
trunk/amdatu-core/fileinstall-autoconf/pom.xml
trunk/amdatu-core/itest/base/pom.xml
trunk/amdatu-core/logservice/pom.xml
trunk/amdatu-core/preferences/pom.xml
trunk/amdatu-core/useradmin/pom.xml
trunk/amdatu-core/useradminstore-prefs/pom.xml
trunk/amdatu-parent/pom.xml
Modified: trunk/amdatu-core/configadmin/pom.xml
==============================================================================
--- trunk/amdatu-core/configadmin/pom.xml (original)
+++ trunk/amdatu-core/configadmin/pom.xml Thu Feb 2 14:37:28 2012
@@ -46,7 +46,6 @@
<X-MultiTenant-Bundle-Activator>org.apache.felix.cm.impl.ConfigurationManager</X-MultiTenant-Bundle-Activator>
<X-MultiTenant-Scope>BOTH</X-MultiTenant-Scope>
<Bundle-Activator>org.amdatu.tenant.adapter.MultiTenantBundleActivator</Bundle-Activator>
-
<Bundle-SymbolicName>org.amdatu.core.configadmin</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile;inline=org/apache/felix/**</Embed-Dependency>
<Embed-Transitive>false</Embed-Transitive>
<Import-Package>
Modified: trunk/amdatu-core/deployment-tenantconf/pom.xml
==============================================================================
--- trunk/amdatu-core/deployment-tenantconf/pom.xml (original)
+++ trunk/amdatu-core/deployment-tenantconf/pom.xml Thu Feb 2 14:37:28 2012
@@ -69,7 +69,6 @@
<configuration>
<instructions>
<Bundle-Activator>org.amdatu.core.deployment.tenantconf.Activator</Bundle-Activator>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile;inline=!org/osgi/**</Embed-Dependency>
<Embed-Transitive>false</Embed-Transitive>
<Private-Package>
Modified: trunk/amdatu-core/eventadmin/pom.xml
==============================================================================
--- trunk/amdatu-core/eventadmin/pom.xml (original)
+++ trunk/amdatu-core/eventadmin/pom.xml Thu Feb 2 14:37:28 2012
@@ -46,7 +46,6 @@
<X-MultiTenant-Bundle-Activator>org.apache.felix.eventadmin.impl.Activator</X-MultiTenant-Bundle-Activator>
<X-MultiTenant-Scope>BOTH</X-MultiTenant-Scope>
<Bundle-Activator>org.amdatu.tenant.adapter.MultiTenantBundleActivator</Bundle-Activator>
-
<Bundle-SymbolicName>org.amdatu.core.eventadmin</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile;inline=org/apache/felix/**|EDU/oswego/**</Embed-Dependency>
<Embed-Transitive>false</Embed-Transitive>
<Import-Package>
Modified: trunk/amdatu-core/fileinstall-autoconf/pom.xml
==============================================================================
--- trunk/amdatu-core/fileinstall-autoconf/pom.xml (original)
+++ trunk/amdatu-core/fileinstall-autoconf/pom.xml Thu Feb 2 14:37:28 2012
@@ -60,7 +60,6 @@
<configuration>
<instructions>
<Bundle-Activator>org.amdatu.core.fileinstall.tenantconf.Activator</Bundle-Activator>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Export-Package>
</Export-Package>
<Private-Package>
Modified: trunk/amdatu-core/itest/base/pom.xml
==============================================================================
--- trunk/amdatu-core/itest/base/pom.xml (original)
+++ trunk/amdatu-core/itest/base/pom.xml Thu Feb 2 14:37:28 2012
@@ -41,7 +41,6 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Export-Package>${pom.artifactId}</Export-Package>
</instructions>
</configuration>
Modified: trunk/amdatu-core/logservice/pom.xml
==============================================================================
--- trunk/amdatu-core/logservice/pom.xml (original)
+++ trunk/amdatu-core/logservice/pom.xml Thu Feb 2 14:37:28 2012
@@ -46,7 +46,6 @@
<X-MultiTenant-Bundle-Activator>org.apache.felix.log.Activator</X-MultiTenant-Bundle-Activator>
<X-MultiTenant-Scope>BOTH</X-MultiTenant-Scope>
<Bundle-Activator>org.amdatu.tenant.adapter.MultiTenantBundleActivator</Bundle-Activator>
-
<Bundle-SymbolicName>org.amdatu.core.logservice</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile;inline=org/apache/felix/**</Embed-Dependency>
<Embed-Transitive>false</Embed-Transitive>
<Import-Package>
Modified: trunk/amdatu-core/preferences/pom.xml
==============================================================================
--- trunk/amdatu-core/preferences/pom.xml (original)
+++ trunk/amdatu-core/preferences/pom.xml Thu Feb 2 14:37:28 2012
@@ -46,7 +46,6 @@
<X-MultiTenant-Bundle-Activator>org.apache.felix.prefs.impl.PreferencesManager</X-MultiTenant-Bundle-Activator>
<X-MultiTenant-Scope>BOTH</X-MultiTenant-Scope>
<Bundle-Activator>org.amdatu.tenant.adapter.MultiTenantBundleActivator</Bundle-Activator>
-
<Bundle-SymbolicName>org.amdatu.core.preferences</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile;inline=org/apache/**</Embed-Dependency>
<Embed-Transitive>false</Embed-Transitive>
<Import-Package>
Modified: trunk/amdatu-core/useradmin/pom.xml
==============================================================================
--- trunk/amdatu-core/useradmin/pom.xml (original)
+++ trunk/amdatu-core/useradmin/pom.xml Thu Feb 2 14:37:28 2012
@@ -46,7 +46,6 @@
<X-MultiTenant-Bundle-Activator>org.ops4j.pax.useradmin.service.internal.Activator</X-MultiTenant-Bundle-Activator>
<X-MultiTenant-Scope>BOTH</X-MultiTenant-Scope>
<Bundle-Activator>org.amdatu.tenant.adapter.MultiTenantBundleActivator</Bundle-Activator>
-
<Bundle-SymbolicName>org.amdatu.core.useradmin</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile;inline=org/ops4j/pax/useradmin/**</Embed-Dependency>
<Embed-Transitive>false</Embed-Transitive>
<Import-Package>
Modified: trunk/amdatu-core/useradminstore-prefs/pom.xml
==============================================================================
--- trunk/amdatu-core/useradminstore-prefs/pom.xml (original)
+++ trunk/amdatu-core/useradminstore-prefs/pom.xml Thu Feb 2 14:37:28 2012
@@ -46,7 +46,6 @@
<X-MultiTenant-Bundle-Activator>org.ops4j.pax.useradmin.provider.preferences.internal.Activator</X-MultiTenant-Bundle-Activator>
<X-MultiTenant-Scope>BOTH</X-MultiTenant-Scope>
<Bundle-Activator>org.amdatu.tenant.adapter.MultiTenantBundleActivator</Bundle-Activator>
-
<Bundle-SymbolicName>org.amdatu.core.useradminstore.prefs</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile;inline=org/ops4j/pax/useradmin/provider/preferences/**</Embed-Dependency>
<Embed-Transitive>false</Embed-Transitive>
<Import-Package>
Modified: trunk/amdatu-parent/pom.xml
==============================================================================
--- trunk/amdatu-parent/pom.xml (original)
+++ trunk/amdatu-parent/pom.xml Thu Feb 2 14:37:28 2012
@@ -283,6 +283,9 @@
<version>2.3.6</version>
<inherited>true</inherited>
<configuration>
+ <instructions>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ </instructions>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
</archive>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
