From fe4eb600851ed173b6ffb2c9265466f82dd6d031 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Fri, 5 Jul 2013 19:37:24 -0400 Subject: Bug 414715: [CBI] webtools.sourceediting.xsl patches for building with Maven/Tycho Signed-off-by: Thanh Ha --- .gitignore | 3 + bundles/org.eclipse.wst.xsl.core/pom.xml | 62 ++++++++++------- bundles/org.eclipse.wst.xsl.debug.ui/pom.xml | 59 +++++++++------- bundles/org.eclipse.wst.xsl.exslt.core/pom.xml | 59 +++++++++------- bundles/org.eclipse.wst.xsl.exslt.ui/pom.xml | 60 ++++++++++------- bundles/org.eclipse.wst.xsl.jaxp.debug.ui/pom.xml | 60 ++++++++++------- bundles/org.eclipse.wst.xsl.jaxp.debug/pom.xml | 59 +++++++++------- bundles/org.eclipse.wst.xsl.jaxp.launching/pom.xml | 59 +++++++++------- bundles/org.eclipse.wst.xsl.launching/pom.xml | 59 +++++++++------- bundles/org.eclipse.wst.xsl.saxon/pom.xml | 39 +++++++---- bundles/org.eclipse.wst.xsl.ui/pom.xml | 59 +++++++++------- bundles/org.eclipse.wst.xsl.xalan/pom.xml | 59 +++++++++------- bundles/org.eclipse.wst.xsl/build.properties | 6 ++ bundles/org.eclipse.wst.xsl/pom.xml | 41 +++++++----- docs/org.eclipse.wst.xsl.doc/build.properties | 6 ++ docs/org.eclipse.wst.xsl.doc/pom.xml | 27 ++++++++ docs/org.eclipse.wst.xsl.sdk.documentation/pom.xml | 27 ++++++++ features/org.eclipse.wst.xsl.feature/pom.xml | 78 ++++++++++++++++++---- features/org.eclipse.wst.xsl_sdk.feature/pom.xml | 27 ++++++++ pom.xml | 49 ++++++++++++++ 20 files changed, 612 insertions(+), 286 deletions(-) create mode 100644 docs/org.eclipse.wst.xsl.doc/pom.xml create mode 100644 docs/org.eclipse.wst.xsl.sdk.documentation/pom.xml create mode 100644 features/org.eclipse.wst.xsl_sdk.feature/pom.xml create mode 100644 pom.xml diff --git a/.gitignore b/.gitignore index 749e075..1e8d462 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,6 @@ temp.folder src.zip .fbwarnings javaCompiler...args + +# maven +target/ diff --git a/bundles/org.eclipse.wst.xsl.core/pom.xml b/bundles/org.eclipse.wst.xsl.core/pom.xml index 1db5e81..1891e27 100644 --- a/bundles/org.eclipse.wst.xsl.core/pom.xml +++ b/bundles/org.eclipse.wst.xsl.core/pom.xml @@ -1,28 +1,40 @@ - - 4.0.0 - org.eclipse.wst.xsl - org.eclipse.wst.xsl.core - eclipse-plugin - 1.1.100-SNAPSHOT - XSLT Core Plugin + - - org.eclipse.wst.xsl - org.eclipse.wst.xsl-parent - 1.2.0-SNAPSHOT - ../../development/athena/org.eclipse.wst.xsl.releng - + + 4.0.0 + + org.eclipse.webtools.sourceediting + org.eclipse.webtools.sourceediting.xsl + 3.5.0-SNAPSHOT + ../../ + - - src - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.7 - - - - \ No newline at end of file + org.eclipse.webtools.sourceediting + org.eclipse.wst.xsl.core + 1.1.301-SNAPSHOT + eclipse-plugin + XSLT Core Plugin + + + src + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.7 + + + + diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/pom.xml b/bundles/org.eclipse.wst.xsl.debug.ui/pom.xml index a8bf2cc..803be72 100644 --- a/bundles/org.eclipse.wst.xsl.debug.ui/pom.xml +++ b/bundles/org.eclipse.wst.xsl.debug.ui/pom.xml @@ -1,29 +1,40 @@ - - 4.0.0 - org.eclipse.wst.xsl - org.eclipse.wst.xsl.debug.ui - eclipse-plugin - 1.0.200-SNAPSHOT - XSLT Debug UI Plugin + - - org.eclipse.wst.xsl - org.eclipse.wst.xsl-parent - 1.2.0-SNAPSHOT - ../../development/athena/org.eclipse.wst.xsl.releng - + + 4.0.0 + + org.eclipse.webtools.sourceediting + org.eclipse.webtools.sourceediting.xsl + 3.5.0-SNAPSHOT + ../../ + - - src - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.7 - - - + org.eclipse.webtools.sourceediting + org.eclipse.wst.xsl.debug.ui + 1.0.302-SNAPSHOT + eclipse-plugin + XSLT Debug UI Plugin + + src + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.7 + + + diff --git a/bundles/org.eclipse.wst.xsl.exslt.core/pom.xml b/bundles/org.eclipse.wst.xsl.exslt.core/pom.xml index 4049a4e..a20a35e 100644 --- a/bundles/org.eclipse.wst.xsl.exslt.core/pom.xml +++ b/bundles/org.eclipse.wst.xsl.exslt.core/pom.xml @@ -1,29 +1,40 @@ - - 4.0.0 - org.eclipse.wst.xsl - org.eclipse.wst.xsl.exslt.core - eclipse-plugin - 1.0.0-SNAPSHOT - XSLT EXSLT Core Plugin + - - org.eclipse.wst.xsl - org.eclipse.wst.xsl-parent - 1.2.0-SNAPSHOT - ../../development/athena/org.eclipse.wst.xsl.releng - + + 4.0.0 + + org.eclipse.webtools.sourceediting + org.eclipse.webtools.sourceediting.xsl + 3.5.0-SNAPSHOT + ../../ + - - src - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.7 - - - + org.eclipse.webtools.sourceediting + org.eclipse.wst.xsl.exslt.core + 1.0.0-SNAPSHOT + eclipse-plugin + XSLT EXSLT Core Plugin + + src + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.7 + + + diff --git a/bundles/org.eclipse.wst.xsl.exslt.ui/pom.xml b/bundles/org.eclipse.wst.xsl.exslt.ui/pom.xml index b4e03b9..2178ab6 100644 --- a/bundles/org.eclipse.wst.xsl.exslt.ui/pom.xml +++ b/bundles/org.eclipse.wst.xsl.exslt.ui/pom.xml @@ -1,30 +1,40 @@ - - 4.0.0 - org.eclipse.wst.xsl - org.eclipse.wst.xsl.exslt.ui - eclipse-plugin - 1.0.0-SNAPSHOT - XSLT EXSLT UI Plugin + - - org.eclipse.wst.xsl - org.eclipse.wst.xsl-parent - 1.2.0-SNAPSHOT - ../../development/athena/org.eclipse.wst.xsl.releng - - - - src - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.7 - - - + + 4.0.0 + + org.eclipse.webtools.sourceediting + org.eclipse.webtools.sourceediting.xsl + 3.5.0-SNAPSHOT + ../../ + + org.eclipse.webtools.sourceediting + org.eclipse.wst.xsl.exslt.ui + 1.0.0-SNAPSHOT + eclipse-plugin + XSLT EXSLT UI Plugin + + src + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.7 + + + diff --git a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/pom.xml b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/pom.xml index a3f3f0f..bb00ddc 100644 --- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/pom.xml +++ b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/pom.xml @@ -1,30 +1,40 @@ - - 4.0.0 - org.eclipse.wst.xsl - org.eclipse.wst.xsl.jaxp.debug.ui - eclipse-plugin - 1.0.200-SNAPSHOT - XSLT JAXP Debug UI Plugin + - - org.eclipse.wst.xsl - org.eclipse.wst.xsl-parent - 1.2.0-SNAPSHOT - ../../development/athena/org.eclipse.wst.xsl.releng - - - - src - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.7 - - - + + 4.0.0 + + org.eclipse.webtools.sourceediting + org.eclipse.webtools.sourceediting.xsl + 3.5.0-SNAPSHOT + ../../ + + org.eclipse.webtools.sourceediting + org.eclipse.wst.xsl.jaxp.debug.ui + 1.0.200-SNAPSHOT + eclipse-plugin + XSLT JAXP Debug UI Plugin + + src + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.7 + + + diff --git a/bundles/org.eclipse.wst.xsl.jaxp.debug/pom.xml b/bundles/org.eclipse.wst.xsl.jaxp.debug/pom.xml index 8af78b8..93915be 100644 --- a/bundles/org.eclipse.wst.xsl.jaxp.debug/pom.xml +++ b/bundles/org.eclipse.wst.xsl.jaxp.debug/pom.xml @@ -1,29 +1,40 @@ - - 4.0.0 - org.eclipse.wst.xsl - org.eclipse.wst.xsl.jaxp.debug - eclipse-plugin - 1.0.200-SNAPSHOT - XSLT JAXP Debug Plugin + - - org.eclipse.wst.xsl - org.eclipse.wst.xsl-parent - 1.2.0-SNAPSHOT - ../../development/athena/org.eclipse.wst.xsl.releng - + + 4.0.0 + + org.eclipse.webtools.sourceediting + org.eclipse.webtools.sourceediting.xsl + 3.5.0-SNAPSHOT + ../../ + - - src - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.7 - - - + org.eclipse.webtools.sourceediting + org.eclipse.wst.xsl.jaxp.debug + 1.0.300-SNAPSHOT + eclipse-plugin + XSLT JAXP Debug Plugin + + src + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.7 + + + diff --git a/bundles/org.eclipse.wst.xsl.jaxp.launching/pom.xml b/bundles/org.eclipse.wst.xsl.jaxp.launching/pom.xml index 72500de..e51986b 100644 --- a/bundles/org.eclipse.wst.xsl.jaxp.launching/pom.xml +++ b/bundles/org.eclipse.wst.xsl.jaxp.launching/pom.xml @@ -1,29 +1,40 @@ - - 4.0.0 - org.eclipse.wst.xsl - org.eclipse.wst.xsl.jaxp.launching - eclipse-plugin - 1.0.200-SNAPSHOT - XSLT JAXP Launching UI Plugin + - - org.eclipse.wst.xsl - org.eclipse.wst.xsl-parent - 1.2.0-SNAPSHOT - ../../development/athena/org.eclipse.wst.xsl.releng - + + 4.0.0 + + org.eclipse.webtools.sourceediting + org.eclipse.webtools.sourceediting.xsl + 3.5.0-SNAPSHOT + ../../ + - - src - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.7 - - - + org.eclipse.webtools.sourceediting + org.eclipse.wst.xsl.jaxp.launching + 1.0.300-SNAPSHOT + eclipse-plugin + XSLT JAXP Launching UI Plugin + + src + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.7 + + + diff --git a/bundles/org.eclipse.wst.xsl.launching/pom.xml b/bundles/org.eclipse.wst.xsl.launching/pom.xml index ada16a5..fcc3433 100644 --- a/bundles/org.eclipse.wst.xsl.launching/pom.xml +++ b/bundles/org.eclipse.wst.xsl.launching/pom.xml @@ -1,29 +1,40 @@ - - 4.0.0 - org.eclipse.wst.xsl - org.eclipse.wst.xsl.launching - eclipse-plugin - 1.0.200-SNAPSHOT - XSLT Launching Plugin + - - org.eclipse.wst.xsl - org.eclipse.wst.xsl-parent - 1.2.0-SNAPSHOT - ../../development/athena/org.eclipse.wst.xsl.releng - + + 4.0.0 + + org.eclipse.webtools.sourceediting + org.eclipse.webtools.sourceediting.xsl + 3.5.0-SNAPSHOT + ../../ + - - src - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.7 - - - + org.eclipse.webtools.sourceediting + org.eclipse.wst.xsl.launching + 1.1.0-SNAPSHOT + eclipse-plugin + XSLT Launching Plugin + + src + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.7 + + + diff --git a/bundles/org.eclipse.wst.xsl.saxon/pom.xml b/bundles/org.eclipse.wst.xsl.saxon/pom.xml index 9daf2cc..c4cdb58 100644 --- a/bundles/org.eclipse.wst.xsl.saxon/pom.xml +++ b/bundles/org.eclipse.wst.xsl.saxon/pom.xml @@ -1,18 +1,29 @@ - - 4.0.0 - org.eclipse.wst.xsl - org.eclipse.wst.xsl.saxon - eclipse-plugin - 1.0.200-SNAPSHOT - XSLT Saxon Plugin + - - org.eclipse.wst.xsl - org.eclipse.wst.xsl-parent - 1.2.0-SNAPSHOT - ../../development/athena/org.eclipse.wst.xsl.releng - + + 4.0.0 + + org.eclipse.webtools.sourceediting + org.eclipse.webtools.sourceediting.xsl + 3.5.0-SNAPSHOT + ../../ + + org.eclipse.webtools.sourceediting + org.eclipse.wst.xsl.saxon + 1.0.200-SNAPSHOT + eclipse-plugin + XSLT Saxon Plugin diff --git a/bundles/org.eclipse.wst.xsl.ui/pom.xml b/bundles/org.eclipse.wst.xsl.ui/pom.xml index 1cbceb7..b5f9a28 100644 --- a/bundles/org.eclipse.wst.xsl.ui/pom.xml +++ b/bundles/org.eclipse.wst.xsl.ui/pom.xml @@ -1,29 +1,40 @@ - - 4.0.0 - org.eclipse.wst.xsl - org.eclipse.wst.xsl.ui - eclipse-plugin - 1.1.300-SNAPSHOT - XSLT UI Plugin + - - org.eclipse.wst.xsl - org.eclipse.wst.xsl-parent - 1.2.0-SNAPSHOT - ../../development/athena/org.eclipse.wst.xsl.releng - + + 4.0.0 + + org.eclipse.webtools.sourceediting + org.eclipse.webtools.sourceediting.xsl + 3.5.0-SNAPSHOT + ../../ + - - src - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.7 - - - + org.eclipse.webtools.sourceediting + org.eclipse.wst.xsl.ui + 1.1.301-SNAPSHOT + eclipse-plugin + XSLT UI Plugin + + src + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.7 + + + diff --git a/bundles/org.eclipse.wst.xsl.xalan/pom.xml b/bundles/org.eclipse.wst.xsl.xalan/pom.xml index aa76dd2..a3b876a 100644 --- a/bundles/org.eclipse.wst.xsl.xalan/pom.xml +++ b/bundles/org.eclipse.wst.xsl.xalan/pom.xml @@ -1,29 +1,40 @@ - - 4.0.0 - org.eclipse.wst.xsl - org.eclipse.wst.xsl.xalan - eclipse-plugin - 1.0.100-SNAPSHOT - XSLT Xalan Plugin + - - org.eclipse.wst.xsl - org.eclipse.wst.xsl-parent - 1.2.0-SNAPSHOT - ../../development/athena/org.eclipse.wst.xsl.releng - + + 4.0.0 + + org.eclipse.webtools.sourceediting + org.eclipse.webtools.sourceediting.xsl + 3.5.0-SNAPSHOT + ../../ + - - src-debugger - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.7 - - - + org.eclipse.webtools.sourceediting + org.eclipse.wst.xsl.xalan + 1.0.100-SNAPSHOT + eclipse-plugin + XSLT Xalan Plugin + + src-debugger + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.7 + + + diff --git a/bundles/org.eclipse.wst.xsl/build.properties b/bundles/org.eclipse.wst.xsl/build.properties index 1694922..0afaed7 100644 --- a/bundles/org.eclipse.wst.xsl/build.properties +++ b/bundles/org.eclipse.wst.xsl/build.properties @@ -5,3 +5,9 @@ bin.includes = META-INF/,\ about.properties,\ plugin.properties,\ icons/ +src.includes = about.html,\ + about.ini,\ + about.mappings,\ + about.properties,\ + icons/,\ + plugin.properties diff --git a/bundles/org.eclipse.wst.xsl/pom.xml b/bundles/org.eclipse.wst.xsl/pom.xml index aca071e..b56509e 100644 --- a/bundles/org.eclipse.wst.xsl/pom.xml +++ b/bundles/org.eclipse.wst.xsl/pom.xml @@ -1,18 +1,29 @@ - - 4.0.0 - org.eclipse.wst.xsl - org.eclipse.wst.xsl - eclipse-plugin - 1.2.0-SNAPSHOT - XSL Tools Branding Plugin + - - org.eclipse.wst.xsl - org.eclipse.wst.xsl-parent - 1.2.0-SNAPSHOT - ../../development/athena/org.eclipse.wst.xsl.releng - + + 4.0.0 + + org.eclipse.webtools.sourceediting + org.eclipse.webtools.sourceediting.xsl + 3.5.0-SNAPSHOT + ../../ + - \ No newline at end of file + org.eclipse.webtools.sourceediting + org.eclipse.wst.xsl + 1.2.0-SNAPSHOT + eclipse-plugin + XSL Tools Branding Plugin + diff --git a/docs/org.eclipse.wst.xsl.doc/build.properties b/docs/org.eclipse.wst.xsl.doc/build.properties index 6cd5053..edd215c 100644 --- a/docs/org.eclipse.wst.xsl.doc/build.properties +++ b/docs/org.eclipse.wst.xsl.doc/build.properties @@ -6,4 +6,10 @@ bin.includes = plugin.xml,\ *.xml,\ about.html,\ plugin.properties +src.includes = plugin.xml,\ + plugin.properties,\ + about.html,\ + build.xml,\ + html/,\ + toc.xml generateSourceBundle=false diff --git a/docs/org.eclipse.wst.xsl.doc/pom.xml b/docs/org.eclipse.wst.xsl.doc/pom.xml new file mode 100644 index 0000000..69091dc --- /dev/null +++ b/docs/org.eclipse.wst.xsl.doc/pom.xml @@ -0,0 +1,27 @@ + + + + + 4.0.0 + + org.eclipse.webtools.sourceediting + org.eclipse.webtools.sourceediting.xsl + 3.5.0-SNAPSHOT + ../../ + + + org.eclipse.webtools.sourceediting + org.eclipse.wst.xsl.doc + 1.0.100-SNAPSHOT + eclipse-plugin + diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/pom.xml b/docs/org.eclipse.wst.xsl.sdk.documentation/pom.xml new file mode 100644 index 0000000..dc145ed --- /dev/null +++ b/docs/org.eclipse.wst.xsl.sdk.documentation/pom.xml @@ -0,0 +1,27 @@ + + + + + 4.0.0 + + org.eclipse.webtools.sourceediting + org.eclipse.webtools.sourceediting.xsl + 3.5.0-SNAPSHOT + ../../ + + + org.eclipse.webtools.sourceediting + org.eclipse.wst.xsl.sdk.documentation + 1.0.100-SNAPSHOT + eclipse-plugin + diff --git a/features/org.eclipse.wst.xsl.feature/pom.xml b/features/org.eclipse.wst.xsl.feature/pom.xml index f29756d..fc0ee98 100644 --- a/features/org.eclipse.wst.xsl.feature/pom.xml +++ b/features/org.eclipse.wst.xsl.feature/pom.xml @@ -1,18 +1,68 @@ - - 4.0.0 - org.eclipse.wst.xsl - org.eclipse.wst.xsl.feature - eclipse-feature - 1.3.0-SNAPSHOT - XSLT FeaturePlugin + - - org.eclipse.wst.xsl - org.eclipse.wst.xsl-parent - 1.2.0-SNAPSHOT - ../../development/athena/org.eclipse.wst.xsl.releng - + + 4.0.0 + + org.eclipse.webtools.sourceediting + org.eclipse.webtools.sourceediting.xsl + 3.5.0-SNAPSHOT + ../../ + + org.eclipse.webtools.sourceediting + org.eclipse.wst.xsl.feature + 1.3.300-SNAPSHOT + eclipse-feature + XSLT FeaturePlugin + + + + + org.eclipse.tycho.extras + tycho-source-feature-plugin + ${tycho-extras.version} + + + source-feature + package + + source-feature + + + + + + + + + + + + org.eclipse.tycho + tycho-p2-plugin + ${tycho.version} + + + attach-p2-metadata + package + + p2-metadata + + + + + + diff --git a/features/org.eclipse.wst.xsl_sdk.feature/pom.xml b/features/org.eclipse.wst.xsl_sdk.feature/pom.xml new file mode 100644 index 0000000..cd2e463 --- /dev/null +++ b/features/org.eclipse.wst.xsl_sdk.feature/pom.xml @@ -0,0 +1,27 @@ + + + + + 4.0.0 + + org.eclipse.webtools.sourceediting + org.eclipse.webtools.sourceediting.xsl + 3.5.0-SNAPSHOT + ../../ + + + org.eclipse.webtools.sourceediting + org.eclipse.wst.xsl_sdk.feature + 1.1.400-SNAPSHOT + eclipse-feature + diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..9d96361 --- /dev/null +++ b/pom.xml @@ -0,0 +1,49 @@ + + + + + 4.0.0 + + + org.eclipse + wtp-parent + 3.5.0-SNAPSHOT + ../wtp-parent + + + org.eclipse.webtools.sourceediting + org.eclipse.webtools.sourceediting.xsl + 3.5.0-SNAPSHOT + pom + + + bundles/org.eclipse.wst.xsl + bundles/org.eclipse.wst.xsl.core + bundles/org.eclipse.wst.xsl.debug.ui + bundles/org.eclipse.wst.xsl.exslt.core + bundles/org.eclipse.wst.xsl.exslt.ui + bundles/org.eclipse.wst.xsl.jaxp.debug + bundles/org.eclipse.wst.xsl.jaxp.debug.ui + bundles/org.eclipse.wst.xsl.jaxp.launching + bundles/org.eclipse.wst.xsl.launching + bundles/org.eclipse.wst.xsl.saxon + bundles/org.eclipse.wst.xsl.ui + bundles/org.eclipse.wst.xsl.xalan + + docs/org.eclipse.wst.xsl.doc + docs/org.eclipse.wst.xsl.sdk.documentation + + features/org.eclipse.wst.xsl.feature + features/org.eclipse.wst.xsl_sdk.feature + + -- cgit v1.2.3