Felix Knecht schrieb: > Forking the bundle:manifest within studio:eclipse is now working, but > it's missing all the specific configurations for the bundle plugin (of > course). > Because of this I'm not sure if it really makes sense to fork the > bundle:manifest as well. >
Having updated the studio svn and run the latest studio-plugin (with forked bundle) will result in the following diff (which looks like expected :-( because of different missing configurations of the forked bundle): [EMAIL PROTECTED] ~/svn/apache/directory/studio/trunk $ svn diff Index: connection-core/META-INF/MANIFEST.MF =================================================================== --- connection-core/META-INF/MANIFEST.MF (revision 698477) +++ connection-core/META-INF/MANIFEST.MF (working copy) @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Apache Directory Studio Connection Core -Bundle-SymbolicName: org.apache.directory.studio.connection.core;singleton:=true +Bundle-SymbolicName: connection.core;singleton:=true Bundle-Version: 1.3.0.SNAPSHOT Bundle-Activator: org.apache.directory.studio.connection.core.ConnectionCorePlugin Bundle-Vendor: Apache Software Foundation Index: schemaeditor/META-INF/MANIFEST.MF =================================================================== --- schemaeditor/META-INF/MANIFEST.MF (revision 698477) +++ schemaeditor/META-INF/MANIFEST.MF (working copy) @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Apache Directory Studio Schema Editor -Bundle-SymbolicName: org.apache.directory.studio.schemaeditor;singleton:=true +Bundle-SymbolicName: schemaeditor;singleton:=true Bundle-Version: 1.3.0.SNAPSHOT Bundle-Activator: org.apache.directory.studio.schemaeditor.Activator Bundle-Vendor: Apache Software Foundation @@ -18,4 +18,4 @@ Export-Package: org.apache.directory.studio.schemaeditor.model, org.apache.directory.studio.schemaeditor.model.io Bundle-ClassPath: ., - lib/shared-converter-0.9.13-SNAPSHOT.jar + shared-converter-0.9.13-SNAPSHOT.jar Index: ldapbrowser-common/META-INF/MANIFEST.MF =================================================================== --- ldapbrowser-common/META-INF/MANIFEST.MF (revision 698477) +++ ldapbrowser-common/META-INF/MANIFEST.MF (working copy) @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Apache Directory Studio LDAP Browser Common -Bundle-SymbolicName: org.apache.directory.studio.ldapbrowser.common;singleton:=true +Bundle-SymbolicName: ldapbrowser.common;singleton:=true Bundle-Version: 1.3.0.SNAPSHOT Bundle-Activator: org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator Bundle-Vendor: Apache Software Foundation Index: test-integration-ui/META-INF/MANIFEST.MF =================================================================== --- test-integration-ui/META-INF/MANIFEST.MF (revision 698477) +++ test-integration-ui/META-INF/MANIFEST.MF (working copy) @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Apache Directory Studio UI Integration Tests -Bundle-SymbolicName: org.apache.directory.studio.test.integration.ui;singleton:=true +Bundle-SymbolicName: test.integration.ui;singleton:=true Bundle-Version: 1.3.0.SNAPSHOT Bundle-Vendor: Apache Software Foundation Bundle-Localization: plugin @@ -17,42 +17,41 @@ net.sf.swtbot.finder, net.sf.swtbot.eclipse.finder Bundle-ClassPath: ., - lib/antlr-2.7.7.jar, - lib/apacheds-bootstrap-extract-1.5.5-SNAPSHOT.jar, - lib/apacheds-bootstrap-partition-1.5.5-SNAPSHOT.jar, - lib/apacheds-core-1.5.5-SNAPSHOT.jar, - lib/apacheds-core-avl-1.5.5-SNAPSHOT.jar, - lib/apacheds-core-constants-1.5.5-SNAPSHOT.jar, - lib/apacheds-core-cursor-1.5.5-SNAPSHOT.jar, - lib/apacheds-core-entry-1.5.5-SNAPSHOT.jar, - lib/apacheds-core-integ-1.5.5-SNAPSHOT.jar, - lib/apacheds-core-jndi-1.5.5-SNAPSHOT.jar, - lib/apacheds-core-shared-1.5.5-SNAPSHOT.jar, - lib/apacheds-core-unit-1.5.5-SNAPSHOT.jar, - lib/apacheds-interceptor-kerberos-1.5.5-SNAPSHOT.jar, - lib/apacheds-jdbm-1.5.5-SNAPSHOT.jar, - lib/apacheds-jdbm-store-1.5.5-SNAPSHOT.jar, - lib/apacheds-kerberos-shared-1.5.5-SNAPSHOT.jar, - lib/apacheds-protocol-ldap-1.5.5-SNAPSHOT.jar, - lib/apacheds-protocol-shared-1.5.5-SNAPSHOT.jar, - lib/apacheds-schema-bootstrap-1.5.5-SNAPSHOT.jar, - lib/apacheds-schema-extras-1.5.5-SNAPSHOT.jar, - lib/apacheds-schema-registries-1.5.5-SNAPSHOT.jar, - lib/apacheds-server-jndi-1.5.5-SNAPSHOT.jar, - lib/apacheds-server-unit-1.5.5-SNAPSHOT.jar, - lib/apacheds-utils-1.5.5-SNAPSHOT.jar, - lib/apacheds-xdbm-base-1.5.5-SNAPSHOT.jar, - lib/apacheds-xdbm-search-1.5.5-SNAPSHOT.jar, - lib/apacheds-xdbm-tools-1.5.5-SNAPSHOT.jar, - lib/commons-collections-3.2.jar, - lib/commons-io-1.3.2.jar, - lib/commons-lang-2.3.jar, - lib/mina-core-1.1.7.jar, - lib/mina-filter-ssl-1.1.7.jar, - lib/nlog4j-1.2.25.jar, - lib/shared-asn1-0.9.13-SNAPSHOT.jar, - lib/shared-asn1-codec-0.9.13-SNAPSHOT.jar, - lib/shared-bouncycastle-reduced-0.9.13-SNAPSHOT.jar, - lib/shared-ldap-0.9.13-SNAPSHOT.jar, - lib/shared-ldap-constants-0.9.13-SNAPSHOT.jar, - lib/slf4j-api-1.5.2.jar + antlr-2.7.7.jar, + commons-collections-3.2.jar, + commons-lang-2.3.jar, + commons-io-1.3.2.jar, + apacheds-bootstrap-extract-1.5.5-SNAPSHOT.jar, + apacheds-bootstrap-partition-1.5.5-SNAPSHOT.jar, + apacheds-core-1.5.5-SNAPSHOT.jar, + apacheds-core-avl-1.5.5-SNAPSHOT.jar, + apacheds-core-constants-1.5.5-SNAPSHOT.jar, + apacheds-core-cursor-1.5.5-SNAPSHOT.jar, + apacheds-core-entry-1.5.5-SNAPSHOT.jar, + apacheds-core-integ-1.5.5-SNAPSHOT.jar, + apacheds-core-jndi-1.5.5-SNAPSHOT.jar, + apacheds-core-shared-1.5.5-SNAPSHOT.jar, + apacheds-core-unit-1.5.5-SNAPSHOT.jar, + apacheds-interceptor-kerberos-1.5.5-SNAPSHOT.jar, + apacheds-jdbm-1.5.5-SNAPSHOT.jar, + apacheds-jdbm-store-1.5.5-SNAPSHOT.jar, + apacheds-kerberos-shared-1.5.5-SNAPSHOT.jar, + apacheds-protocol-ldap-1.5.5-SNAPSHOT.jar, + apacheds-protocol-shared-1.5.5-SNAPSHOT.jar, + apacheds-schema-bootstrap-1.5.5-SNAPSHOT.jar, + apacheds-schema-extras-1.5.5-SNAPSHOT.jar, + apacheds-schema-registries-1.5.5-SNAPSHOT.jar, + apacheds-server-jndi-1.5.5-SNAPSHOT.jar, + apacheds-server-unit-1.5.5-SNAPSHOT.jar, + apacheds-utils-1.5.5-SNAPSHOT.jar, + apacheds-xdbm-base-1.5.5-SNAPSHOT.jar, + apacheds-xdbm-search-1.5.5-SNAPSHOT.jar, + apacheds-xdbm-tools-1.5.5-SNAPSHOT.jar, + shared-asn1-0.9.13-SNAPSHOT.jar, + shared-asn1-codec-0.9.13-SNAPSHOT.jar, + shared-bouncycastle-reduced-0.9.13-SNAPSHOT.jar, + shared-ldap-0.9.13-SNAPSHOT.jar, + shared-ldap-constants-0.9.13-SNAPSHOT.jar, + mina-core-1.1.6.jar, + mina-filter-ssl-1.1.7.jar, + nlog4j-1.2.25.jar Index: aciitemeditor/META-INF/MANIFEST.MF =================================================================== --- aciitemeditor/META-INF/MANIFEST.MF (revision 698477) +++ aciitemeditor/META-INF/MANIFEST.MF (working copy) @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Apache Directory Studio ACI Item Editor -Bundle-SymbolicName: org.apache.directory.studio.aciitemeditor;singleton:=true +Bundle-SymbolicName: aciitemeditor;singleton:=true Bundle-Version: 1.3.0.SNAPSHOT Bundle-Activator: org.apache.directory.studio.aciitemeditor.Activator Bundle-Vendor: Apache Software Foundation Index: rcp/META-INF/MANIFEST.MF =================================================================== --- rcp/META-INF/MANIFEST.MF (revision 698477) +++ rcp/META-INF/MANIFEST.MF (working copy) @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Apache Directory Studio RCP -Bundle-SymbolicName: org.apache.directory.studio.rcp;singleton:=true +Bundle-SymbolicName: rcp;singleton:=true Bundle-Version: 1.3.0.SNAPSHOT Bundle-Activator: org.apache.directory.studio.Activator Bundle-Vendor: Apache Software Foundation @@ -16,4 +16,4 @@ org.eclipse.core.filesystem Eclipse-LazyStart: true Bundle-ClassPath: ., - lib/nlog4j-1.2.25.jar + nlog4j-1.2.25.jar Index: ldifeditor/META-INF/MANIFEST.MF =================================================================== --- ldifeditor/META-INF/MANIFEST.MF (revision 698477) +++ ldifeditor/META-INF/MANIFEST.MF (working copy) @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Apache Directory Studio LDIF Editor -Bundle-SymbolicName: org.apache.directory.studio.ldifeditor;singleton:=true +Bundle-SymbolicName: ldifeditor;singleton:=true Bundle-Version: 1.3.0.SNAPSHOT Bundle-Activator: org.apache.directory.studio.ldifeditor.LdifEditorActivator Bundle-Vendor: Apache Software Foundation Index: test-integration-core/META-INF/MANIFEST.MF =================================================================== --- test-integration-core/META-INF/MANIFEST.MF (revision 698477) +++ test-integration-core/META-INF/MANIFEST.MF (working copy) @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Apache Directory Studio Core Integration Tests -Bundle-SymbolicName: org.apache.directory.studio.test.integration.core;singleton:=true +Bundle-SymbolicName: test.integration.core;singleton:=true Bundle-Version: 1.3.0.SNAPSHOT Bundle-Localization: plugin Bundle-Vendor: Apache Software Foundation @@ -10,42 +10,41 @@ org.apache.directory.studio.connection.core, org.junit Bundle-ClassPath: ., - lib/antlr-2.7.7.jar, - lib/apacheds-bootstrap-extract-1.5.5-SNAPSHOT.jar, - lib/apacheds-bootstrap-partition-1.5.5-SNAPSHOT.jar, - lib/apacheds-core-1.5.5-SNAPSHOT.jar, - lib/apacheds-core-avl-1.5.5-SNAPSHOT.jar, - lib/apacheds-core-constants-1.5.5-SNAPSHOT.jar, - lib/apacheds-core-cursor-1.5.5-SNAPSHOT.jar, - lib/apacheds-core-entry-1.5.5-SNAPSHOT.jar, - lib/apacheds-core-integ-1.5.5-SNAPSHOT.jar, - lib/apacheds-core-jndi-1.5.5-SNAPSHOT.jar, - lib/apacheds-core-shared-1.5.5-SNAPSHOT.jar, - lib/apacheds-core-unit-1.5.5-SNAPSHOT.jar, - lib/apacheds-interceptor-kerberos-1.5.5-SNAPSHOT.jar, - lib/apacheds-jdbm-1.5.5-SNAPSHOT.jar, - lib/apacheds-jdbm-store-1.5.5-SNAPSHOT.jar, - lib/apacheds-kerberos-shared-1.5.5-SNAPSHOT.jar, - lib/apacheds-protocol-ldap-1.5.5-SNAPSHOT.jar, - lib/apacheds-protocol-shared-1.5.5-SNAPSHOT.jar, - lib/apacheds-schema-bootstrap-1.5.5-SNAPSHOT.jar, - lib/apacheds-schema-extras-1.5.5-SNAPSHOT.jar, - lib/apacheds-schema-registries-1.5.5-SNAPSHOT.jar, - lib/apacheds-server-jndi-1.5.5-SNAPSHOT.jar, - lib/apacheds-server-unit-1.5.5-SNAPSHOT.jar, - lib/apacheds-utils-1.5.5-SNAPSHOT.jar, - lib/apacheds-xdbm-base-1.5.5-SNAPSHOT.jar, - lib/apacheds-xdbm-search-1.5.5-SNAPSHOT.jar, - lib/apacheds-xdbm-tools-1.5.5-SNAPSHOT.jar, - lib/commons-collections-3.2.jar, - lib/commons-io-1.3.2.jar, - lib/commons-lang-2.3.jar, - lib/mina-core-1.1.7.jar, - lib/mina-filter-ssl-1.1.7.jar, - lib/nlog4j-1.2.25.jar, - lib/shared-asn1-0.9.13-SNAPSHOT.jar, - lib/shared-asn1-codec-0.9.13-SNAPSHOT.jar, - lib/shared-bouncycastle-reduced-0.9.13-SNAPSHOT.jar, - lib/shared-ldap-0.9.13-SNAPSHOT.jar, - lib/shared-ldap-constants-0.9.13-SNAPSHOT.jar, - lib/slf4j-api-1.5.2.jar + antlr-2.7.7.jar, + commons-collections-3.2.jar, + commons-lang-2.3.jar, + commons-io-1.3.2.jar, + apacheds-bootstrap-extract-1.5.5-SNAPSHOT.jar, + apacheds-bootstrap-partition-1.5.5-SNAPSHOT.jar, + apacheds-core-1.5.5-SNAPSHOT.jar, + apacheds-core-avl-1.5.5-SNAPSHOT.jar, + apacheds-core-constants-1.5.5-SNAPSHOT.jar, + apacheds-core-cursor-1.5.5-SNAPSHOT.jar, + apacheds-core-entry-1.5.5-SNAPSHOT.jar, + apacheds-core-integ-1.5.5-SNAPSHOT.jar, + apacheds-core-jndi-1.5.5-SNAPSHOT.jar, + apacheds-core-shared-1.5.5-SNAPSHOT.jar, + apacheds-core-unit-1.5.5-SNAPSHOT.jar, + apacheds-interceptor-kerberos-1.5.5-SNAPSHOT.jar, + apacheds-jdbm-1.5.5-SNAPSHOT.jar, + apacheds-jdbm-store-1.5.5-SNAPSHOT.jar, + apacheds-kerberos-shared-1.5.5-SNAPSHOT.jar, + apacheds-protocol-ldap-1.5.5-SNAPSHOT.jar, + apacheds-protocol-shared-1.5.5-SNAPSHOT.jar, + apacheds-schema-bootstrap-1.5.5-SNAPSHOT.jar, + apacheds-schema-extras-1.5.5-SNAPSHOT.jar, + apacheds-schema-registries-1.5.5-SNAPSHOT.jar, + apacheds-server-jndi-1.5.5-SNAPSHOT.jar, + apacheds-server-unit-1.5.5-SNAPSHOT.jar, + apacheds-utils-1.5.5-SNAPSHOT.jar, + apacheds-xdbm-base-1.5.5-SNAPSHOT.jar, + apacheds-xdbm-search-1.5.5-SNAPSHOT.jar, + apacheds-xdbm-tools-1.5.5-SNAPSHOT.jar, + shared-asn1-0.9.13-SNAPSHOT.jar, + shared-asn1-codec-0.9.13-SNAPSHOT.jar, + shared-bouncycastle-reduced-0.9.13-SNAPSHOT.jar, + shared-ldap-0.9.13-SNAPSHOT.jar, + shared-ldap-constants-0.9.13-SNAPSHOT.jar, + mina-core-1.1.6.jar, + mina-filter-ssl-1.1.7.jar, + nlog4j-1.2.25.jar Index: ldapbrowser-ui/META-INF/MANIFEST.MF =================================================================== --- ldapbrowser-ui/META-INF/MANIFEST.MF (revision 698477) +++ ldapbrowser-ui/META-INF/MANIFEST.MF (working copy) @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Apache Directory Studio LDAP Browser UI -Bundle-SymbolicName: org.apache.directory.studio.ldapbrowser.ui;singleton:=true +Bundle-SymbolicName: ldapbrowser.ui;singleton:=true Bundle-Version: 1.3.0.SNAPSHOT Bundle-Activator: org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin Bundle-Vendor: Apache Software Foundation Index: jars/META-INF/MANIFEST.MF =================================================================== --- jars/META-INF/MANIFEST.MF (revision 698477) +++ jars/META-INF/MANIFEST.MF (working copy) @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Apache Directory Studio Jars -Bundle-SymbolicName: org.apache.directory.studio.jars;singleton:=true +Bundle-SymbolicName: jars;singleton:=true Bundle-Version: 1.3.0.SNAPSHOT Bundle-Localization: plugin Bundle-Vendor: Apache Software Foundation @@ -143,15 +143,14 @@ org.xmlpull.v1.wrapper.classic Eclipse-BuddyPolicy: registered Bundle-ClassPath: ., - lib/antlr-2.7.7.jar, - lib/commons-codec-1.3.jar, - lib/commons-collections-3.2.jar, - lib/commons-io-1.3.1.jar, - lib/commons-lang-2.3.jar, - lib/dom4j-1.6.1.jar, - lib/nlog4j-1.2.25.jar, - lib/shared-asn1-0.9.13-SNAPSHOT.jar, - lib/shared-ldap-0.9.13-SNAPSHOT.jar, - lib/shared-ldap-constants-0.9.13-SNAPSHOT.jar, - lib/studio-dsml-parser-0.4.3-SNAPSHOT.jar, - lib/xpp3-1.1.3.4.O.jar + antlr-2.7.7.jar, + commons-codec-1.3.jar, + commons-collections-3.2.jar, + commons-io-1.3.1.jar, + commons-lang-2.3.jar, + dom4j-1.6.1.jar, + shared-asn1-0.9.13-SNAPSHOT.jar, + shared-ldap-0.9.13-SNAPSHOT.jar, + shared-ldap-constants-0.9.13-SNAPSHOT.jar, + nlog4j-1.2.25.jar, + xpp3-1.1.3.4.O.jar Index: valueeditors/META-INF/MANIFEST.MF =================================================================== --- valueeditors/META-INF/MANIFEST.MF (revision 698477) +++ valueeditors/META-INF/MANIFEST.MF (working copy) @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Apache Directory Studio Value Editors -Bundle-SymbolicName: org.apache.directory.studio.valueeditors;singleton:=true +Bundle-SymbolicName: valueeditors;singleton:=true Bundle-Version: 1.3.0.SNAPSHOT Bundle-Activator: org.apache.directory.studio.valueeditors.ValueEditorsActivator Bundle-Vendor: Apache Software Foundation Index: ldif-parser/META-INF/MANIFEST.MF =================================================================== --- ldif-parser/META-INF/MANIFEST.MF (revision 698477) +++ ldif-parser/META-INF/MANIFEST.MF (working copy) @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Apache Directory Studio LDIF Parser -Bundle-SymbolicName: org.apache.directory.studio.ldifparser;singleton:=true +Bundle-SymbolicName: ldifparser;singleton:=true Bundle-Version: 1.3.0.SNAPSHOT Bundle-Localization: plugin Bundle-Vendor: Apache Software Foundation Index: ldapbrowser-core/META-INF/MANIFEST.MF =================================================================== --- ldapbrowser-core/META-INF/MANIFEST.MF (revision 698477) +++ ldapbrowser-core/META-INF/MANIFEST.MF (working copy) @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Apache Directory Studio LDAP Browser Core -Bundle-SymbolicName: org.apache.directory.studio.ldapbrowser.core;singleton:=true +Bundle-SymbolicName: ldapbrowser.core;singleton:=true Bundle-Version: 1.3.0.SNAPSHOT Bundle-Activator: org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin Bundle-Vendor: Apache Software Foundation @@ -24,4 +24,4 @@ org.apache.directory.studio.ldapbrowser.core.propertypageproviders, org.apache.directory.studio.ldapbrowser.core.utils Bundle-ClassPath: ., - lib/poi-3.0.1-FINAL.jar + poi-3.0.1-FINAL.jar Index: connection-ui/META-INF/MANIFEST.MF =================================================================== --- connection-ui/META-INF/MANIFEST.MF (revision 698477) +++ connection-ui/META-INF/MANIFEST.MF (working copy) @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Apache Directory Studio Connection UI -Bundle-SymbolicName: org.apache.directory.studio.connection.ui;singleton:=true +Bundle-SymbolicName: connection.ui;singleton:=true Bundle-Version: 1.3.0.SNAPSHOT Bundle-Activator: org.apache.directory.studio.connection.ui.ConnectionUIPlugin Bundle-Vendor: Apache Software Foundation
