Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

[archetype] Generate one more project #11

Merged
merged 5 commits into from

2 participants

@manandbytes

More bugs fixed. One more IT had been added, @bde5681, that generates
another project using different set of parameters.

manandbytes added some commits
@manandbytes manandbytes Add IT for Eclipse Color Theme plugin bde5681
@manandbytes manandbytes Make module's bundleId and atifactId consistent
Tycho Source plugin is unable to match autogenerated source bundle
with corresponding binary bundle if binary bundle's bundleId and
atifactId are different.

Fix it for .core and .ui by using bundleId while building artifactId.

Signed-off-by: Mykola Nikishov <mn@mn.com.ua>
9ccb789
@manandbytes manandbytes Use version parameter instead of hardcoded '1.0.0'
Signed-off-by: Mykola Nikishov <mn@mn.com.ua>
97546ea
@manandbytes manandbytes Use generated project's name to build name in POM
Get rid of hard-coded 'Minerva' string

Signed-off-by: Mykola Nikishov <mn@mn.com.ua>
a9ef305
@manandbytes manandbytes Use bundleId to build .doc's Bundle-SymbolicName
Signed-off-by: Mykola Nikishov <mn@mn.com.ua>
18b4f8f
@caniszczyk
Owner

How is this related?

Actually, any random properties may be used here. I just decided to use some real values instead of 'foo' or 'bar'. Is it a problem?

@caniszczyk caniszczyk merged commit 5a566ef into caniszczyk:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jun 26, 2011
  1. @manandbytes
  2. @manandbytes

    Make module's bundleId and atifactId consistent

    manandbytes authored
    Tycho Source plugin is unable to match autogenerated source bundle
    with corresponding binary bundle if binary bundle's bundleId and
    atifactId are different.
    
    Fix it for .core and .ui by using bundleId while building artifactId.
    
    Signed-off-by: Mykola Nikishov <mn@mn.com.ua>
  3. @manandbytes

    Use version parameter instead of hardcoded '1.0.0'

    manandbytes authored
    Signed-off-by: Mykola Nikishov <mn@mn.com.ua>
  4. @manandbytes

    Use generated project's name to build name in POM

    manandbytes authored
    Get rid of hard-coded 'Minerva' string
    
    Signed-off-by: Mykola Nikishov <mn@mn.com.ua>
  5. @manandbytes

    Use bundleId to build .doc's Bundle-SymbolicName

    manandbytes authored
    Signed-off-by: Mykola Nikishov <mn@mn.com.ua>
This page is out of date. Refresh to see the latest.
Showing with 21 additions and 14 deletions.
  1. +7 −0 minerva-eclipse-project-archetype/src/it/projects/com.github.eclipsecolortheme/test.properties
  2. +1 −1  minerva-eclipse-project-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
  3. +1 −1  ...rva-eclipse-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-feature/feature.xml
  4. +1 −1  minerva-eclipse-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repository/pom.xml
  5. +1 −1  ...project-archetype/src/main/resources/archetype-resources/__rootArtifactId__.core.tests/META-INF/MANIFEST.MF
  6. +1 −1  ...lipse-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__.core/META-INF/MANIFEST.MF
  7. +2 −2 minerva-eclipse-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__.core/pom.xml
  8. +2 −2 ...clipse-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__.doc/META-INF/MANIFEST.MF
  9. +1 −1  ...ipse-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__.source-feature/feature.xml
  10. +1 −1  ...-eclipse-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__.source-feature/pom.xml
  11. +1 −1  ...e-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__.ui.tests/META-INF/MANIFEST.MF
  12. +1 −1  ...eclipse-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__.ui/META-INF/MANIFEST.MF
  13. +1 −1  minerva-eclipse-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__.ui/pom.xml
View
7 ...va-eclipse-project-archetype/src/it/projects/com.github.eclipsecolortheme/test.properties
@@ -0,0 +1,7 @@
+groupId=com.github.eclipsecolortheme
+artifactId=eclipsecolortheme
+version=0.12.0
+package=com.github.eclipsecolortheme
+projectName=Eclipse Color Theme
+bundleId=com.github.eclipsecolortheme
+providerName=eclipsecolorthemes.org
View
2  minerva-eclipse-project-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -133,7 +133,7 @@
<include>**/*.png</include>
</includes>
</fileSet>
- <fileSet encoding="UTF-8">
+ <fileSet filtered="true" encoding="UTF-8">
<directory>META-INF</directory>
<includes>
<include>**/*.MF</include>
View
2  ...t-archetype/src/main/resources/archetype-resources/__rootArtifactId__-feature/feature.xml
@@ -5,7 +5,7 @@
<feature
id="${package}"
label="%featureName"
- version="1.0.0.qualifier"
+ version="${version}.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/egit/">
View
2  ...ct-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repository/pom.xml
@@ -18,7 +18,7 @@
<artifactId>${artifactId}</artifactId>
<packaging>eclipse-repository</packaging>
- <name>Minerva Repository</name>
+ <name>${projectName} Repository</name>
<build>
<plugins>
View
2  ...src/main/resources/archetype-resources/__rootArtifactId__.core.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Minerva
Bundle-Vendor: aniszczyk.org
Bundle-SymbolicName: ${bundleId}.core.tests
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: ${version}.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)",
org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
View
2  ...etype/src/main/resources/archetype-resources/__rootArtifactId__.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: ${bundleId}.core; singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: ${version}.qualifier
Bundle-Activator: ${bundleId}.core.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime
View
4 ...-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__.core/pom.xml
@@ -15,10 +15,10 @@
<version>${version}-SNAPSHOT</version>
</parent>
- <artifactId>${groupId}.${artifactId}</artifactId>
+ <artifactId>${bundleId}.core</artifactId>
<packaging>eclipse-plugin</packaging>
- <name>Minerva Core Plug-in</name>
+ <name>${projectName} Core Plug-in</name>
<build>
<!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
View
4 ...hetype/src/main/resources/archetype-resources/__rootArtifactId__.doc/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.aniszczyk.minerva.doc;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-SymbolicName: ${bundleId}.doc;singleton:=true
+Bundle-Version: ${version}.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Require-Bundle: org.eclipse.mylyn.wikitext.core;bundle-version="[1.3.0,2.0.0)";resolution:=optional,
View
2  ...type/src/main/resources/archetype-resources/__rootArtifactId__.source-feature/feature.xml
@@ -5,7 +5,7 @@
<feature
id="${package}.source"
label="%featureName"
- version="1.0.0.qualifier"
+ version="${version}.qualifier"
provider-name="%providerName"
plugin="${package}">
View
2  ...rchetype/src/main/resources/archetype-resources/__rootArtifactId__.source-feature/pom.xml
@@ -18,6 +18,6 @@
<artifactId>${artifactId}</artifactId>
<packaging>eclipse-feature</packaging>
- <name>Minerva Sources Feature</name>
+ <name>${projectName} Sources Feature</name>
</project>
View
2  ...e/src/main/resources/archetype-resources/__rootArtifactId__.ui.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Minerva UI Tests
Bundle-Vendor: aniszczyk.org
Bundle-SymbolicName: ${bundleId}.ui.tests
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: ${version}.qualifier
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.apache.log4j,
View
2  ...chetype/src/main/resources/archetype-resources/__rootArtifactId__.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: ${bundleId}.ui; singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: ${version}.qualifier
Bundle-Activator: ${bundleId}.ui.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime
View
2  ...se-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__.ui/pom.xml
@@ -15,7 +15,7 @@
<version>${version}-SNAPSHOT</version>
</parent>
- <artifactId>${groupId}.${artifactId}</artifactId>
+ <artifactId>${bundleId}.ui</artifactId>
<packaging>eclipse-plugin</packaging>
<name>${projectName} UI Plug-in</name>
Something went wrong with that request. Please try again.