Skip to content
Browse files

Enable filtering and use bundleId instead of hardcoded 'org.aniszczyk…

….minerva'
  • Loading branch information...
1 parent f85d5f1 commit 18d29694c2ba4a2a64edd69042f0a324bd1a677f @manandbytes manandbytes committed
View
8 minerva-eclipse-project-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -30,7 +30,7 @@
<include>**/*.properties</include>
</includes>
</fileSet>
- <fileSet encoding="UTF-8">
+ <fileSet filtered="true" encoding="UTF-8">
<directory>META-INF</directory>
<includes>
<include>**/*.MF</include>
@@ -78,7 +78,7 @@
<include>**/*.gif</include>
</includes>
</fileSet>
- <fileSet encoding="UTF-8">
+ <fileSet filtered="true" encoding="UTF-8">
<directory>META-INF</directory>
<includes>
<include>**/*.MF</include>
@@ -233,7 +233,7 @@
<include>**/*.java</include>
</includes>
</fileSet>
- <fileSet encoding="UTF-8">
+ <fileSet filtered="true" encoding="UTF-8">
<directory>META-INF</directory>
<includes>
<include>**/*.MF</include>
@@ -263,7 +263,7 @@
<include>**/*.java</include>
</includes>
</fileSet>
- <fileSet encoding="UTF-8">
+ <fileSet filtered="true" encoding="UTF-8">
<directory>META-INF</directory>
<includes>
<include>**/*.MF</include>
View
6 ...src/main/resources/archetype-resources/__rootArtifactId__.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Minerva
Bundle-Vendor: aniszczyk.org
-Bundle-SymbolicName: org.aniszczyk.minerva.core.tests
+Bundle-SymbolicName: ${bundleId}.core.tests
Bundle-Version: 1.0.0.qualifier
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)",
@@ -12,6 +12,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.jdt.launching;bundle-version="[3.4.0,4.0.0)",
org.junit4;bundle-version="[4.3.0,5.0.0)"
Bundle-ActivationPolicy: lazy
-Import-Package: org.aniszczyk.minerva.core,
- org.aniszczyk.minerva.ui.views
+Import-Package: ${bundleId}.core,
+ ${bundleId}.ui.views
Bundle-RequiredExecutionEnvironment: J2SE-1.5
View
10 ...e/src/main/resources/archetype-resources/__rootArtifactId__.ui.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Minerva UI Tests
Bundle-Vendor: aniszczyk.org
-Bundle-SymbolicName: org.aniszczyk.minerva.ui.tests
+Bundle-SymbolicName: ${bundleId}.ui.tests
Bundle-Version: 1.0.0.qualifier
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
@@ -12,8 +12,8 @@ Require-Bundle: org.apache.log4j,
org.eclipse.core.resources;version="[3.4.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
org.hamcrest;bundle-version="[1.1.0,2.0.0)",
- org.aniszczyk.minerva.ui,
- org.aniszczyk.minerva.core
+ ${bundleId}.ui,
+ ${bundleId}.core
Import-Package: org.eclipse.swt.widgets,
org.eclipse.swtbot.eclipse.finder,
org.eclipse.swtbot.eclipse.finder.exceptions,
@@ -33,5 +33,5 @@ Import-Package: org.eclipse.swt.widgets,
org.junit.runner;version="[4.3.1,5.0.0)",
org.junit.runners;version="[4.3.1,5.0.0)",
org.osgi.framework;version="[1.4.0,2.0.0)"
-Fragment-Host: org.aniszczyk.minerva.core.tests;bundle-version="1.0.0.qualifier"
-Export-Package: org.aniszczyk.minerva.ui.tests
+Fragment-Host: ${bundleId}.ui;bundle-version="${version}.qualifier"
+Export-Package: ${bundleId}.ui.tests
View
8 ...chetype/src/main/resources/archetype-resources/__rootArtifactId__.ui/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.aniszczyk.minerva.ui; singleton:=true
+Bundle-SymbolicName: ${bundleId}.ui; singleton:=true
Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.aniszczyk.minerva.ui.Activator
+Bundle-Activator: ${bundleId}.ui.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.aniszczyk.minerva.ui,
- org.aniszczyk.minerva.ui.views
+Export-Package: ${bundleId}.ui,
+ ${bundleId}.ui.views

0 comments on commit 18d2969

Please sign in to comment.
Something went wrong with that request. Please try again.